diff --git a/pom.xml b/pom.xml index 1c61d023..2672055b 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 2.17.2 2.17.2 - 2.11.0 + 2.24.1 1.2.0 1.0 2.16.1 diff --git a/validator-cli/src/main/java/fr/ign/validator/Application.java b/validator-cli/src/main/java/fr/ign/validator/Application.java index 99389351..e735b6b1 100644 --- a/validator-cli/src/main/java/fr/ign/validator/Application.java +++ b/validator-cli/src/main/java/fr/ign/validator/Application.java @@ -6,7 +6,7 @@ /** * Command line application - * + * * @author MBorne */ public class Application { diff --git a/validator-core/src/main/java/fr/ign/validator/Context.java b/validator-core/src/main/java/fr/ign/validator/Context.java index d7a30841..5ae48b51 100644 --- a/validator-core/src/main/java/fr/ign/validator/Context.java +++ b/validator-core/src/main/java/fr/ign/validator/Context.java @@ -44,9 +44,9 @@ import fr.ign.validator.validation.Validatable; /** - * + * * Validation context - * + * * @author MBorne * */ @@ -56,7 +56,7 @@ public class Context { /** * Data charset (overridden by metadata provided charset) - * + * * @see MetadataPreProcess */ private Charset encoding = StandardCharsets.UTF_8; @@ -166,7 +166,7 @@ public Context() { /** * Get validatorListeners - * + * * @return */ public List getValidatorListeners() { @@ -175,7 +175,7 @@ public List getValidatorListeners() { /** * add listener - * + * * @param listener */ public void addListener(ValidatorListener listener) { @@ -184,7 +184,7 @@ public void addListener(ValidatorListener listener) { /** * Add listener before the first listener of a given class - * + * * @param listener * @param clazz */ @@ -198,7 +198,7 @@ public void addListenerBefore(ValidatorListener listener, Class clazz) { /** * Find listener for a given class - * + * * @param clazz * @return */ @@ -266,7 +266,7 @@ public void setProjection(Projection projection) { /** * Set projection from CRS code - * + * * @param code */ public void setProjection(String code) { @@ -317,7 +317,7 @@ public void setCurrentDirectory(File currentDirectory) { /** * Get ErrorFactory - * + * * @return */ public ErrorFactory getErrorFactory() { @@ -326,7 +326,7 @@ public ErrorFactory getErrorFactory() { /** * Set ErrorFactory - * + * * @param errorFactory */ public void setErrorFactory(ErrorFactory errorFactory) { @@ -335,7 +335,7 @@ public void setErrorFactory(ErrorFactory errorFactory) { /** * Push given model to stack - * + * * @param model */ public void beginModel(Model model) { @@ -345,7 +345,7 @@ public void beginModel(Model model) { /** * Get model stack - * + * * @return */ public List getModelStack() { @@ -354,7 +354,7 @@ public List getModelStack() { /** * Get current model by type - * + * * @param clazz * @return */ @@ -370,7 +370,7 @@ public T getModelByType(Class clazz) { /** * Get current document model - * + * * @return */ public DocumentModel getDocumentModel() { @@ -379,7 +379,7 @@ public DocumentModel getDocumentModel() { /** * Get current document model name - * + * * @param context * @return */ @@ -393,7 +393,7 @@ public String getDocumentModelName() { /** * Get current file model name - * + * * @param context * @return */ @@ -407,7 +407,7 @@ public String getFileModelName() { /** * Get current attribute name - * + * * @param context * @return */ @@ -433,7 +433,7 @@ public void endModel(Model model) { /** * Begin data validation (push data on dataStack) - * + * * @param location */ public void beginData(Validatable data) { @@ -442,7 +442,7 @@ public void beginData(Validatable data) { /** * Get data by type from data stack - * + * * @param clazz * @return */ @@ -458,7 +458,7 @@ public T getDataByType(Class clazz) { /** * Get current scope from data stack - * + * * @return */ public ErrorScope getScope() { @@ -475,7 +475,7 @@ public ErrorScope getScope() { /** * Get current fileName from data stack - * + * * @param context * @return */ @@ -499,7 +499,7 @@ public String getFileName() { /** * Get current line number from data stack - * + * * @param context * @return */ @@ -513,7 +513,7 @@ public String getLine() { /** * Get current feature bounding box from data stack - * + * * @return string */ public Envelope getFeatureBBox() { @@ -526,7 +526,7 @@ public Envelope getFeatureBBox() { /** * Get current identifiant - * + * * @return */ public String getFeatureId() { @@ -539,7 +539,7 @@ public String getFeatureId() { /** * End data validation (pop data from dataStack) - * + * * @param location */ public void endData(Validatable data) { @@ -552,7 +552,7 @@ public void endData(Validatable data) { /** * Get relative path according to current directory. - * + * * @param path * @return */ @@ -569,7 +569,7 @@ public String relativize(File path) { /** * Create and report an error according to its code - * + * * @param code * @param messageParams */ @@ -580,7 +580,7 @@ public void report(ErrorCode code) { /** * Direct reporting of an existing error - * + * * @param validatorError */ public void report(ValidatorError validatorError) { @@ -589,7 +589,7 @@ public void report(ValidatorError validatorError) { /** * Generic method for building errors - * + * * @param code * @param messageParams */ @@ -619,7 +619,7 @@ public ValidatorError createError(ErrorCode code) { /** * Get ValidationDirectory - * + * * @return */ public File getValidationDirectory() { @@ -628,7 +628,7 @@ public File getValidationDirectory() { /** * Set ValidationDirectory - * + * * @return */ public void setValidationDirectory(File validationDirectory) { @@ -642,7 +642,7 @@ public boolean isNormalizeEnabled() { /** * Enable or disable data normalization. - * + * * @param normalizeEnabled */ public void setNormalizeEnabled(boolean normalizeEnabled) { @@ -652,7 +652,7 @@ public void setNormalizeEnabled(boolean normalizeEnabled) { /** * Get output projection for normalized data. - * + * * @return */ public Projection getOutputProjection() { @@ -661,7 +661,7 @@ public Projection getOutputProjection() { /** * Set output projection for normalized data. - * + * * @param outputProjection */ public void setOutputProjection(Projection outputProjection) { @@ -671,7 +671,7 @@ public void setOutputProjection(Projection outputProjection) { /** * Get DATA directory for normalized data ({validation_dir}/DATA) - * + * * @return */ public File getDataDirectory() { @@ -684,7 +684,7 @@ public File getDataDirectory() { /** * Get metadata directory ({validation_dir}/METADATA) - * + * * @return */ public File getMetadataDirectory() { @@ -740,7 +740,7 @@ public void setStringFixer(StringFixer stringFixer) { /** * tolerance option used in geometric operation (dgpr plugin) - * + * * @return */ public Double getDgprTolerance() { @@ -749,7 +749,7 @@ public Double getDgprTolerance() { /** * tolerance option used in geometric operation (dgpr plugin) - * + * * @param topologicalTolerance */ public void setDgprTolerance(double topologicalTolerance) { @@ -758,7 +758,7 @@ public void setDgprTolerance(double topologicalTolerance) { /** * simplification distance option - * + * * @return distance */ public Double getDgprSimplification() { @@ -767,7 +767,7 @@ public Double getDgprSimplification() { /** * simplification distance option - * + * * @param distanceSimplification */ public void setDgprSimplification(Double distanceSimplification) { @@ -776,7 +776,7 @@ public void setDgprSimplification(Double distanceSimplification) { /** * safe simplification option - * + * * @return safe simplication allowed */ public Boolean isDgprSafeMode() { @@ -785,7 +785,7 @@ public Boolean isDgprSafeMode() { /** * safe simplification option - * + * * @param safeSimplification */ public void setDgprSafeMode(boolean safeSimplification) { diff --git a/validator-core/src/main/java/fr/ign/validator/ValidatorListener.java b/validator-core/src/main/java/fr/ign/validator/ValidatorListener.java index f0bc498c..d883038a 100644 --- a/validator-core/src/main/java/fr/ign/validator/ValidatorListener.java +++ b/validator-core/src/main/java/fr/ign/validator/ValidatorListener.java @@ -4,7 +4,7 @@ /** * Permet d'ajouter des traitements au validateur - * + * * @author MBorne * */ @@ -12,21 +12,21 @@ public interface ValidatorListener { /** * Appelé avant la mise en correspondance des fichiers avec le modèle - * + * * @param context */ public void beforeMatching(Context context, Document document) throws Exception; /** * Appelé après la mise en correspondance des fichiers et avant la validation - * + * * @param context */ public void beforeValidate(Context context, Document document) throws Exception; /** * Appelé après la validation - * + * * @param context */ public void afterValidate(Context context, Document document) throws Exception; diff --git a/validator-core/src/main/java/fr/ign/validator/code/CodeList.java b/validator-core/src/main/java/fr/ign/validator/code/CodeList.java index 81d36e51..b8441f8c 100644 --- a/validator-core/src/main/java/fr/ign/validator/code/CodeList.java +++ b/validator-core/src/main/java/fr/ign/validator/code/CodeList.java @@ -10,10 +10,10 @@ import java.util.ResourceBundle; /** - * + * * Represents a list of values associated to translation. Values are loaded as a * ResourceBundle from src/main/resources/metadata/codes/[NAME].properties - * + * * @author MBorne * */ @@ -34,7 +34,7 @@ private CodeList(String name, Map codes) { /** * Get the name of the list - * + * * @return */ public String getName() { @@ -43,7 +43,7 @@ public String getName() { /** * Gets allowed values - * + * * @return */ public Collection getAllowedValues() { @@ -52,7 +52,7 @@ public Collection getAllowedValues() { /** * Gets translation for a given code - * + * * @param code * @return */ @@ -62,9 +62,9 @@ public String getDescription(String code) { /** * Gets a code list by a given name - * + * * TODO Read JSON file where objects contains at least a name - * + * * @param name * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/code/CodeListValue.java b/validator-core/src/main/java/fr/ign/validator/code/CodeListValue.java index 0ca6fad2..494c9b0b 100644 --- a/validator-core/src/main/java/fr/ign/validator/code/CodeListValue.java +++ b/validator-core/src/main/java/fr/ign/validator/code/CodeListValue.java @@ -3,11 +3,11 @@ import com.fasterxml.jackson.annotation.JsonValue; /** - * + * * Permissive enum for code list implementation - * + * * TODO add protected constructor with a CodeList - * + * * @author MBorne * */ @@ -32,7 +32,7 @@ public CodeList getCodeList() { /** * True if the value belong to the code list - * + * * @return */ public boolean isValid() { diff --git a/validator-core/src/main/java/fr/ign/validator/command/AbstractCommand.java b/validator-core/src/main/java/fr/ign/validator/command/AbstractCommand.java index e7d1700d..92188d13 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/AbstractCommand.java +++ b/validator-core/src/main/java/fr/ign/validator/command/AbstractCommand.java @@ -14,9 +14,9 @@ import fr.ign.validator.tools.Networking; /** - * + * * Common command implementation and helpers - * + * * @author MBorne * */ @@ -34,14 +34,14 @@ public void setStdout(PrintStream stdout) { /** * Append custom CLI options to default ones - * + * * @param options */ protected abstract void buildCustomOptions(Options options); /** * Parse custom CLI options to member variable - * + * * @param commandLine * @throws ParseException */ @@ -90,7 +90,7 @@ public final int run(String[] args) { /** * True if command args contains -h or --help. - * + * * @param args * @return */ @@ -105,7 +105,7 @@ private boolean containsHelp(String[] args) { /** * Get common options - * + * * @return */ private Options getCommonOptions() { @@ -126,7 +126,7 @@ private Options getCommonOptions() { /** * Display help - * + * * @param options */ private void displayHelp(Options options) { @@ -138,7 +138,7 @@ private void displayHelp(Options options) { /** * Parse proxy option and define proxy - * + * * @param commandLine */ protected void configureNetworkingAndProxy(CommandLine commandLine) { diff --git a/validator-core/src/main/java/fr/ign/validator/command/Command.java b/validator-core/src/main/java/fr/ign/validator/command/Command.java index 727543b6..affb00fc 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/Command.java +++ b/validator-core/src/main/java/fr/ign/validator/command/Command.java @@ -5,9 +5,9 @@ import org.apache.commons.cli.Options; /** - * + * * Interface for CLI interpreter commands - * + * * @author MBorne * */ @@ -15,21 +15,21 @@ public interface Command { /** * Get command identifier (ex : document_validator) - * + * * @return */ public String getName(); /** * Get command description (ex : validate a document according to a model) - * + * * @return */ public String getDescription(); /** * Get command line options for CLI interpreter - * + * * @return */ public Options getCommandLineOptions(); @@ -37,21 +37,21 @@ public interface Command { /** * Run the command with CLI arguments (except command name) and returns exit * code - * + * * @param args */ public int run(String[] args); /** * Run the command with arguments given as member variables - * + * * @return */ public void execute() throws Exception; /** * Allows to replace writes to out. - * + * * @param out */ public void setStdout(PrintStream out); diff --git a/validator-core/src/main/java/fr/ign/validator/command/CommandApplication.java b/validator-core/src/main/java/fr/ign/validator/command/CommandApplication.java index c45a1c78..dbe15abe 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/CommandApplication.java +++ b/validator-core/src/main/java/fr/ign/validator/command/CommandApplication.java @@ -9,9 +9,9 @@ import fr.ign.validator.Version; /** - * + * * Provide a system to have a single CLI application with multiple sub-command - * + * * @author MBorne */ public class CommandApplication { @@ -40,7 +40,7 @@ private void loadRegistredCommands() { /** * Add command - * + * * @param command */ public void addCommand(Command command) { @@ -49,7 +49,7 @@ public void addCommand(Command command) { /** * Get command by name - * + * * @param name * @return */ @@ -89,7 +89,7 @@ private void displayHelp() { /** * Format item for help. - * + * * @param name * @param description * @return @@ -100,7 +100,7 @@ private String formatHelpItem(String name, String description) { /** * Run command - * + * * @param args * @return */ @@ -130,7 +130,7 @@ public int run(String args[]) { /** * Allows to replace writes to out. - * + * * @param out */ public void setStdout(PrintStream stdout) { diff --git a/validator-core/src/main/java/fr/ign/validator/command/DocumentValidatorCommand.java b/validator-core/src/main/java/fr/ign/validator/command/DocumentValidatorCommand.java index 1318c371..bbcc7200 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/DocumentValidatorCommand.java +++ b/validator-core/src/main/java/fr/ign/validator/command/DocumentValidatorCommand.java @@ -49,9 +49,9 @@ import fr.ign.validator.tools.FileConverter; /** - * + * * Validate a document directory according to a DocumentModel - * + * * @author MBorne * */ @@ -64,7 +64,7 @@ public class DocumentValidatorCommand extends AbstractCommand { /** * URL of the document model. - * + * */ protected URL documentModelUrl; @@ -378,7 +378,7 @@ public void execute() throws Exception { /** * Add "input" option - * + * * @param options */ protected void buildDocumentPathOption(Options options) { @@ -391,7 +391,7 @@ protected void buildDocumentPathOption(Options options) { /** * Parse documentPath from commandLine - * + * * @param commandLine * @throws ParseException */ @@ -411,7 +411,7 @@ protected void parseDocumentPath(CommandLine commandLine) throws ParseException /** * Add "config" option - * + * * @param options */ protected void buildConfigOption(Options options) { @@ -427,7 +427,7 @@ protected void buildConfigOption(Options options) { /** * Add "version" option - * + * * @param options */ protected void buildVersionOption(Options options) { @@ -442,7 +442,7 @@ protected void buildVersionOption(Options options) { /** * Add "document-model" option - * + * * @param options */ protected void buildModelOption(Options options) { @@ -456,7 +456,7 @@ protected void buildModelOption(Options options) { /** * Parse "config" option to "configDir" - * + * * @param commandLine * @throws ParseException */ @@ -482,7 +482,7 @@ protected void parseDocumentModelUrl(CommandLine commandLine) throws ParseExcept /** * Locate either files.json or files.xml in configDir. - * + * * @param configDir * @param version * @return @@ -508,7 +508,7 @@ private URL findDocumentModelUrl(File configDir, String version) throws ParseExc /** * Load document model according to documentModelName - * + * * @return * @throws IOException * @throws ModelNotFoundException @@ -520,7 +520,7 @@ protected DocumentModel loadDocumentModel() throws IOException, ModelNotFoundExc /** * Add "report-format" and "max-errors" options - * + * * @param options */ protected void buildReportBuilderOptions(Options options) { @@ -542,7 +542,7 @@ protected void buildReportBuilderOptions(Options options) { /** * Add option --error-config to the command line. - * + * * @param options */ protected void buildErrorConfigOption(Options options) { @@ -558,7 +558,7 @@ protected void buildErrorConfigOption(Options options) { /** * Retrieve --normalize option. - * + * * @param commandLine */ protected void parseErrorConfigOption(CommandLine commandLine) throws ParseException { @@ -585,7 +585,7 @@ protected void parseErrorConfigOption(CommandLine commandLine) throws ParseExcep /** * Add option --normalize to the command line. - * + * * @param options */ protected void buildNormalizeOption(Options options) { @@ -601,7 +601,7 @@ protected void buildNormalizeOption(Options options) { /** * Retrieve --normalize option. - * + * * @param commandLine */ protected void parseNormalizeOption(CommandLine commandLine) { @@ -610,7 +610,7 @@ protected void parseNormalizeOption(CommandLine commandLine) { /** * Create report builder from commandLine - * + * * @param commandLine */ protected void parseReportBuilder(CommandLine commandLine) throws ParseException { @@ -629,7 +629,7 @@ protected void parseReportBuilder(CommandLine commandLine) throws ParseException /** * Add "srs" option - * + * * @param options */ protected void buildCoordinateReferenceSystemOptions(Options options) { @@ -642,7 +642,7 @@ protected void buildCoordinateReferenceSystemOptions(Options options) { /** * Parse CoordinateReferenceSystem - * + * * @param commandLine * @return */ @@ -660,7 +660,7 @@ protected void parseCoordinateReferenceSystem(CommandLine commandLine) throws Pa /** * Build option data-extent - * + * * @param options */ protected void buildDataExtentOption(Options options) { @@ -677,7 +677,7 @@ protected void buildDataExtentOption(Options options) { /** * Add "data-extent" option - * + * * @param commandLine * @throws ParseException */ @@ -698,7 +698,7 @@ protected void parseDataExtent(CommandLine commandLine) throws ParseException { /** * Add "--encoding" option - * + * * @param options */ protected void buildEncodingOption(Options options) { @@ -714,7 +714,7 @@ protected void buildEncodingOption(Options options) { /** * Parse encoding - * + * * @param commandLine * @return */ @@ -728,7 +728,7 @@ protected void parseEncoding(CommandLine commandLine) throws ParseException { /** * Add option "--flat" - * + * * @param options */ protected void buildFlatOption(Options options) { @@ -744,7 +744,7 @@ protected void buildFlatOption(Options options) { /** * Parse flat option - * + * * @param commandLine * @return */ @@ -753,7 +753,7 @@ protected void parseFlatOption(CommandLine commandLine) { } /** - * + * * @param options */ protected void buildEnableConditions(Options options) { @@ -769,7 +769,7 @@ protected void buildEnableConditions(Options options) { /** * Parse enable conditions option - * + * * @param commandLine * @return */ @@ -779,7 +779,7 @@ protected void parseEnableConditions(CommandLine commandLine) { /** * Add option "--plugins" - * + * * @param options */ protected void buildPluginsOption(Options options) { @@ -792,7 +792,7 @@ protected void buildPluginsOption(Options options) { /** * Parse plugins option - * + * * @param commandLine */ protected void parsePluginsOption(CommandLine commandLine) { @@ -815,7 +815,7 @@ protected void parsePluginsOption(CommandLine commandLine) { /** * Add option "--dgpr-tolerance" - * + * * @param options */ protected void buildDgprTolerance(Options options) { @@ -831,7 +831,7 @@ protected void buildDgprTolerance(Options options) { /** * Add option "--dgpr-simplify" - * + * * @param options */ protected void buildDgprSimplifyDistance(Options options) { @@ -847,7 +847,7 @@ protected void buildDgprSimplifyDistance(Options options) { /** * Add option "--dgpr-safe-simplify" - * + * * @param options */ protected void buildDgprSimplifySafe(Options options) { @@ -907,7 +907,7 @@ protected void parseDistanceSimplificationOption(CommandLine commandLine) throws /** * Parse flat option - * + * * @param commandLine * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/command/ErrorConfigCommand.java b/validator-core/src/main/java/fr/ign/validator/command/ErrorConfigCommand.java index 1702ef5f..d8202b2f 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/ErrorConfigCommand.java +++ b/validator-core/src/main/java/fr/ign/validator/command/ErrorConfigCommand.java @@ -18,7 +18,7 @@ /** * Dump default configuration for error codes. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/command/MetadataToJsonCommand.java b/validator-core/src/main/java/fr/ign/validator/command/MetadataToJsonCommand.java index d40bd284..83771fd0 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/MetadataToJsonCommand.java +++ b/validator-core/src/main/java/fr/ign/validator/command/MetadataToJsonCommand.java @@ -23,7 +23,7 @@ /** * Convert ISO 19115 metadata to JSON - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/command/ProjectionListCommand.java b/validator-core/src/main/java/fr/ign/validator/command/ProjectionListCommand.java index 126f1f00..1d0adc78 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/ProjectionListCommand.java +++ b/validator-core/src/main/java/fr/ign/validator/command/ProjectionListCommand.java @@ -21,9 +21,9 @@ import fr.ign.validator.model.Projection; /** - * + * * Exports supported projections - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/command/ReadUrlCommand.java b/validator-core/src/main/java/fr/ign/validator/command/ReadUrlCommand.java index c4b820e7..8be7e4ba 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/ReadUrlCommand.java +++ b/validator-core/src/main/java/fr/ign/validator/command/ReadUrlCommand.java @@ -15,9 +15,9 @@ import org.apache.logging.log4j.MarkerManager; /** - * + * * Read URL to check proxy configuration - * + * * @author MBorne */ public class ReadUrlCommand extends AbstractCommand { diff --git a/validator-core/src/main/java/fr/ign/validator/command/SleepCommand.java b/validator-core/src/main/java/fr/ign/validator/command/SleepCommand.java index 811d471d..625f370f 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/SleepCommand.java +++ b/validator-core/src/main/java/fr/ign/validator/command/SleepCommand.java @@ -8,9 +8,9 @@ import org.apache.commons.cli.ParseException; /** - * + * * Display validator version - * + * * @author MBorne */ public class SleepCommand extends AbstractCommand { diff --git a/validator-core/src/main/java/fr/ign/validator/command/UnicodeTableCommand.java b/validator-core/src/main/java/fr/ign/validator/command/UnicodeTableCommand.java index 6b3f01e5..2cbcd2a1 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/UnicodeTableCommand.java +++ b/validator-core/src/main/java/fr/ign/validator/command/UnicodeTableCommand.java @@ -19,9 +19,9 @@ import fr.ign.validator.tools.Characters; /** - * + * * Generate a unicode table to document string fixer - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/command/VersionCommand.java b/validator-core/src/main/java/fr/ign/validator/command/VersionCommand.java index 4c4d0b87..e915a9f9 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/VersionCommand.java +++ b/validator-core/src/main/java/fr/ign/validator/command/VersionCommand.java @@ -13,9 +13,9 @@ import fr.ign.validator.command.options.OutputFileOption; /** - * + * * Display validator version - * + * * @author MBorne */ public class VersionCommand extends AbstractCommand { diff --git a/validator-core/src/main/java/fr/ign/validator/command/options/DocumentEmpriseOption.java b/validator-core/src/main/java/fr/ign/validator/command/options/DocumentEmpriseOption.java index 343ff649..5b558fd4 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/options/DocumentEmpriseOption.java +++ b/validator-core/src/main/java/fr/ign/validator/command/options/DocumentEmpriseOption.java @@ -15,7 +15,7 @@ import fr.ign.validator.tools.TableReader; /** - * + * * @author cbouche * */ @@ -29,7 +29,7 @@ private DocumentEmpriseOption() { /** * Add "cnig-document-emprise" option to command line. - * + * * @param options */ public static void buildOptions(Options options) { @@ -46,7 +46,7 @@ public static void buildOptions(Options options) { /** * Parse option from command line. - * + * * @param commandLine * @return * @throws ParseException diff --git a/validator-core/src/main/java/fr/ign/validator/command/options/GeometryComplexityThresholdOption.java b/validator-core/src/main/java/fr/ign/validator/command/options/GeometryComplexityThresholdOption.java index 62a92af4..3277c956 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/options/GeometryComplexityThresholdOption.java +++ b/validator-core/src/main/java/fr/ign/validator/command/options/GeometryComplexityThresholdOption.java @@ -13,7 +13,7 @@ import fr.ign.validator.geometry.GeometryThreshold; /** - * + * * @author cbouche * */ @@ -29,7 +29,7 @@ private GeometryComplexityThresholdOption() { /** * Add "cnig-complexity-tolerance" option to command line. - * + * * @param options */ public static void buildOptions(Options options) { @@ -45,7 +45,7 @@ public static void buildOptions(Options options) { /** * Parse option from command line. - * + * * @param commandLine * @return * @throws ParseException diff --git a/validator-core/src/main/java/fr/ign/validator/command/options/OutputFileOption.java b/validator-core/src/main/java/fr/ign/validator/command/options/OutputFileOption.java index 238073cc..af3c5640 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/options/OutputFileOption.java +++ b/validator-core/src/main/java/fr/ign/validator/command/options/OutputFileOption.java @@ -9,7 +9,7 @@ /** * Add option to configure an optional output file (default is System.out). - * + * * @author MBorne * */ @@ -23,7 +23,7 @@ private OutputFileOption() { /** * Add "output" option to command line. - * + * * @param options */ public static void buildOptions(Options options) { @@ -40,7 +40,7 @@ public static void buildOptions(Options options) { /** * Parse option from command line. - * + * * @param commandLine * @return * @throws ParseException diff --git a/validator-core/src/main/java/fr/ign/validator/command/options/OutputProjectionOption.java b/validator-core/src/main/java/fr/ign/validator/command/options/OutputProjectionOption.java index 52f7a1b2..23f7ef31 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/options/OutputProjectionOption.java +++ b/validator-core/src/main/java/fr/ign/validator/command/options/OutputProjectionOption.java @@ -10,7 +10,7 @@ /** * Add "output-projection" to the command line. - * + * * @author MBorne * */ @@ -22,7 +22,7 @@ public class OutputProjectionOption { /** * Add "srs" option - * + * * @param options */ public static void buildOptions(Options options) { @@ -39,7 +39,7 @@ public static void buildOptions(Options options) { /** * Parse output-projection from the command line. - * + * * @param commandLine * @return * @return Projection or null if "source" is specified. diff --git a/validator-core/src/main/java/fr/ign/validator/command/options/StringFixerOptions.java b/validator-core/src/main/java/fr/ign/validator/command/options/StringFixerOptions.java index 28af8f1d..c665f6bf 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/options/StringFixerOptions.java +++ b/validator-core/src/main/java/fr/ign/validator/command/options/StringFixerOptions.java @@ -17,7 +17,7 @@ public class StringFixerOptions { /** * Define command line options to configure StringFixer - * + * * @param options */ public static void buildOptions(Options options) { @@ -77,7 +77,7 @@ public static void buildOptions(Options options) { /** * Parse command line to build StringFixer - * + * * @param commandLine * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/command/options/ValidationDirectoryOption.java b/validator-core/src/main/java/fr/ign/validator/command/options/ValidationDirectoryOption.java index db1522b5..e34f4fd5 100644 --- a/validator-core/src/main/java/fr/ign/validator/command/options/ValidationDirectoryOption.java +++ b/validator-core/src/main/java/fr/ign/validator/command/options/ValidationDirectoryOption.java @@ -17,7 +17,7 @@ /** * Add an optional "--output" option to configure validation directory (default * is "validation" in the parent directory of the document) - * + * * @author MBorne * */ @@ -35,7 +35,7 @@ private ValidationDirectoryOption() { /** * Add "output" option to command line. - * + * * @param options */ public static void buildOptions(Options options) { @@ -53,7 +53,7 @@ public static void buildOptions(Options options) { /** * Parse validationDirectory from command line and create if. - * + * * @param commandLine * @return * @throws ParseException diff --git a/validator-core/src/main/java/fr/ign/validator/data/Attribute.java b/validator-core/src/main/java/fr/ign/validator/data/Attribute.java index c99cc295..d5385539 100644 --- a/validator-core/src/main/java/fr/ign/validator/data/Attribute.java +++ b/validator-core/src/main/java/fr/ign/validator/data/Attribute.java @@ -9,7 +9,7 @@ /** * Represents an attribute of a Feature (value associated to a type) - * + * * @author MBorne * */ @@ -42,7 +42,7 @@ enum BindingStatus { /** * Construction of an attribute with type and value - * + * * @param type * @param value */ @@ -66,7 +66,7 @@ public AttributeType getType() { /** * Get original value - * + * * @return */ public Object getValue() { diff --git a/validator-core/src/main/java/fr/ign/validator/data/Document.java b/validator-core/src/main/java/fr/ign/validator/data/Document.java index 18722ced..e5135be9 100644 --- a/validator-core/src/main/java/fr/ign/validator/data/Document.java +++ b/validator-core/src/main/java/fr/ign/validator/data/Document.java @@ -26,7 +26,7 @@ /** * Document materialized as a directory (documentPath) associated to a * DocumentModel (documentModel) - * + * * @author MBorne * */ @@ -62,7 +62,7 @@ public class Document implements Validatable { private Map tags = new HashMap<>(); /** - * + * * @param documentModel * @param path */ @@ -87,7 +87,7 @@ public File getDocumentPath() { /** * documentName calculated from directory name - * + * * @return */ public String getDocumentName() { @@ -103,9 +103,9 @@ public List getDocumentFiles() { /** * Retrieves documentFiles by FileModel type - * + * * Example : document.getDocumentFiles(MetadataFile.class) - * + * * @param type * @return */ @@ -128,7 +128,7 @@ public void removeDocumentFile(DocumentFile documentFile) { /** * Retrieve documentFiles corresponding to a model - * + * * @param fileModel * @return */ @@ -200,7 +200,7 @@ public void validate(Context context) throws Exception { /** * Create a validation Database for the Document and apply validators - * + * * @param context */ private void runDatabaseValidators(Context context) { @@ -225,7 +225,7 @@ private void runDatabaseValidators(Context context) { /** * Generates event indicating file matching is starting - * + * * @param context * @throws Exception */ @@ -239,7 +239,7 @@ protected void triggerBeforeMatching(Context context) throws Exception { /** * Generates event indicating validation is starting - * + * * @param context * @throws Exception */ @@ -253,7 +253,7 @@ protected void triggerBeforeValidate(Context context) throws Exception { /** * Generates event indicating validation is done - * + * * @param context * @throws Exception */ @@ -267,7 +267,7 @@ protected void triggerAfterValidate(Context context) throws Exception { /** * Matching files in documentPath with FileModel defined in DocumentModel - * + * * @param documentPath */ public void findDocumentFiles(Context context) { @@ -340,7 +340,7 @@ private void clearFiles() { /** * Get tags - * + * * @return */ public Map getTags() { @@ -349,7 +349,7 @@ public Map getTags() { /** * Insert or update tag - * + * * @param key * @param value */ diff --git a/validator-core/src/main/java/fr/ign/validator/data/DocumentFile.java b/validator-core/src/main/java/fr/ign/validator/data/DocumentFile.java index e2b9b43d..ac7404e3 100644 --- a/validator-core/src/main/java/fr/ign/validator/data/DocumentFile.java +++ b/validator-core/src/main/java/fr/ign/validator/data/DocumentFile.java @@ -26,7 +26,7 @@ public abstract class DocumentFile implements Validatable { /** * Construction of a file from model and filepath - * + * * @param fileModel * @param path */ @@ -48,7 +48,7 @@ public File getPath() { /** * Validating FileModel - * + * * @param context */ public final void validate(Context context) { @@ -78,7 +78,7 @@ public final void validate(Context context) { /** * Validate file content - * + * * @param context */ abstract protected void validateContent(Context context); diff --git a/validator-core/src/main/java/fr/ign/validator/data/Header.java b/validator-core/src/main/java/fr/ign/validator/data/Header.java index 96dbe282..3a2340b3 100644 --- a/validator-core/src/main/java/fr/ign/validator/data/Header.java +++ b/validator-core/src/main/java/fr/ign/validator/data/Header.java @@ -8,9 +8,9 @@ import fr.ign.validator.validation.Validatable; /** - * + * * List of columns of a table associated to a FeatureType - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/data/Row.java b/validator-core/src/main/java/fr/ign/validator/data/Row.java index 82ebb8c6..f629e726 100644 --- a/validator-core/src/main/java/fr/ign/validator/data/Row.java +++ b/validator-core/src/main/java/fr/ign/validator/data/Row.java @@ -11,9 +11,9 @@ import fr.ign.validator.validation.Validatable; /** - * + * * Data from a line of a table - * + * * @author MBorne * */ @@ -45,7 +45,7 @@ public class Row implements Validatable { private String featureId; /** - * + * * @param line * @param values */ diff --git a/validator-core/src/main/java/fr/ign/validator/data/Table.java b/validator-core/src/main/java/fr/ign/validator/data/Table.java index 8b81152f..e473fb74 100644 --- a/validator-core/src/main/java/fr/ign/validator/data/Table.java +++ b/validator-core/src/main/java/fr/ign/validator/data/Table.java @@ -16,7 +16,7 @@ /** * A Table from a {@link SingleTableFile} or a {@link MultiTableFile} - * + * * @author MBorne */ public class Table implements Validatable { diff --git a/validator-core/src/main/java/fr/ign/validator/data/file/MetadataFile.java b/validator-core/src/main/java/fr/ign/validator/data/file/MetadataFile.java index f2ac3dbd..e6693594 100644 --- a/validator-core/src/main/java/fr/ign/validator/data/file/MetadataFile.java +++ b/validator-core/src/main/java/fr/ign/validator/data/file/MetadataFile.java @@ -13,7 +13,7 @@ /** * An ISO19115 metadata file. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/data/file/MultiTableFile.java b/validator-core/src/main/java/fr/ign/validator/data/file/MultiTableFile.java index 8ce5999f..7fe3f3d7 100644 --- a/validator-core/src/main/java/fr/ign/validator/data/file/MultiTableFile.java +++ b/validator-core/src/main/java/fr/ign/validator/data/file/MultiTableFile.java @@ -14,7 +14,7 @@ /** * A table storing a set of tables. - * + * * @author MBorne * */ @@ -34,7 +34,7 @@ public MultiTableModel getFileModel() { /** * Get reader with the correct options. - * + * * @return * @throws IOException */ diff --git a/validator-core/src/main/java/fr/ign/validator/data/file/SingleTableFile.java b/validator-core/src/main/java/fr/ign/validator/data/file/SingleTableFile.java index 9d5e5281..de026362 100644 --- a/validator-core/src/main/java/fr/ign/validator/data/file/SingleTableFile.java +++ b/validator-core/src/main/java/fr/ign/validator/data/file/SingleTableFile.java @@ -12,9 +12,9 @@ import fr.ign.validator.tools.TableReader; /** - * + * * A table storing a table. - * + * * @author MBorne * */ @@ -39,7 +39,7 @@ protected void validateContent(Context context) { /** * File validation - * + * * @param context * @param matchingFile */ diff --git a/validator-core/src/main/java/fr/ign/validator/database/Database.java b/validator-core/src/main/java/fr/ign/validator/database/Database.java index b6d8a4fc..37a13e14 100644 --- a/validator-core/src/main/java/fr/ign/validator/database/Database.java +++ b/validator-core/src/main/java/fr/ign/validator/database/Database.java @@ -39,10 +39,10 @@ import fr.ign.validator.tools.TableReader; /** - * + * * Helper to load document data into a SQL database to validate some constraints * (unique, reference, etc.) - * + * * @author CBouche * @author MBorne * @@ -75,7 +75,7 @@ public class Database implements Closeable { /** * Create or open an SQLITE database - * + * * @param sqlitePath */ public Database(File sqlitePath) { @@ -103,7 +103,7 @@ public void close() throws IOException { /** * Create or open a PostgreSQL database with a given schema - * + * * @param url * @param user * @param password @@ -126,7 +126,7 @@ private Database(String url, String user, String password, String schema) { /** * Get SQL connection - * + * * @return */ public Connection getConnection() { @@ -142,10 +142,10 @@ private boolean hasSchema() { /** * Returns true the database supports geometry type. - * + * * Note that it currently assume that postgis is always enabled for postgresql * database. - * + * * @return */ public boolean hasGeometrySupport() { @@ -158,7 +158,7 @@ public boolean hasGeometrySupport() { /** * If defined, ensure that the specified schema exists and set in search_path. - * + * * @param reset true if the schema has to be re-created * @throws SQLException */ @@ -179,16 +179,16 @@ private void updateCurrentSchema(boolean reset) throws SQLException { /** * Create a validation Database according to environment variables : - * + * *
    *
  • DB_URL (ex : "jdbc:postgresql:validator-test")
    • *
  • DB_USER (ex : "postgis")
    • *
  • DB_PASSWORD (ex : "postgis")
    • *
  • DB_SCHEMA (ex : "validation_{document.id}")
    • *
- * + * * Note that : - * + * *
    *
  • An SQLITE database is created in validation directory if DB_URL is not * specified
    • @@ -200,7 +200,7 @@ private void updateCurrentSchema(boolean reset) throws SQLException { * * @param document * @param reset true if the schema has to be re-created - * + * * @return * @throws SQLException */ @@ -215,7 +215,7 @@ public static Database createDatabase(Context context, boolean reset) throws SQL /** * Create an SQLITE database as document_database.db in validation directory. - * + * * @param context * @param reset * @return @@ -238,7 +238,7 @@ private static Database createSqlLiteDatabase(Context context, boolean reset) th /** * Create a PostgreSQL database according to environment variables. - * + * * @param context * @param reset * @return @@ -263,7 +263,7 @@ private static Database createPostgresDatabase(Context context, boolean reset) t /** * Create tables according to the TableModels of the DocumentModel - * + * * @throws SQLException * @throws IOException */ @@ -280,7 +280,7 @@ public void createTables(DocumentModel documentModel) throws SQLException, IOExc /** * Create a table according to a TableModel - * + * * @param tableModel * @throws SQLException */ @@ -293,7 +293,7 @@ private void createTable(TableModel tableModel) throws SQLException { /** * Create table for a given FeatureType. - * + * * @param tableName * @param featureType * @throws SQLException @@ -321,7 +321,7 @@ private void createTable(StaticTable staticTable) throws IOException, SQLExcepti /** * Create a table with a list of text columns. - * + * * @param string * @param columnNames */ @@ -346,7 +346,7 @@ public void createTable(String tableName, List columnNames) throws SQLEx /** * Create indexes for all tables on unique fields. - * + * * @param document * @throws SQLException */ @@ -359,7 +359,7 @@ public void createIndexes(DocumentModel documentModel) throws SQLException { /** * Create indexes for a given table. - * + * * @param tableModel * @throws SQLException */ @@ -385,7 +385,7 @@ public void createIndexes(TableModel tableModel) throws SQLException { /** * Create index idx_{tableName}_{columnName} on {tableName}({columnName} - * + * * @param tableName * @param columnName */ @@ -400,7 +400,7 @@ public void createIndex(String tableName, String columnName) throws SQLException /** * Load an entire document to the database (insert mode) - * + * * @throws IOException * @throws SQLException */ @@ -421,7 +421,7 @@ public void load(Context context, Document document) throws IOException, SQLExce /** * Load a given {@link SingleTableFile} in the database (insert mode) - * + * * @param context * @param documentFile * @throws IOException @@ -447,7 +447,7 @@ void load(MultiTableFile documentFile) throws IOException, SQLException { /** * Load a given {@link SingleTableFile} in the database (insert mode) - * + * * @param file * @param fileModel * @throws IOException @@ -461,7 +461,7 @@ void load(Context context, SingleTableFile tableFile) throws IOException, SQLExc /** * Load a given {@link StaticTable} in the database (insert mode) - * + * * @param context * @param staticTable * @throws IOException @@ -478,7 +478,7 @@ void load(Context context, StaticTable staticTable) throws IOException, SQLExcep /** * Load a given file into an existing table. - * + * * @param tableName * @param path * @param charset @@ -496,7 +496,7 @@ void loadFile(String tableName, File path, Charset charset) throws IOException, /** * Load a given TableReader in the database (insert mode) - * + * * @param tableName * @param sourceFile * @param reader @@ -586,7 +586,7 @@ void loadTable(String tableName, String sourceFile, TableReader reader, Charset /** * Perform any SQL request returning results - * + * * @param sql * @return * @throws SQLException @@ -603,7 +603,7 @@ public RowIterator query(String sql) throws SQLException { /** * Perform any SQL request that doesn't returns results - * + * * @param sql * @return * @throws SQLException @@ -623,7 +623,7 @@ public void update(String sql) throws SQLException { /** * Return an Array of String giving column names for a giving table - * + * * @param tablename * @return * @throws SQLException @@ -638,7 +638,7 @@ private String[] getTableSchema(String tablename) throws SQLException, IOExcepti /** * Return the number of rows for a given table - * + * * @param tableName * @return * @throws SQLException diff --git a/validator-core/src/main/java/fr/ign/validator/database/RowIterator.java b/validator-core/src/main/java/fr/ign/validator/database/RowIterator.java index 1be9fc5c..d6ae8350 100644 --- a/validator-core/src/main/java/fr/ign/validator/database/RowIterator.java +++ b/validator-core/src/main/java/fr/ign/validator/database/RowIterator.java @@ -14,7 +14,7 @@ public class RowIterator implements Iterator, Closeable { /** * RowIterator from ResultSet (SELECT query) - * + * * @param rs * @throws SQLException */ diff --git a/validator-core/src/main/java/fr/ign/validator/database/internal/ConditionMismatchFinder.java b/validator-core/src/main/java/fr/ign/validator/database/internal/ConditionMismatchFinder.java index d8891960..0c1d131c 100644 --- a/validator-core/src/main/java/fr/ign/validator/database/internal/ConditionMismatchFinder.java +++ b/validator-core/src/main/java/fr/ign/validator/database/internal/ConditionMismatchFinder.java @@ -11,7 +11,7 @@ /** * Condition Mismatch Finder - query the database to get all the features who * did not respect FeatureType conditions - * + * * @author cbouche * */ @@ -24,7 +24,7 @@ public class ConditionMismatchFinder { /** * A precise reference to the id and the file where the constraint failed - * + * * @author cbouche */ public class ConditionMismatch { @@ -38,7 +38,7 @@ public ConditionMismatch(String id, String file) { } /** - * + * * @param database * @param tableName * @param condition diff --git a/validator-core/src/main/java/fr/ign/validator/database/internal/DuplicatedValuesFinder.java b/validator-core/src/main/java/fr/ign/validator/database/internal/DuplicatedValuesFinder.java index 4da51645..6808956a 100644 --- a/validator-core/src/main/java/fr/ign/validator/database/internal/DuplicatedValuesFinder.java +++ b/validator-core/src/main/java/fr/ign/validator/database/internal/DuplicatedValuesFinder.java @@ -10,7 +10,7 @@ /** * Helper to find duplicated values in a given database. - * + * * @author MBorne * */ @@ -23,7 +23,7 @@ public class DuplicatedValuesFinder { /** * A duplicated value with the number of occurence - * + * * @author MBorne */ public class DuplicatedValue { @@ -38,7 +38,7 @@ public DuplicatedValue(String value, int count) { /** * Find duplicated values for a given {tableName}.{columnName} - * + * * @param database * @param tableName * @param columnName diff --git a/validator-core/src/main/java/fr/ign/validator/database/internal/ForeignKeyFinder.java b/validator-core/src/main/java/fr/ign/validator/database/internal/ForeignKeyFinder.java index d9816425..f5e80d56 100644 --- a/validator-core/src/main/java/fr/ign/validator/database/internal/ForeignKeyFinder.java +++ b/validator-core/src/main/java/fr/ign/validator/database/internal/ForeignKeyFinder.java @@ -14,7 +14,7 @@ /** * Foreign Key Finder Provide a method to look out for foreign key not found - * + * * @author cbouche * */ @@ -34,7 +34,7 @@ public ForeignKeyMismatch(String id, String file, String values) { /** * Retreive all Foreign Key Mismatch by perfoming an SQL query to database - * + * * @param database * @param tableModel * @param foreignKey diff --git a/validator-core/src/main/java/fr/ign/validator/error/CoreErrorCodes.java b/validator-core/src/main/java/fr/ign/validator/error/CoreErrorCodes.java index da3472e1..7c94fab2 100644 --- a/validator-core/src/main/java/fr/ign/validator/error/CoreErrorCodes.java +++ b/validator-core/src/main/java/fr/ign/validator/error/CoreErrorCodes.java @@ -2,7 +2,7 @@ /** * Error codes defined in validator-core - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/error/ErrorCode.java b/validator-core/src/main/java/fr/ign/validator/error/ErrorCode.java index 2618f80d..7f01d3f4 100644 --- a/validator-core/src/main/java/fr/ign/validator/error/ErrorCode.java +++ b/validator-core/src/main/java/fr/ign/validator/error/ErrorCode.java @@ -7,7 +7,7 @@ /** * Represents an error code - * + * * @author CBouche * @author MBorne */ @@ -26,7 +26,7 @@ private ErrorCode(final String name) { /** * Creates an ErrorCode according to a string - * + * * @param name * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/error/ErrorFactory.java b/validator-core/src/main/java/fr/ign/validator/error/ErrorFactory.java index e1afc43d..d7f20f40 100644 --- a/validator-core/src/main/java/fr/ign/validator/error/ErrorFactory.java +++ b/validator-core/src/main/java/fr/ign/validator/error/ErrorFactory.java @@ -22,12 +22,12 @@ import fr.ign.validator.exception.ValidatorFatalError; /** - * + * * Creates ValidatorError according to prototypes loaded from configuration * files - * + * * @author MBorne - * + * */ public class ErrorFactory { public static final Logger log = LogManager.getRootLogger(); @@ -44,7 +44,7 @@ public ErrorFactory() { /** * Creates a new error with its code and message parameters - * + * * @param code * @return */ @@ -65,7 +65,7 @@ public ValidatorError newError(ErrorCode code) { /** * Gets loaded prototypes - * + * * @return */ public Collection getPrototypes() { @@ -74,7 +74,7 @@ public Collection getPrototypes() { /** * Finds prototype for the given code - * + * * @param code * @return */ @@ -84,7 +84,7 @@ private ValidatorError findPrototype(ErrorCode code) { /** * Add or replace a prototype - * + * * @param validatorError */ private void addOrReplacePrototype(ValidatorError validatorError) { @@ -94,7 +94,7 @@ private void addOrReplacePrototype(ValidatorError validatorError) { /** * Load error codes from a given file. - * + * * @param errorConfigPath * @throws FileNotFoundException */ @@ -121,7 +121,7 @@ private void loadDefaultErrors() { /** * Load error codes from an input stream. - * + * * @param is */ private void loadErrorCodes(InputStream is) { diff --git a/validator-core/src/main/java/fr/ign/validator/error/ErrorLevel.java b/validator-core/src/main/java/fr/ign/validator/error/ErrorLevel.java index a9744db7..947a0313 100644 --- a/validator-core/src/main/java/fr/ign/validator/error/ErrorLevel.java +++ b/validator-core/src/main/java/fr/ign/validator/error/ErrorLevel.java @@ -2,7 +2,7 @@ /** * ErrorLevel corresponding to the gravity of ValidatorError - * + * * @author MBorne */ public enum ErrorLevel { diff --git a/validator-core/src/main/java/fr/ign/validator/error/ErrorScope.java b/validator-core/src/main/java/fr/ign/validator/error/ErrorScope.java index 2e459314..cd1de5ce 100644 --- a/validator-core/src/main/java/fr/ign/validator/error/ErrorScope.java +++ b/validator-core/src/main/java/fr/ign/validator/error/ErrorScope.java @@ -2,7 +2,7 @@ /** * Error location. Allows to group errors while displaying validation report. - * + * * @author MBorne */ public enum ErrorScope { diff --git a/validator-core/src/main/java/fr/ign/validator/error/ValidatorError.java b/validator-core/src/main/java/fr/ign/validator/error/ValidatorError.java index aa9f716b..9b945e65 100644 --- a/validator-core/src/main/java/fr/ign/validator/error/ValidatorError.java +++ b/validator-core/src/main/java/fr/ign/validator/error/ValidatorError.java @@ -14,7 +14,7 @@ /** * A validation error with corresponding context informations - * + * * @author CBouche * */ @@ -161,7 +161,7 @@ public ValidatorError setMessage(String message) { /** * Replace {name} by value in error message (original is the template) - * + * * @param name * @param value * @return @@ -258,7 +258,7 @@ public Envelope getFeatureBbox() { /** * WKT geometry error - * + * * @return */ public String getErrorGeometry() { @@ -267,7 +267,7 @@ public String getErrorGeometry() { /** * WKT geometry error - * + * * @param errorGeometry * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/exception/ColumnNotFoundException.java b/validator-core/src/main/java/fr/ign/validator/exception/ColumnNotFoundException.java index 31b2fd40..eea5ceff 100644 --- a/validator-core/src/main/java/fr/ign/validator/exception/ColumnNotFoundException.java +++ b/validator-core/src/main/java/fr/ign/validator/exception/ColumnNotFoundException.java @@ -4,7 +4,7 @@ /** * Failure to find column by name. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/exception/GeometryTransformException.java b/validator-core/src/main/java/fr/ign/validator/exception/GeometryTransformException.java index d8dcfc91..85294bfb 100644 --- a/validator-core/src/main/java/fr/ign/validator/exception/GeometryTransformException.java +++ b/validator-core/src/main/java/fr/ign/validator/exception/GeometryTransformException.java @@ -2,7 +2,7 @@ /** * Failure in geometry transform. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/exception/InvalidErrorConfigException.java b/validator-core/src/main/java/fr/ign/validator/exception/InvalidErrorConfigException.java index 4cfbe1e1..332846b5 100644 --- a/validator-core/src/main/java/fr/ign/validator/exception/InvalidErrorConfigException.java +++ b/validator-core/src/main/java/fr/ign/validator/exception/InvalidErrorConfigException.java @@ -1,9 +1,9 @@ package fr.ign.validator.exception; /** - * + * * Failure while reading error configuration - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/exception/InvalidMetadataException.java b/validator-core/src/main/java/fr/ign/validator/exception/InvalidMetadataException.java index b0d72ca3..2a2aeaa3 100644 --- a/validator-core/src/main/java/fr/ign/validator/exception/InvalidMetadataException.java +++ b/validator-core/src/main/java/fr/ign/validator/exception/InvalidMetadataException.java @@ -1,9 +1,9 @@ package fr.ign.validator.exception; /** - * + * * Failure to read metadata file - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/exception/InvalidModelException.java b/validator-core/src/main/java/fr/ign/validator/exception/InvalidModelException.java index 0a94f1e5..de42e96e 100644 --- a/validator-core/src/main/java/fr/ign/validator/exception/InvalidModelException.java +++ b/validator-core/src/main/java/fr/ign/validator/exception/InvalidModelException.java @@ -1,9 +1,9 @@ package fr.ign.validator.exception; /** - * + * * Failure while reading models - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/exception/InvalidProxyException.java b/validator-core/src/main/java/fr/ign/validator/exception/InvalidProxyException.java index cef33719..c2344a36 100644 --- a/validator-core/src/main/java/fr/ign/validator/exception/InvalidProxyException.java +++ b/validator-core/src/main/java/fr/ign/validator/exception/InvalidProxyException.java @@ -1,7 +1,7 @@ package fr.ign.validator.exception; /** - * + * * @author MBorne */ public class InvalidProxyException extends RuntimeException { diff --git a/validator-core/src/main/java/fr/ign/validator/exception/ReadUrlException.java b/validator-core/src/main/java/fr/ign/validator/exception/ReadUrlException.java index dfb007dc..ab16d814 100644 --- a/validator-core/src/main/java/fr/ign/validator/exception/ReadUrlException.java +++ b/validator-core/src/main/java/fr/ign/validator/exception/ReadUrlException.java @@ -5,7 +5,7 @@ /** * Thrown on failure to read a given URL - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/exception/ValidatorFatalError.java b/validator-core/src/main/java/fr/ign/validator/exception/ValidatorFatalError.java index f0dc7eed..0ce98c96 100644 --- a/validator-core/src/main/java/fr/ign/validator/exception/ValidatorFatalError.java +++ b/validator-core/src/main/java/fr/ign/validator/exception/ValidatorFatalError.java @@ -2,7 +2,7 @@ /** * Unrecoverable runtime error (runtime issue, coding problem,...) - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryComplexityThreshold.java b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryComplexityThreshold.java index 83009ceb..790c00d2 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryComplexityThreshold.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryComplexityThreshold.java @@ -3,7 +3,7 @@ /** * A couple of warning threshold and an error one - used by geometry complexity * validator - * + * * @author cbouche * */ diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryLength.java b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryLength.java index c4c1473e..3a69d1b0 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryLength.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryLength.java @@ -24,7 +24,7 @@ public class GeometryLength { /** * get perimeter in meter given the source projection - * + * * @param geometry * @param projection * @return @@ -51,7 +51,7 @@ public static double getPerimeter(Geometry geometry, Projection projection) thro /** * get local projection given a CRS:84's geometry - * + * * @param geometry * @param sourceProjecion * @return @@ -81,7 +81,7 @@ private static Geometry getLocalProjection(Geometry geometry, Projection sourceP /** * get geometry in CRS:84 given the source projection - * + * * @param geometry * @param sourceProjection * @return @@ -104,7 +104,7 @@ private static Geometry getWGS84Projection(Geometry geometry, Projection sourceP * Ensure given projection is in meter in order to avoir reprojection for french * document's in EPSG:2154 WARNING : the length will be bad for projection like * web mercator - * + * * @param projection * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryReader.java b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryReader.java index 5a29d77d..8c4d3d90 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryReader.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryReader.java @@ -19,7 +19,7 @@ * * @see https://github.com/IGNF/validator/issues/232 related to the introduction * of this class to avoid the direct use of WKTReader from JTS. - * + * * @author MBorne * */ @@ -41,7 +41,7 @@ public GeometryReader() { /** * Converts a given string to a JTS {@link Geometry} - * + * * @param wkt * @return * @throws ParseException diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryRings.java b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryRings.java index 7fcd9473..8d970e40 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryRings.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryRings.java @@ -18,7 +18,7 @@ public class GeometryRings { /** * get all geometry for a multiple or simple geometry - * + * * @param geometry * @return */ @@ -37,7 +37,7 @@ public static List getRings(Geometry geometry) { /** * get all geometry for a multiple or simple geometry - * + * * @param geometry * @return */ @@ -58,7 +58,7 @@ public static List getInnerRings(Geometry geometry) { * Determine all rings using the geometry type - point have no rings - * linestring is a unique ring - geometry is compose of multiple interior rings * and an exterior ring - * + * * @param geometry * @return */ @@ -87,7 +87,7 @@ private static List getSimpleGeometryRings(Geometry geometry) { * Determine all inner rings using the geometry type - point have no rings - * linestring have no inner rings - geometry is compose of multiple inner rings * and an exterior ring - * + * * @param geometry * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryThreshold.java b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryThreshold.java index 34eee008..0255e387 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryThreshold.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryThreshold.java @@ -5,7 +5,7 @@ * maximum ring (holes) allowed - maximum parts (multigeometry) allowed - * maximum density (number of point by meters used to describe the geometry) - * and maximum point of any ring (used in density control) - * + * * @author cbouche * */ diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryTransform.java b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryTransform.java index 6de2a92c..2e21993e 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryTransform.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryTransform.java @@ -6,7 +6,7 @@ /** * Apply a transform on a JTS {@link Geometry}. - * + * * @author MBorne * */ @@ -14,7 +14,7 @@ public interface GeometryTransform { /** * Transform a given geometry from source to target projection. - * + * * @param geometry * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/NullTransform.java b/validator-core/src/main/java/fr/ign/validator/geometry/NullTransform.java index 03c75aaf..668096ca 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/NullTransform.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/NullTransform.java @@ -6,7 +6,7 @@ /** * Returns the same geometry (allows to easily disable transforms) - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionList.java b/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionList.java index b2d059e1..64c6c7cf 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionList.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionList.java @@ -12,9 +12,9 @@ /** * Helper class to find supported projections embedded in resources. - * + * * @see validator-core/src/main/resources/projection.json - * + * * @author MBorne */ public class ProjectionList { @@ -32,7 +32,7 @@ private ProjectionList() { } /** - * + * * @return */ public static ProjectionList getInstance() { @@ -41,7 +41,7 @@ public static ProjectionList getInstance() { /** * Get CRS:84 projection. - * + * * @return */ public static Projection getCRS84() { @@ -50,7 +50,7 @@ public static Projection getCRS84() { /** * Find all projections - * + * * @return */ public List findAll() { @@ -59,7 +59,7 @@ public List findAll() { /** * Find projection by code - * + * * @param code * @return */ @@ -74,7 +74,7 @@ public Projection findByCode(String code) { /** * Find projection by code - * + * * @param code * @return */ @@ -89,7 +89,7 @@ public Projection findByUri(String uri) { /** * Load src/main/resources/projection.json - * + * * @throws IOException */ private void loadFromResources() throws IOException { diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionTransform.java b/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionTransform.java index 76899d06..ff0b3921 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionTransform.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionTransform.java @@ -17,7 +17,7 @@ /** * Transforms coordinates from sourceCRS to targetCRS - * + * * @author MBorne * */ @@ -34,7 +34,7 @@ public class ProjectionTransform implements GeometryTransform { /** * Create a ProjectionTransform from source projection to target projection. - * + * * @param source * @param target */ @@ -44,7 +44,7 @@ public ProjectionTransform(Projection source, Projection target) { /** * Create a ProjectionTransform from source projection to CRS:84 (lon,lat). - * + * * @param source */ public ProjectionTransform(Projection source) { @@ -53,7 +53,7 @@ public ProjectionTransform(Projection source) { /** * Create a ProjectionTransform from sourceCRS to targetCRS. - * + * * @param sourceCRS * @param targetCRS */ @@ -72,7 +72,7 @@ private ProjectionTransform(CoordinateReferenceSystem sourceCRS, CoordinateRefer /** * Transform a given geometry from source to target projection. - * + * * @param geometry * @return * @throws MismatchedDimensionException @@ -89,7 +89,7 @@ public Geometry transform(Geometry geometry) throws GeometryTransformException { /** * Transform WKT String in source CRS to Geometry in target CRS - * + * * @param wkt * @return * @throws GeometryTransformException diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/internal/GeometryFormat.java b/validator-core/src/main/java/fr/ign/validator/geometry/internal/GeometryFormat.java index 74db8420..be51e3bb 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/internal/GeometryFormat.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/internal/GeometryFormat.java @@ -5,7 +5,7 @@ /** * Base class for supported geometry formats. - * + * * @author MBorne * */ @@ -13,7 +13,7 @@ public interface GeometryFormat { /** * Read a geometry from a given string. - * + * * @param s * @return * @throws ParseException diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/internal/LegacyWktFormat.java b/validator-core/src/main/java/fr/ign/validator/geometry/internal/LegacyWktFormat.java index 8143760d..97e81c9e 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/internal/LegacyWktFormat.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/internal/LegacyWktFormat.java @@ -10,7 +10,7 @@ /** * Mainly introduced to keep support for "POINT Z (809848 6322607 8)" which is * not supported by {@link WKTReader2} with JTS 1.18. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/internal/WktWithCurveFormat.java b/validator-core/src/main/java/fr/ign/validator/geometry/internal/WktWithCurveFormat.java index 8a93c0d0..c80357c7 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/internal/WktWithCurveFormat.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/internal/WktWithCurveFormat.java @@ -9,9 +9,9 @@ /** * WKT format based on {@link WKTReader2} from JTS with supports CURVEPOLYGON, * COMPOUNDCURVE,...) but not "POINT Z (809848 6322607 8)" - * + * * @see https://docs.geotools.org/stable/userguide/library/jts/geometry.html#creating-circularstring - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoExtractor.java b/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoExtractor.java index 6cfdd309..6ccee95a 100644 --- a/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoExtractor.java +++ b/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoExtractor.java @@ -33,9 +33,9 @@ import fr.ign.validator.tools.TableReader; /** - * + * * Extracts informations from a validation directory of a document - * + * * @author CBouche * @author MBorne * @@ -46,7 +46,7 @@ public class DocumentInfoExtractor { /** * Gets informations on directory - * + * * @param documentName * @param validationDirectory * @return @@ -95,7 +95,7 @@ private void parseDocumentFiles(Context context, Document document, DocumentInfo /** * Retrieve boundingBox and featureCount from normalized file - * + * * @param context * @param fileModel * @param documentFileInfo @@ -111,7 +111,7 @@ private void parseTable(Context context, TableModel fileModel, DocumentFileInfo /** * Retrieve boundingBox and featureCount from normalized file - * + * * @param context * @param fileModel * @param documentFileInfo @@ -140,7 +140,7 @@ private void parseTables(Context context, MultiTableModel fileModel, DocumentFil /** * Get {@link TableStats} from a normalized CSV file. - * + * * @param csvFile * @return */ @@ -170,7 +170,7 @@ private TableStats getTableStatsFromNormalizedCSV(File csvFile) { /** * Gets fileIdentifier from metadataFiles - * + * * @param document * @return */ @@ -194,7 +194,7 @@ private Metadata findMetadata(Document document) { /** * Compute global extends from - * + * * @param repertory * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoWriter.java b/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoWriter.java index 4e1f618c..b16e17d5 100644 --- a/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoWriter.java +++ b/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoWriter.java @@ -13,14 +13,14 @@ /** * DocumentInfo writer - * + * * @author MBorne */ public class DocumentInfoWriter { /** * Save DocumentInfo to JSON file - * + * * @param documentInfo * @param output * @throws JDOMException diff --git a/validator-core/src/main/java/fr/ign/validator/info/internal/DocumentFileInfoComparator.java b/validator-core/src/main/java/fr/ign/validator/info/internal/DocumentFileInfoComparator.java index 371e23ad..2f990bba 100644 --- a/validator-core/src/main/java/fr/ign/validator/info/internal/DocumentFileInfoComparator.java +++ b/validator-core/src/main/java/fr/ign/validator/info/internal/DocumentFileInfoComparator.java @@ -5,9 +5,9 @@ import fr.ign.validator.info.model.DocumentFileInfo; /** - * + * * Helper to sort files according to their names - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/info/model/DocumentFileInfo.java b/validator-core/src/main/java/fr/ign/validator/info/model/DocumentFileInfo.java index dd029f77..94a11d1f 100644 --- a/validator-core/src/main/java/fr/ign/validator/info/model/DocumentFileInfo.java +++ b/validator-core/src/main/java/fr/ign/validator/info/model/DocumentFileInfo.java @@ -13,7 +13,7 @@ /** * Represents a non-geographical file (pdf) in directory - * + * * @author CBouche * */ diff --git a/validator-core/src/main/java/fr/ign/validator/info/model/DocumentInfo.java b/validator-core/src/main/java/fr/ign/validator/info/model/DocumentInfo.java index 7a0b78af..0e321d36 100644 --- a/validator-core/src/main/java/fr/ign/validator/info/model/DocumentInfo.java +++ b/validator-core/src/main/java/fr/ign/validator/info/model/DocumentInfo.java @@ -18,10 +18,10 @@ import fr.ign.validator.model.DocumentModel; /** - * + * * Represents a directory. Contains DataFiles and DataLayers - * - * + * + * * @author CBouche * */ @@ -64,7 +64,7 @@ public DocumentInfo(Document document) { /** * get directory name - * + * * @return */ public String getName() { @@ -73,7 +73,7 @@ public String getName() { /** * Get partial informations for DocumentModel - * + * * @return */ public DocumentModelInfo getDocumentModel() { @@ -83,7 +83,7 @@ public DocumentModelInfo getDocumentModel() { /** * get register Files - * + * * @return */ public List getFiles() { @@ -92,7 +92,7 @@ public List getFiles() { /** * add register File - * + * * @param dataFile */ public void addFile(DocumentFileInfo dataFile) { @@ -119,7 +119,7 @@ public void setMetadata(Metadata metadata) { /** * Get tags - * + * * @return */ public Map getTags() { diff --git a/validator-core/src/main/java/fr/ign/validator/info/model/DocumentModelInfo.java b/validator-core/src/main/java/fr/ign/validator/info/model/DocumentModelInfo.java index 868578a7..35293e34 100644 --- a/validator-core/src/main/java/fr/ign/validator/info/model/DocumentModelInfo.java +++ b/validator-core/src/main/java/fr/ign/validator/info/model/DocumentModelInfo.java @@ -4,7 +4,7 @@ /** * Expose partial informations about the DocumentModel - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/info/model/TableStats.java b/validator-core/src/main/java/fr/ign/validator/info/model/TableStats.java index 39a4b7fe..7285a54d 100644 --- a/validator-core/src/main/java/fr/ign/validator/info/model/TableStats.java +++ b/validator-core/src/main/java/fr/ign/validator/info/model/TableStats.java @@ -10,7 +10,7 @@ /** * Statistics about a table. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/io/AbstractModelReader.java b/validator-core/src/main/java/fr/ign/validator/io/AbstractModelReader.java index fc8adf85..7bfdc1d0 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/AbstractModelReader.java +++ b/validator-core/src/main/java/fr/ign/validator/io/AbstractModelReader.java @@ -22,7 +22,7 @@ /** * Common implementation for JSON and XML ModelReader. - * + * * @author MBorne */ abstract class AbstractModelReader implements ModelReader { @@ -48,7 +48,7 @@ public FeatureType loadFeatureType(File path) throws ModelNotFoundException, Inv } /** - * + * * @param documentModel * @param documentModelUrl * @throws MalformedURLException @@ -71,7 +71,7 @@ protected void loadFeatureTypes(DocumentModel documentModel, URL documentModelUr /** * Load static Files for a given documentModel - * + * * @param documentModel * @param documentModelUrl */ @@ -86,7 +86,7 @@ protected void loadStaticFiles(DocumentModel documentModel, URL documentModelUrl /** * Resolve FeatureType URL for a given FileModel. - * + * * @param documentModelUrl * @param documentModel * @param tableModel @@ -132,7 +132,7 @@ protected URL resolveFeatureTypeUrl(URL documentModelUrl, DocumentModel document /** * Resolve FeatureType URL for a given FileModel. - * + * * @param documentModelUrl * @param documentModel * @param tableModel @@ -174,7 +174,7 @@ protected URL resolveStaticTypeUrl(URL documentModelUrl, DocumentModel documentM /** * Open URL, throws ModelNotFoundException on failure - * + * * @param url * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/io/JsonModelReader.java b/validator-core/src/main/java/fr/ign/validator/io/JsonModelReader.java index e9bc24e6..6e574b5c 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/JsonModelReader.java +++ b/validator-core/src/main/java/fr/ign/validator/io/JsonModelReader.java @@ -14,7 +14,7 @@ /** * Helper class to load {@link DocumentModel} and {@link FeatureType} from JSON. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/io/ModelReader.java b/validator-core/src/main/java/fr/ign/validator/io/ModelReader.java index 4ae3b673..00a79ad8 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/ModelReader.java +++ b/validator-core/src/main/java/fr/ign/validator/io/ModelReader.java @@ -15,14 +15,14 @@ public interface ModelReader { /** * Get format (json or xml, lowercase) - * + * * @return */ public String getFormat(); /** * Read File as a DocumentModel (files.xml) - * + * * @param documentModelPath * @return */ @@ -30,14 +30,14 @@ public interface ModelReader { /** * Read DocumentModel from URL - * + * * @param documentModelUrl */ DocumentModel loadDocumentModel(URL documentModelUrl) throws ModelNotFoundException, InvalidModelException; /** * Load FeatureType from file - * + * * @param featureTypePath * @return * @throws ModelNotFoundException, InvalidModelException @@ -46,7 +46,7 @@ public interface ModelReader { /** * Load FeatureType from URL - * + * * @param featureTypeUrl * @return * @throws ModelNotFoundException, InvalidModelException diff --git a/validator-core/src/main/java/fr/ign/validator/io/ModelReaderFactory.java b/validator-core/src/main/java/fr/ign/validator/io/ModelReaderFactory.java index d7307d72..bfe3f233 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/ModelReaderFactory.java +++ b/validator-core/src/main/java/fr/ign/validator/io/ModelReaderFactory.java @@ -15,7 +15,7 @@ private ModelReaderFactory() { /** * Create a ModelReader detecting format for a given URL : - * + * *
      *
    • Deprecated XmlModelReader only if URL ends with .xml
      • *
    • JsonModelReader for other cases
      • diff --git a/validator-core/src/main/java/fr/ign/validator/io/XmlModelReader.java b/validator-core/src/main/java/fr/ign/validator/io/XmlModelReader.java index 6a99f3aa..d38c4476 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/XmlModelReader.java +++ b/validator-core/src/main/java/fr/ign/validator/io/XmlModelReader.java @@ -15,7 +15,7 @@ /** * Load models using deprecated XML format - * + * * @author MBorne */ public class XmlModelReader extends AbstractModelReader { diff --git a/validator-core/src/main/java/fr/ign/validator/io/json/BoundingBoxSerializer.java b/validator-core/src/main/java/fr/ign/validator/io/json/BoundingBoxSerializer.java index 7dcbd8e4..cb17437c 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/json/BoundingBoxSerializer.java +++ b/validator-core/src/main/java/fr/ign/validator/io/json/BoundingBoxSerializer.java @@ -11,7 +11,7 @@ /** * Serialize BoundingBox to JSON format [xmin,ymin,xmax,ymax] - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/io/json/EnvelopeSerializer.java b/validator-core/src/main/java/fr/ign/validator/io/json/EnvelopeSerializer.java index 7a9ec1bb..33f80e04 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/json/EnvelopeSerializer.java +++ b/validator-core/src/main/java/fr/ign/validator/io/json/EnvelopeSerializer.java @@ -12,7 +12,7 @@ /** * Serialize BoundingBox to JSON format [xmin,ymin,xmax,ymax] - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/io/json/ObjectMapperFactory.java b/validator-core/src/main/java/fr/ign/validator/io/json/ObjectMapperFactory.java index 6be05b85..68087243 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/json/ObjectMapperFactory.java +++ b/validator-core/src/main/java/fr/ign/validator/io/json/ObjectMapperFactory.java @@ -14,9 +14,9 @@ import fr.ign.validator.model.AttributeTypeFactory; /** - * + * * Create ObjectMapper instances - * + * * @author MBorne * */ @@ -27,7 +27,7 @@ public class ObjectMapperFactory { /** * Create an object mapper configured to deal with AttributeType subtypes - * + * * @return */ public static ObjectMapper createObjectMapper() { diff --git a/validator-core/src/main/java/fr/ign/validator/io/json/ValidatorErrorDeserializer.java b/validator-core/src/main/java/fr/ign/validator/io/json/ValidatorErrorDeserializer.java index 98de481e..5b9231f6 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/json/ValidatorErrorDeserializer.java +++ b/validator-core/src/main/java/fr/ign/validator/io/json/ValidatorErrorDeserializer.java @@ -14,9 +14,9 @@ /** * Deserialize ValidatorError - * + * * @see https://www.baeldung.com/jackson-deserialization - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/io/xml/AttributeTypeAdapter.java b/validator-core/src/main/java/fr/ign/validator/io/xml/AttributeTypeAdapter.java index 17ee8c61..67c246e6 100644 --- a/validator-core/src/main/java/fr/ign/validator/io/xml/AttributeTypeAdapter.java +++ b/validator-core/src/main/java/fr/ign/validator/io/xml/AttributeTypeAdapter.java @@ -17,7 +17,7 @@ public class AttributeTypeAdapter extends XmlAdapter getUnexpectedAttributes() { @@ -87,7 +87,7 @@ public List getUnexpectedAttributes() { /** * Returns a list of attributes existing in model and missing in header - * + * * @return */ public List getMissingAttributes() { @@ -127,7 +127,7 @@ private void buildMapping() { /** * Returns the position of an attribute of the FeatureType (in header) - * + * * @param index * @return -1 si absent */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/BoundingBox.java b/validator-core/src/main/java/fr/ign/validator/metadata/BoundingBox.java index 0a50dc08..d069fa3a 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/BoundingBox.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/BoundingBox.java @@ -5,14 +5,14 @@ import fr.ign.validator.io.json.BoundingBoxSerializer; /** - * + * * Implementation of gmd:EX_GeographicBoundingBox - * + * * Note that coordinates are stored as string to allow validation reporting - * + * * @see gmd:EX_GeographicBoundingBox - * + * * @author MBorne * */ @@ -61,7 +61,7 @@ public void setNorthBoundLatitude(String northBoundLatitude) { /** * Test if bounding box is valid - * + * * @return */ public boolean isValid() { @@ -79,7 +79,7 @@ public String toString() { /** * Converts to double array * [westBoundLongitude,southBoundLatitude,eastBoundLongitude,northBoundLatitude] - * + * * @return */ public double[] toArray() { diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/Constraint.java b/validator-core/src/main/java/fr/ign/validator/metadata/Constraint.java index 5586662a..3ef1d86e 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/Constraint.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/Constraint.java @@ -8,11 +8,11 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; /** - * + * * Implementation of gmd:MD_Constraints - * + * * TODO broke hierarchy? - * + * * @see gmd:MD_Constraints * @see gco:Date * @see gco:DateTime @@ -31,7 +31,7 @@ public void setValue(String value) { /** * FIXME test regular expression with sample dates - * + * * @return */ public boolean isValid() { diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/Extent.java b/validator-core/src/main/java/fr/ign/validator/metadata/Extent.java index 7e15aaf3..c4bb19db 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/Extent.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/Extent.java @@ -3,9 +3,9 @@ /** * Partial implementation of gmd:EX_Extent restricted to a gmd:geographicElement * defined as a GeographicBoundingBox - * + * * TODO add temporal extend (fromDate, toDate) - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/Format.java b/validator-core/src/main/java/fr/ign/validator/metadata/Format.java index 4b9cc691..f7f72842 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/Format.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/Format.java @@ -2,10 +2,10 @@ /** * Partial implementation of gmd:MD_Format - * + * * @see gmd:MD_Format - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/Keywords.java b/validator-core/src/main/java/fr/ign/validator/metadata/Keywords.java index 656b3d39..254fb71b 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/Keywords.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/Keywords.java @@ -7,12 +7,12 @@ /** * Implementation of gmd:MD_Keywords - * + * * Note that keywords are internationalized and grouped by thesaurus - * + * * @see gmd:MD_Keywords - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/LegalConstraint.java b/validator-core/src/main/java/fr/ign/validator/metadata/LegalConstraint.java index ca340753..3a5857f0 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/LegalConstraint.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/LegalConstraint.java @@ -8,10 +8,10 @@ /** * Implementation of gmd:MD_LegalConstraints - * + * * @see gmd:MD_LegalConstraints - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/Metadata.java b/validator-core/src/main/java/fr/ign/validator/metadata/Metadata.java index 5997a93e..047ec2e7 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/Metadata.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/Metadata.java @@ -11,9 +11,9 @@ import fr.ign.validator.metadata.code.TopicCategoryCode; /** - * + * * ISO 19115 profile for INSPIRE and CNIG - * + * * @author MBorne * */ @@ -54,35 +54,35 @@ public interface Metadata { /** * GEONETWORK REQUIREMENT - The identifier of the metadata (File identifier) - * + * * @return */ public String getFileIdentifier(); /** * INSPIRE GUIDELINE - 2.2 Identification / 2.2.1 Resource title (p17) - * + * * @return */ public String getTitle(); /** * INSPIRE GUIDELINE - 2.2 Identification / 2.2.2 Resource abstract (p18) - * + * * @return */ public String getAbstract(); /** * INSPIRE GUIDELINE - 2.2 Identification / 2.2.3 Resource Type (p20) - * + * * @return */ public ScopeCode getType(); /** * INSPIRE GUIDELINE - 2.2 Identification / 2.2.4 Resource locator (p21) - * + * * @return */ public List getLocators(); @@ -90,7 +90,7 @@ public interface Metadata { /** * INSPIRE GUIDELINE - 2.2 Identification / 2.2.5 Unique resource identifier * (p24) - * + * * @return */ @Deprecated @@ -100,14 +100,14 @@ public interface Metadata { /** * INSPIRE GUIDELINE - 2.2 Identification / 2.2.5 Unique resource identifier * (p24) - * + * * @return */ public List getIdentifiers(); /** * INSPIRE GUIDELINE - 2.2 Identification / 2.2.7 Resource langage (p26) - * + * * @return */ public LanguageCode getLanguage(); @@ -115,7 +115,7 @@ public interface Metadata { /** * INSPIRE GUIDELINE - 2.3 Classification of spatial data and services / 2.3.1 * Topic category (p27) - * + * * @return */ public TopicCategoryCode getTopicCategory(); @@ -123,7 +123,7 @@ public interface Metadata { /** * INSPIRE GUIDELINE - 2.3 Classification of spatial data and services / 2.4 * Keyword (p31) - * + * * @return */ public List getKeywords(); @@ -131,23 +131,23 @@ public interface Metadata { /** * INSPIRE GUIDELINE - 2.5 Geographic location / 2.5.1 Geographic bounding box * (p35) - * + * * (could be extending to support INSPIRE GUIDELINE - 2.6 Temporal reference) - * + * * @return */ public List getExtents(); /** * CNIG_MD_DU - Encodage - (p7) - * + * * @return */ public ReferenceSystemIdentifier getReferenceSystemIdentifier(); /** * INSPIRE GUIDELINE - 2.6 Temporal reference / 2.6.2 Date of publication (p38) - * + * * @return */ public Date getDateOfPublication(); @@ -155,59 +155,59 @@ public interface Metadata { /** * INSPIRE GUIDELINE - 2.6 Temporal reference / 2.6.3 Date of last revision * (p40) - * + * * @return */ public Date getDateOfLastRevision(); /** * INSPIRE GUIDELINE - 2.6 Temporal reference / 2.6.4 Date of creation (p38) - * + * * @return */ public Date getDateOfCreation(); /** * Resource CharacterSet - * + * * @see http://cnig.gouv.fr/wp-content/uploads/2014/01/Guide-de-saisie-des-éléments-de-métadonnées-INSPIRE-v1.1-final.pdf#page=103 * to support other codes - * + * * @return NULL if not find */ public CharacterSetCode getCharacterSet(); /** * INSPIRE_GUIDELINE - 2.9 Constraints related to access and use (p51-55) - * + * * @return */ public List getConstraints(); /** * CNIG_MD_DU - Encodage (p6) - * + * * @return */ public List getDistributionFormats(); /** * INSPIRE GUIDELINE - 2.7 Quality and validity / 2.7.1 Lineage (p42) - * + * * @return */ public String getLineage(); /** * CNIG_MD_DU - Type de représentation géographique - (p7) - * + * * @return */ public SpatialRepresentationTypeCode getSpatialRepresentationType(); /** * INSPIRE GUIDELINE - 2.7 Quality and validity / 2.7.2 Spatial resolution (p45) - * + * * @return */ public List getSpatialResolutions(); @@ -215,14 +215,14 @@ public interface Metadata { /** * Gets specifications INSPIRE GUIDELINE - 2.8 Conformity / 2.8.2 Specification * (p49) INSPIRE GUIDELINE - 2.8 Conformity / 2.8.1 Degree (p48) - * + * * @return */ public List getSpecifications(); /** * INSPIRE GUIDELINE - 2.10 Responsible organisation (p55) - * + * * @return */ public ResponsibleParty getContact(); @@ -230,21 +230,21 @@ public interface Metadata { /** * INSPIRE GUIDELINE - 2.11 Metadata on metadata / 2.11.1 Metadata point of * contact (p55) - * + * * @return */ public ResponsibleParty getMetadataContact(); /** * INSPIRE GUIDELINE - 2.11 Metadata on metadata / 2.11.2 Metadata date (p60) - * + * * @return */ public Date getMetadataDate(); /** * INSPIRE GUIDELINE - 2.11.3 Metadata language / 2.11.3 Metadata langage (p60) - * + * * @return */ public LanguageCode getMetadataLanguage(); diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/OnlineResource.java b/validator-core/src/main/java/fr/ign/validator/metadata/OnlineResource.java index b53db780..fb1ba775 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/OnlineResource.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/OnlineResource.java @@ -1,12 +1,12 @@ package fr.ign.validator.metadata; /** - * + * * Partial implementation of gmd:CI_OnlineResource - * + * * @see gmd:CI_OnlineResource - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/ReferenceSystemIdentifier.java b/validator-core/src/main/java/fr/ign/validator/metadata/ReferenceSystemIdentifier.java index a207c410..de8572b1 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/ReferenceSystemIdentifier.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/ReferenceSystemIdentifier.java @@ -3,12 +3,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore; /** - * + * * Partial implementation of gmd:RS_Identifier - * + * * @warning not directly convertible to CRS see * http://cnig.gouv.fr/wp-content/uploads/2014/07/Guide-de-saisie-des-%C3%A9l%C3%A9ments-de-m%C3%A9tadonn%C3%A9es-INSPIRE-v1.1.1.pdf#page=30&zoom=auto,-46,416 - * + * * @see gmd:RS_Identifier * @see gmd:MD_Resolution - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/ResponsibleParty.java b/validator-core/src/main/java/fr/ign/validator/metadata/ResponsibleParty.java index b45c4dd2..10af8f92 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/ResponsibleParty.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/ResponsibleParty.java @@ -2,10 +2,10 @@ /** * Partial implementation of gmd:CI_ResponsibleParty - * + * * @see gmd:CI_ResponsibleParty - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/SecurityConstraint.java b/validator-core/src/main/java/fr/ign/validator/metadata/SecurityConstraint.java index d18d6193..b8fbd7a8 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/SecurityConstraint.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/SecurityConstraint.java @@ -2,10 +2,10 @@ /** * Implementation of gmd:MD_SecurityConstraints - * + * * @see gmd:MD_SecurityConstraints - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/Specification.java b/validator-core/src/main/java/fr/ign/validator/metadata/Specification.java index 3fe7eb5b..53e4c3fe 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/Specification.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/Specification.java @@ -3,14 +3,14 @@ /** * Partial implementation for gmd:report items focused on specification * extraction from gmd:DQ_ConformanceResult. - * + * * @see gmd:report * @see gmd:DQ_ConformanceResult * @see gmd:specification - * + * * @author MBorne * */ @@ -33,9 +33,9 @@ public class Specification { /** * Validation result (true, false or text corresponding to gco:nilReason) - * + * * @warning CNIG guidance seems to specify something else than a boolean - * + * * @see gmd:pass */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/code/CharacterSetCode.java b/validator-core/src/main/java/fr/ign/validator/metadata/code/CharacterSetCode.java index 6f00e4db..49952b9c 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/code/CharacterSetCode.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/code/CharacterSetCode.java @@ -6,9 +6,9 @@ import fr.ign.validator.code.CodeListValue; /** - * + * * CharacterSet in metadata file - * + * * @author MBorne * */ @@ -29,13 +29,13 @@ public static CharacterSetCode valueOf(String code) { /** * Gets corresponding java charset - * + * * TODO improve mapping to support check and translate other codes - * + * * @see CharacterSet * in GeoAPI - * + * * @return */ public Charset getCharset() { diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/code/LanguageCode.java b/validator-core/src/main/java/fr/ign/validator/metadata/code/LanguageCode.java index 731a2b23..cb46a618 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/code/LanguageCode.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/code/LanguageCode.java @@ -4,12 +4,12 @@ import fr.ign.validator.code.CodeListValue; /** - * + * * Implementation of gmd:LanguageCode - * + * * @see gmd:LanguageCode - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/code/ScopeCode.java b/validator-core/src/main/java/fr/ign/validator/metadata/code/ScopeCode.java index c740e288..90bd406a 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/code/ScopeCode.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/code/ScopeCode.java @@ -5,10 +5,10 @@ /** * Implementation of gmd:MD_ScopeCode - * + * * @see gmd:MD_ScopeCode - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/code/SpatialRepresentationTypeCode.java b/validator-core/src/main/java/fr/ign/validator/metadata/code/SpatialRepresentationTypeCode.java index 0911809b..f78491e1 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/code/SpatialRepresentationTypeCode.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/code/SpatialRepresentationTypeCode.java @@ -4,12 +4,12 @@ import fr.ign.validator.code.CodeListValue; /** - * + * * Implementation of gmd:LanguageCode - * + * * @see gmd:LanguageCode - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/code/TopicCategoryCode.java b/validator-core/src/main/java/fr/ign/validator/metadata/code/TopicCategoryCode.java index 77318396..67332e6a 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/code/TopicCategoryCode.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/code/TopicCategoryCode.java @@ -4,12 +4,12 @@ import fr.ign.validator.code.CodeListValue; /** - * + * * Implementation of gmd:MD_TopicCategoryCode - * + * * @see gmd:MD_TopicCategoryCode - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/metadata/gmd/MetadataISO19115.java b/validator-core/src/main/java/fr/ign/validator/metadata/gmd/MetadataISO19115.java index fc3543bd..53e12864 100644 --- a/validator-core/src/main/java/fr/ign/validator/metadata/gmd/MetadataISO19115.java +++ b/validator-core/src/main/java/fr/ign/validator/metadata/gmd/MetadataISO19115.java @@ -35,12 +35,12 @@ import fr.ign.validator.metadata.code.TopicCategoryCode; /*** - * + * * ISO 19115 parser for INSPIRE profile and CNIG (french) profiles. - * + * * Note that elements starting with capital letters are "substituable" (so * gmd:MD_DataIdentification is replaced by a joker "*") - * + * * @author MBorne * */ @@ -52,7 +52,7 @@ public class MetadataISO19115 implements Metadata { /** * Create reader from file - * + * * @param file * @throws JDOMException * @throws IOException @@ -63,7 +63,7 @@ public MetadataISO19115(Element metadataElement) throws InvalidMetadataException /** * Create metadata reader from file - * + * * @param file * @return * @throws InvalidMetadataException @@ -81,7 +81,7 @@ public static MetadataISO19115 readFile(File file) throws InvalidMetadataExcepti /** * Tests if the given file is a metadata file (XML file with root element named * MD_Metadata) - * + * * @param file * @return */ @@ -98,7 +98,7 @@ public static boolean isMetadataFile(File file) { /** * Retrieves the underlying XML document - * + * * @return */ protected Element getMetadataElement() { @@ -298,7 +298,7 @@ public List getExtents() { /** * WARNING : MD_SpatialRepresenationTypeCode code list doesn't seems to be in * XSD... CNIG_MD_DU could require "vecteur" instead of "vector" - * + * * @see https://joinup.ec.europa.eu/discussion/geodcat-ap-how-encode-spatial-representation-type */ @Override @@ -336,7 +336,7 @@ public Date getDateOfCreation() { /** * Finds last resource date for a given type (publication, revision, creation) - * + * * @param type * @return */ @@ -363,7 +363,7 @@ private Date getLastDateByType(String type) { /** * Parses Date from dateElement (a gmd:date Element in gmd:citation) - * + * * @param dateElement * @return */ @@ -389,7 +389,7 @@ public CharacterSetCode getCharacterSet() { } /** - * + * * @return */ @Override @@ -412,7 +412,7 @@ public List getConstraints() { /** * gmd:resourceConstraints element - * + * * @param resourceConstraintElement * @return */ @@ -464,7 +464,7 @@ private Constraint parseResourceConstraint(Element resourceConstraintElement) { /** * gmd:identificationInfo - gmd:spatialRepresentationType (ex : vector) - * + * * @return */ @Override @@ -477,7 +477,7 @@ public SpatialRepresentationTypeCode getSpatialRepresentationType() { /** * Get distribution formats - * + * * @return */ @Override @@ -507,7 +507,7 @@ public String getLineage() { /** * INSPIRE GUIDELINE - 2.7 Quality and validity / 2.7.2 Spatial resolution (p45) - * + * * @return */ @Override @@ -545,7 +545,7 @@ public List getSpatialResolutions() { /** * INSPIRE GUIDELINE - 2.8 Conformity / 2.8.2 Specification (p49) CNIG_MD_DU - * 7) Conformité / Spécification (p12) - * + * * @return */ @Override @@ -582,7 +582,7 @@ public List getSpecifications() { /** * INSPIRE GUIDELINE - 2.10 Responsible organisation (p55) - * + * * @return */ @Override @@ -628,7 +628,7 @@ public LanguageCode getMetadataLanguage() { /** * Create an xpath query - * + * * @param path * @return * @throws JDOMException @@ -644,7 +644,7 @@ private XPath createXPath(String path) throws JDOMException { /** * Finds text value for a given path (selectSingleNode converted to string) - * + * * @param path * @param context * @return diff --git a/validator-core/src/main/java/fr/ign/validator/model/AttributeConstraints.java b/validator-core/src/main/java/fr/ign/validator/model/AttributeConstraints.java index 3849fa51..0f8bb37c 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/AttributeConstraints.java +++ b/validator-core/src/main/java/fr/ign/validator/model/AttributeConstraints.java @@ -16,9 +16,9 @@ public class AttributeConstraints { /** * Indicates if null values are forbidden - * + * * @since 4.0 previously "nullable" with opposite value - * + * * @see fr.ign.validator.validation.attribute.AttributeRequiredValidator * @see fr.ign.validator.error.CoreErrorCodes#ATTRIBUTE_UNEXPECTED_NULL */ @@ -26,9 +26,9 @@ public class AttributeConstraints { /** * Indicates if the value is unique in the table - * + * * @since 4.0 previously "identifier" supported only by dgpr plugin - * + * * @see fr.ign.validator.validation.database.AttributeUniqueValidator * @see fr.ign.validator.error.CoreErrorCodes#ATTRIBUTE_NOT_UNIQUE */ @@ -36,9 +36,9 @@ public class AttributeConstraints { /** * Regexp matching the attribute value - * + * * @since 4.0 previously "regexp" - * + * * @see fr.ign.validator.validation.attribute.StringPatternValidator * @see fr.ign.validator.error.CoreErrorCodes#ATTRIBUTE_INVALID_REGEXP */ @@ -46,19 +46,19 @@ public class AttributeConstraints { /** * Minimum length of the value - * + * * @see fr.ign.validator.validation.attribute.MinLengthValidator * @see fr.ign.validator.error.CoreErrorCodes#ATTRIBUTE_SIZE_TOO_SHORT - * + * * @since 4.1 */ private Integer minLength; /** * Maximum length of the value - * + * * @since 4.0 previously "size" - * + * * @see fr.ign.validator.validation.attribute.MaxLengthValidator * @see fr.ign.validator.error.CoreErrorCodes#ATTRIBUTE_SIZE_EXCEEDED */ @@ -66,9 +66,9 @@ public class AttributeConstraints { /** * Restriction on a list of values - * + * * @since 4.0 previously "listOfValues" - * + * * @see fr.ign.validator.validation.attribute.StringEnumValuesValidator * @see fr.ign.validator.error.CoreErrorCodes#ATTRIBUTE_UNEXPECTED_VALUE */ @@ -126,7 +126,7 @@ public void setMinLength(Integer minLength) { /** * Tell if enum restriction is defined - * + * * @return */ public boolean hasEnumValues() { diff --git a/validator-core/src/main/java/fr/ign/validator/model/AttributeType.java b/validator-core/src/main/java/fr/ign/validator/model/AttributeType.java index 3d9ec61b..0805a8d5 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/AttributeType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/AttributeType.java @@ -19,7 +19,7 @@ /** * Describes an attribute of a table (FeatureType) - * + * * @author MBorne * * @param the matching java type @@ -55,7 +55,7 @@ public abstract class AttributeType implements Model, Cloneable { /** * Constructing a class and validators by default - * + * * @param clazz */ protected AttributeType(Class clazz) { @@ -66,7 +66,7 @@ protected AttributeType(Class clazz) { /** * Returns type name - * + * * @return */ @JsonIgnore @@ -74,7 +74,7 @@ protected AttributeType(Class clazz) { /** * Indicates if attribute is a geometry - * + * * @return */ @JsonIgnore @@ -84,7 +84,7 @@ public boolean isGeometry() { /** * Create an AttributeType instance for a given type name - * + * * @param type * @return */ @@ -94,7 +94,7 @@ public static AttributeType forName(String type) { /** * Create an Attribute with a given value - * + * * @param object * @return */ @@ -246,7 +246,7 @@ public void addValidator(Validator> validator) { /** * Converts a value in the matching java type. Validates the possibility of a * conversion of a value in the java type matching the ValueType - * + * * @param value * @return */ @@ -254,9 +254,9 @@ public void addValidator(Validator> validator) { /** * Formats the value as a string parameter (e.g. YYYYMMDD for dates) - * + * * Note : null stays null - * + * * @param value * @return * @throws IllegalArgumentException if type is incorrect @@ -265,7 +265,7 @@ public void addValidator(Validator> validator) { /** * Formats object in parameter - * + * * @param value * @return * @throws IllegalArgumentException if type is incorrect diff --git a/validator-core/src/main/java/fr/ign/validator/model/AttributeTypeFactory.java b/validator-core/src/main/java/fr/ign/validator/model/AttributeTypeFactory.java index 817f2ef8..fc0def50 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/AttributeTypeFactory.java +++ b/validator-core/src/main/java/fr/ign/validator/model/AttributeTypeFactory.java @@ -6,12 +6,12 @@ import java.util.ServiceLoader; /** - * + * * Prototype based factory providing AttributeType creation by name (Boolean, * Double, etc.) - * + * * @see src/main/resources/META-INF/services/fr.ign.validator.model.AttributeType - * + * * @author MBorne * */ @@ -34,7 +34,7 @@ private AttributeTypeFactory() { /** * Gets list of types - * + * * @return */ public Collection getTypeNames() { @@ -43,7 +43,7 @@ public Collection getTypeNames() { /** * Gets a type by name - * + * * @param name * @return */ @@ -54,7 +54,7 @@ public AttributeType createAttributeTypeByName(String name) { /** * Saving a type - * + * * @param valueType */ private void addPrototype(AttributeType valueType) { @@ -63,7 +63,7 @@ private void addPrototype(AttributeType valueType) { /** * Retrieves ValueTypeRegistry instance - * + * * @return */ public static AttributeTypeFactory getInstance() { diff --git a/validator-core/src/main/java/fr/ign/validator/model/DocumentConstraints.java b/validator-core/src/main/java/fr/ign/validator/model/DocumentConstraints.java index 5addfc78..f998ef89 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/DocumentConstraints.java +++ b/validator-core/src/main/java/fr/ign/validator/model/DocumentConstraints.java @@ -9,16 +9,16 @@ public class DocumentConstraints { /** * Constraint - The name of the document folder as a regexp (e.g. * "(2A|2B|[0-9]{2})[0-9]{3}_PLU_[0-9]{8}") - * + * * @since 4.0 previously "regexp" - * + * * @see fr.ign.validator.validation.document.DocumentFolderNameValidator * @see fr.ign.validator.error.CoreErrorCodes#DIRECTORY_UNEXPECTED_NAME */ private String folderName; /** * Constraint - Excepted value in metadata specifications - * + * * @since 4.0 */ private String metadataSpecification; diff --git a/validator-core/src/main/java/fr/ign/validator/model/DocumentModel.java b/validator-core/src/main/java/fr/ign/validator/model/DocumentModel.java index 1285da01..31af6852 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/DocumentModel.java +++ b/validator-core/src/main/java/fr/ign/validator/model/DocumentModel.java @@ -30,7 +30,7 @@ /** * A DocumentModel defines a list of FileModel - * + * * @author MBorne */ @XmlRootElement(name = "document") @@ -87,7 +87,7 @@ public DocumentModel() { /** * Returns the name of the document model - * + * * @return */ public String getName() { @@ -96,7 +96,7 @@ public String getName() { /** * Defines the name of the document model - * + * * @param name */ public void setName(String name) { @@ -123,9 +123,9 @@ public String getRegexp() { /** * Defines regexp matching the directory of the document - * + * * @param regexp - * + * * @deprecated */ public void setRegexp(String regexp) { @@ -141,7 +141,7 @@ public List getFileModels() { /** * Find FileModel by name - * + * * @param typeName * @return */ @@ -163,7 +163,7 @@ public void setFileModels(List fileModels) { /** * Finds FileModel corresponding to File with (full) filepath - * + * * @param documentPath * @param file * @return @@ -183,7 +183,7 @@ public FileModel findFileModelByPath(File file) { /** * Finds FileModel corresponding to File with (only) filename - * + * * @param file * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/FeatureType.java b/validator-core/src/main/java/fr/ign/validator/model/FeatureType.java index 0638540f..5ea34eda 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/FeatureType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/FeatureType.java @@ -15,7 +15,7 @@ /** * Describe the content of a table - * + * * @author MBorne */ @XmlRootElement @@ -51,7 +51,7 @@ public FeatureType() { /** * Indicates if the FeatureType has a parent - * + * * @return */ public boolean hasParent() { @@ -60,7 +60,7 @@ public boolean hasParent() { /** * Gets parent of the FeatureType - * + * * @return */ public FeatureType getParent() { @@ -69,7 +69,7 @@ public FeatureType getParent() { /** * Defines the parent of the FeatureType - * + * * @param featureType */ @XmlTransient @@ -89,7 +89,7 @@ public void setName(String typeName) { /** * Indicates if table is spatial - * + * * @return */ public boolean isSpatial() { @@ -104,7 +104,7 @@ public boolean isSpatial() { /** * Get default geometry (the first one if multiple geometry are defined to match * GeoServer behavior). - * + * * @return */ public GeometryType getDefaultGeometry() { @@ -145,7 +145,7 @@ public void setAttributes(List> attributes) { /** * Adds an attribute - * + * * @param attribute */ public void addAttribute(AttributeType attribute) { @@ -154,7 +154,7 @@ public void addAttribute(AttributeType attribute) { /** * Gets number of attributes (manages inheritance) - * + * * @return */ public int getAttributeCount() { @@ -163,7 +163,7 @@ public int getAttributeCount() { /** * Return number of attributes of parent (0 if parentless) - * + * * @return */ private int getParentAttributeCount() { @@ -176,7 +176,7 @@ private int getParentAttributeCount() { /** * Gets an attribute by its position (manages inheritance) - * + * * @param index * @return */ @@ -193,7 +193,7 @@ public AttributeType getAttribute(int index) { /** * Gets an attribute by its name (manages inheritance) - * + * * @param name * @return */ @@ -207,7 +207,7 @@ public AttributeType getAttribute(String name) { /** * Gets names of attributes - * + * * @return */ public List getAttributeNames() { @@ -219,7 +219,7 @@ public List getAttributeNames() { } /** - * + * * @return */ public FeatureTypeConstraints getConstraints() { @@ -227,7 +227,7 @@ public FeatureTypeConstraints getConstraints() { } /** - * + * * @param constraints */ public void setConstraints(FeatureTypeConstraints constraints) { @@ -238,7 +238,7 @@ public void setConstraints(FeatureTypeConstraints constraints) { * Retreive the attribute providing the featureId. ---- TODO must add an * identifier constraint on type instead of looping for unique constraint ---- * NOW we skip the WKT attribute as an identifier - * + * * @return */ public AttributeType getIdentifier() { @@ -255,7 +255,7 @@ public AttributeType getIdentifier() { /** * Finds the position of an attribute by its name (manages inheritance) - * + * * @param name * @return -1 si undefined */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/FeatureTypeConstraints.java b/validator-core/src/main/java/fr/ign/validator/model/FeatureTypeConstraints.java index 80b0a353..242b3dda 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/FeatureTypeConstraints.java +++ b/validator-core/src/main/java/fr/ign/validator/model/FeatureTypeConstraints.java @@ -8,7 +8,7 @@ import fr.ign.validator.model.constraint.ForeignKeyConstraint; /** - * + * * Feature Type Constraints foreign key conditions SQL queries * * @author cbouche diff --git a/validator-core/src/main/java/fr/ign/validator/model/FeatureTypeRef.java b/validator-core/src/main/java/fr/ign/validator/model/FeatureTypeRef.java index 9e0567e0..56b6f15f 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/FeatureTypeRef.java +++ b/validator-core/src/main/java/fr/ign/validator/model/FeatureTypeRef.java @@ -10,7 +10,7 @@ /** * A reference to a FeatureType (a complete URL or an URL relative to the * DocumentModel URL) - * + * * @author MBorne * */ @@ -42,7 +42,7 @@ public void setValue(String value) { /** * True is the value is null or empty. - * + * * @return */ public boolean isEmpty() { @@ -51,7 +51,7 @@ public boolean isEmpty() { /** * True if the value is a complete URL. - * + * * @return */ public boolean isURL() { diff --git a/validator-core/src/main/java/fr/ign/validator/model/FileModel.java b/validator-core/src/main/java/fr/ign/validator/model/FileModel.java index b25e8750..fddcba4e 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/FileModel.java +++ b/validator-core/src/main/java/fr/ign/validator/model/FileModel.java @@ -35,7 +35,7 @@ /** * Represents a file of a Document - * + * * @author MBorne */ @XmlJavaTypeAdapter(FileModelAdapter.class) @@ -75,7 +75,7 @@ public enum MandatoryMode { /** * Path of the file (regexp without extension, ex : * Donnees_geographiques/ZONE_URBA_[0-9a-b]{5}) - * + * * @since 4.0 previously "regexp" */ private String path; @@ -87,7 +87,7 @@ public enum MandatoryMode { /** * XSD schema (optional, for XML/GML files only) - * + * * @see {@link XsdSchemaValidator} */ @JsonInclude(value = Include.NON_NULL) @@ -104,7 +104,7 @@ protected FileModel() { /** * Get file type - * + * * @return */ @JsonIgnore @@ -112,7 +112,7 @@ protected FileModel() { /** * Creates a DocumentFile for this FileModel - * + * * @return */ abstract public DocumentFile createDocumentFile(File path); @@ -162,7 +162,7 @@ public void addValidator(Validator validator) { /** * Returns the corresponding regexp to : - the supported extensions - the * character "/" for folders - * + * * @return */ @JsonIgnore @@ -172,7 +172,7 @@ public String getRegexpSuffix() { /** * Tests if the file matches the regexp - * + * * @param file * @return */ @@ -186,7 +186,7 @@ public boolean matchPath(File file) { /** * Returns a regexp corresponding to the full path (with folder and extension * according to file type) - * + * * @return */ @JsonIgnore @@ -200,7 +200,7 @@ public String getPathRegexp() { /** * Tests if filename matches the regexp (in order to detect files in wrong * directory) - * + * * @param file * @return */ @@ -213,7 +213,7 @@ public boolean matchFilename(File file) { /** * Returns a regexp corresponding to the filename (with folder for flat * validation and extension according to file type) - * + * * @return */ @JsonIgnore diff --git a/validator-core/src/main/java/fr/ign/validator/model/FileModelFactory.java b/validator-core/src/main/java/fr/ign/validator/model/FileModelFactory.java index 4e58435b..2d88f074 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/FileModelFactory.java +++ b/validator-core/src/main/java/fr/ign/validator/model/FileModelFactory.java @@ -7,9 +7,9 @@ import fr.ign.validator.model.file.SingleTableModel; /** - * + * * Factory providing FileModel creation by name (Table, PDF,etc.) - * + * * @author MBorne * */ @@ -17,7 +17,7 @@ public class FileModelFactory { /** * Create a file model for a given type - * + * * @param name * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/Model.java b/validator-core/src/main/java/fr/ign/validator/model/Model.java index 8b0287e9..09e96d0b 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/Model.java +++ b/validator-core/src/main/java/fr/ign/validator/model/Model.java @@ -2,14 +2,14 @@ /** * Interface representing a model - * + * * @author MBorne */ public interface Model { /** * Returns the name of the model used in the production of the error report - * + * * @return */ public String getName(); diff --git a/validator-core/src/main/java/fr/ign/validator/model/Projection.java b/validator-core/src/main/java/fr/ign/validator/model/Projection.java index 5fdb1c70..27c43935 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/Projection.java +++ b/validator-core/src/main/java/fr/ign/validator/model/Projection.java @@ -7,12 +7,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore; /** - * + * * Provides mapping informations between CRS in geotools and metadata - * + * * WARNING : validityDomain will probably be replaced by a lon,lat bounding box * extracted from URI (current usage is for GpU) - * + * * @author MBorne * */ @@ -46,7 +46,7 @@ public class Projection { /** * WKT representing the validity domain for coordinates in the given projection - * + * * ex : "POLYGON((60000 6010000,60000 7130000,1270000 7130000,1270000 * 6010000,60000 6010000))" */ @@ -94,7 +94,7 @@ public void setValidityDomain(String validityDomain) { /** * Get geotools CRS (null if not found) - * + * * @return */ @JsonIgnore @@ -113,10 +113,10 @@ public CoordinateReferenceSystem getCRS() { /** * Get SRID code (used in postgis command) - * + * * TODO handle coordinate flip for postgis transform (EPSG:4326 is lat,lon for * the validator to match official conventions) - * + * * @return */ public String getSrid() { diff --git a/validator-core/src/main/java/fr/ign/validator/model/StaticTable.java b/validator-core/src/main/java/fr/ign/validator/model/StaticTable.java index e433ca3b..6ee70634 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/StaticTable.java +++ b/validator-core/src/main/java/fr/ign/validator/model/StaticTable.java @@ -11,7 +11,7 @@ /** * Static Table - * + * * @author cbouche * */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/TableModel.java b/validator-core/src/main/java/fr/ign/validator/model/TableModel.java index 3db736a8..45311185 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/TableModel.java +++ b/validator-core/src/main/java/fr/ign/validator/model/TableModel.java @@ -2,7 +2,7 @@ /** * Base interface for models describing a table. - * + * * @author MBorne * */ @@ -10,21 +10,21 @@ public interface TableModel extends Model { /** * Get FeatureType describing the table. - * + * * @return */ public FeatureTypeRef getFeatureTypeRef(); /** * Get FeatureType describing the table. - * + * * @return */ public FeatureType getFeatureType(); /** * Set FeatureType describing the table. - * + * * @param featureType */ public void setFeatureType(FeatureType featureType); diff --git a/validator-core/src/main/java/fr/ign/validator/model/constraint/ForeignKeyConstraint.java b/validator-core/src/main/java/fr/ign/validator/model/constraint/ForeignKeyConstraint.java index 6dfac704..bdb9c03f 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/constraint/ForeignKeyConstraint.java +++ b/validator-core/src/main/java/fr/ign/validator/model/constraint/ForeignKeyConstraint.java @@ -8,7 +8,7 @@ /** * Foreign Key Constraint - * + * * ALTER TABLE featureType ADD CONSTRAINT featureTypeConstraint FOREIGN * KEY(key1, key2) REFERENCES staticTable(reference1, reference2) * diff --git a/validator-core/src/main/java/fr/ign/validator/model/file/DirectoryModel.java b/validator-core/src/main/java/fr/ign/validator/model/file/DirectoryModel.java index 8108c3e6..e4e5d86e 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/file/DirectoryModel.java +++ b/validator-core/src/main/java/fr/ign/validator/model/file/DirectoryModel.java @@ -7,9 +7,9 @@ import fr.ign.validator.model.FileModel; /** - * + * * Represents a directory (as a file with the type "directory") - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/file/EmbeddedTableModel.java b/validator-core/src/main/java/fr/ign/validator/model/file/EmbeddedTableModel.java index 08daa1c7..d611d160 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/file/EmbeddedTableModel.java +++ b/validator-core/src/main/java/fr/ign/validator/model/file/EmbeddedTableModel.java @@ -13,7 +13,7 @@ /** * A table in a {@link MultiTableModel} - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/file/MetadataModel.java b/validator-core/src/main/java/fr/ign/validator/model/file/MetadataModel.java index 140a0370..0f48a726 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/file/MetadataModel.java +++ b/validator-core/src/main/java/fr/ign/validator/model/file/MetadataModel.java @@ -30,9 +30,9 @@ import fr.ign.validator.validation.file.metadata.TypeValidator; /** - * + * * Represents a metadata file - * + * * */ public class MetadataModel extends FileModel { diff --git a/validator-core/src/main/java/fr/ign/validator/model/file/MultiTableModel.java b/validator-core/src/main/java/fr/ign/validator/model/file/MultiTableModel.java index 32872566..ccfd4629 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/file/MultiTableModel.java +++ b/validator-core/src/main/java/fr/ign/validator/model/file/MultiTableModel.java @@ -17,7 +17,7 @@ * Represents a file storing multiple tables. Note that it currently only * supports GML format as it is introduced to validate PCRS data. It might be * extended to support other formats such as GeoPackage. - * + * * @author MBorne * */ @@ -60,7 +60,7 @@ public List getTableModels() { /** * Find table model by name. - * + * * @param name * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/file/PdfModel.java b/validator-core/src/main/java/fr/ign/validator/model/file/PdfModel.java index afc4766f..bdd746b8 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/file/PdfModel.java +++ b/validator-core/src/main/java/fr/ign/validator/model/file/PdfModel.java @@ -7,9 +7,9 @@ import fr.ign.validator.model.FileModel; /** - * + * * Represents a file with the extension ".pdf" - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/file/SingleTableModel.java b/validator-core/src/main/java/fr/ign/validator/model/file/SingleTableModel.java index ebf514fd..16966f62 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/file/SingleTableModel.java +++ b/validator-core/src/main/java/fr/ign/validator/model/file/SingleTableModel.java @@ -18,7 +18,7 @@ /** * A table stored in a file and associated to a FeatureType. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/type/BooleanType.java b/validator-core/src/main/java/fr/ign/validator/model/type/BooleanType.java index 777601f6..8cad0fd8 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/type/BooleanType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/type/BooleanType.java @@ -6,7 +6,7 @@ /** * Represents a boolean - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/type/DateType.java b/validator-core/src/main/java/fr/ign/validator/model/type/DateType.java index 6a36c76d..b6dfebd6 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/type/DateType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/type/DateType.java @@ -63,7 +63,7 @@ public Date bind(Object value) { /** * Tente une conversion - * + * * @param dateValue * @param dateFormat * @return diff --git a/validator-core/src/main/java/fr/ign/validator/model/type/DoubleType.java b/validator-core/src/main/java/fr/ign/validator/model/type/DoubleType.java index ceee12ba..538a2cc4 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/type/DoubleType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/type/DoubleType.java @@ -5,9 +5,9 @@ import fr.ign.validator.model.AttributeType; /** - * + * * Represents a double - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/type/FilenameType.java b/validator-core/src/main/java/fr/ign/validator/model/type/FilenameType.java index ced5d802..60ffd6be 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/type/FilenameType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/type/FilenameType.java @@ -11,11 +11,11 @@ import fr.ign.validator.validation.attribute.MinLengthValidator; /** - * + * * Reference to a file given by filename - * + * * Note : unlike Path, the filename is not the full filepath - * + * * @author MBorne */ @JsonTypeName(FilenameType.TYPE) @@ -37,7 +37,7 @@ public String getTypeName() { /** * Conversion in the matching java type - * + * * @param value * @throws IllegalArgumentException if conversion fails * @return diff --git a/validator-core/src/main/java/fr/ign/validator/model/type/GeometryType.java b/validator-core/src/main/java/fr/ign/validator/model/type/GeometryType.java index 7dd39e2f..9b20b5ff 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/type/GeometryType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/type/GeometryType.java @@ -12,9 +12,9 @@ import fr.ign.validator.validation.attribute.GeometryIsValidValidator; /** - * + * * A geometry of any type - * + * * @author MBorne * */ @@ -69,7 +69,7 @@ public String format(Geometry value) { /** * Extracting a geometry from a collection - * + * * @param geometry * @param c * @return @@ -92,7 +92,7 @@ protected Geometry extractOneFromCollection(Geometry geometry, Class c) { /** * Returns an IllegalArgumentException saying the geometry type is not correct - * + * * @param value */ protected String getMessageInvalidGeometryType(Geometry value) { diff --git a/validator-core/src/main/java/fr/ign/validator/model/type/IntegerType.java b/validator-core/src/main/java/fr/ign/validator/model/type/IntegerType.java index 94609d99..c658693d 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/type/IntegerType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/type/IntegerType.java @@ -35,7 +35,7 @@ public Integer bind(Object object) { } /** - * + * * @param value * @return */ @@ -56,7 +56,7 @@ private Integer tryParseDoubleAndRound(String value) { /** * Tries to pars an integer (e.g. 4) - * + * * @param value * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/type/PathType.java b/validator-core/src/main/java/fr/ign/validator/model/type/PathType.java index e4f50d7c..04234a95 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/type/PathType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/type/PathType.java @@ -11,9 +11,9 @@ import fr.ign.validator.validation.attribute.MinLengthValidator; /** - * + * * Path to a file, relative to Document root - * + * * @author MBorne */ @JsonTypeName(PathType.TYPE) @@ -35,7 +35,7 @@ public String getTypeName() { /** * Conversion in the matching java type - * + * * @param value * @throws IllegalArgumentException if conversion fails * @return diff --git a/validator-core/src/main/java/fr/ign/validator/model/type/StringType.java b/validator-core/src/main/java/fr/ign/validator/model/type/StringType.java index 12382ceb..ed668f74 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/type/StringType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/type/StringType.java @@ -10,7 +10,7 @@ /** * Represents a character string - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/model/type/UrlType.java b/validator-core/src/main/java/fr/ign/validator/model/type/UrlType.java index 96e5ae33..ae0d1a3d 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/type/UrlType.java +++ b/validator-core/src/main/java/fr/ign/validator/model/type/UrlType.java @@ -11,7 +11,7 @@ /** * Location of a file - * + * * @author MBorne */ @JsonTypeName(UrlType.TYPE) @@ -32,7 +32,7 @@ public String getTypeName() { /** * Conversion in the matching java type - * + * * @param value * @throws IllegalArgumentException if conversion fails * @return diff --git a/validator-core/src/main/java/fr/ign/validator/normalize/DocumentNormalizer.java b/validator-core/src/main/java/fr/ign/validator/normalize/DocumentNormalizer.java index 284092ce..300f44fa 100644 --- a/validator-core/src/main/java/fr/ign/validator/normalize/DocumentNormalizer.java +++ b/validator-core/src/main/java/fr/ign/validator/normalize/DocumentNormalizer.java @@ -26,7 +26,7 @@ /** * Creates DATA and METADATA directories in the validation directory : - * + * *
        *
      • Tables are normalized according to FeatureType as * DATA/{fileModel.name}.csv
        • @@ -36,10 +36,10 @@ *
      • Metadata are copied to METADATA directory
        • *
      • Directories are ignored
        • *
      - * + * * Note that DATA and METADATA corresponds to the structure of an EaaS delivery * (former geoportal datastore). - * + * * @author MBorne * */ @@ -49,7 +49,7 @@ public class DocumentNormalizer { /** * Normalize document files. - * + * * @param context */ public void normalize(Context context, Document document) throws IOException { @@ -93,7 +93,7 @@ public void normalize(Context context, Document document) throws IOException { /** * Convert documentFiles in a normalized DATA/{fileModel.name}.csv file. - * + * * @param context * @param fileModel * @param documentFiles @@ -122,7 +122,7 @@ private void normalizeTable(Context context, TableModel fileModel, List *
    • plugin must be defined in the following file : * src/main/resources/META-INF/services/fr.ign.validation.validator.Plugin
      • *
    • plugin must be explicitely loaded in CLI (--plugins)
      • *
        - * + * * @see validator-cnig-plugin (extension for CNIG profiles relative to * www.geoportail-urbanisme.gouv.fr) - * + * * @author MBorne * */ @@ -24,7 +24,7 @@ public interface Plugin { /** * Get plugin name - * + * * @return */ public String getName(); @@ -32,7 +32,7 @@ public interface Plugin { /** * Invoked when the plugin is loaded (allows the plugin to extend models, to * register listeners, etc.) - * + * * @param context */ public void setup(Context context); diff --git a/validator-core/src/main/java/fr/ign/validator/plugin/PluginManager.java b/validator-core/src/main/java/fr/ign/validator/plugin/PluginManager.java index 20b5f4f0..3fe015f9 100644 --- a/validator-core/src/main/java/fr/ign/validator/plugin/PluginManager.java +++ b/validator-core/src/main/java/fr/ign/validator/plugin/PluginManager.java @@ -6,9 +6,9 @@ import java.util.ServiceLoader; /** - * + * * Utility class for plugin handling - * + * * @author MBorne * */ @@ -28,7 +28,7 @@ public PluginManager() { /** * Gets the list with all the plugins - * + * * @return */ public Collection getPlugins() { @@ -37,7 +37,7 @@ public Collection getPlugins() { /** * Gets a plugin by its name - * + * * @param name * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/process/CheckFeatureTypesPreProcess.java b/validator-core/src/main/java/fr/ign/validator/process/CheckFeatureTypesPreProcess.java index 001dc2ce..a38ac91e 100644 --- a/validator-core/src/main/java/fr/ign/validator/process/CheckFeatureTypesPreProcess.java +++ b/validator-core/src/main/java/fr/ign/validator/process/CheckFeatureTypesPreProcess.java @@ -26,10 +26,10 @@ /** * Ensure that FeatureType are defined for each {@link SingleTableModel} and * {@link EmbeddedTableModel} in {@link MultiTableModel}. - * + * * If not, a FeatureType is determined from data in order to allow table * validation of some aspects (geometry,...) without providing a complete model. - * + * * @author MBorne * */ @@ -55,7 +55,7 @@ public void afterValidate(Context context, Document document) throws Exception { /** * Process DocumentModel components. - * + * * @param document * @throws IOException */ @@ -75,7 +75,7 @@ private void process(Context context, Document document, DocumentModel documentM /** * Process FeatureType associated to TableModel. - * + * * @param context * @param document * @param tableModel @@ -180,7 +180,7 @@ private void process(Context context, Document document, MultiTableModel multiTa /** * Get first {@link DocumentFile} matched to {@link FileModel} - * + * * @param document * @param fileModel * @return @@ -204,7 +204,7 @@ private DocumentFile getFirstDocumentFile(Document document, FileModel fileModel /** * False if {@link MultiTableModel} as at least one missing {@link FeatureType} * definition. - * + * * @param multiTableModel * @return */ @@ -219,7 +219,7 @@ private boolean haveAllFeatureFeatureTypeDefined(MultiTableModel multiTableModel /** * Create empty FeatureType to avoid risk of crash during runtime. - * + * * @param name * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/process/DocumentInfoExtractorPostProcess.java b/validator-core/src/main/java/fr/ign/validator/process/DocumentInfoExtractorPostProcess.java index c1c9e393..c936b779 100644 --- a/validator-core/src/main/java/fr/ign/validator/process/DocumentInfoExtractorPostProcess.java +++ b/validator-core/src/main/java/fr/ign/validator/process/DocumentInfoExtractorPostProcess.java @@ -15,15 +15,15 @@ import fr.ign.validator.info.model.DocumentInfo; /** - * + * * Produce a document-info.json file with various informations about the * validated document - * + * * Note that this feature extends and replaces the previous "cnig-infos.xml" * specific to validator-cnig-plugin - * + * * @see DocumentInfo - * + * * @author CBouche * */ diff --git a/validator-core/src/main/java/fr/ign/validator/process/FilterMetadataPreProcess.java b/validator-core/src/main/java/fr/ign/validator/process/FilterMetadataPreProcess.java index a81e5bd3..0364f409 100644 --- a/validator-core/src/main/java/fr/ign/validator/process/FilterMetadataPreProcess.java +++ b/validator-core/src/main/java/fr/ign/validator/process/FilterMetadataPreProcess.java @@ -18,11 +18,11 @@ import fr.ign.validator.model.file.MetadataModel; /** - * + * * Remove XML files which doesn't corresponds to ISO19115 metadata files - * + * * @see MetadataISO19115.isMetadataFile - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/process/MetadataPreProcess.java b/validator-core/src/main/java/fr/ign/validator/process/MetadataPreProcess.java index f82d3f0c..682694d0 100644 --- a/validator-core/src/main/java/fr/ign/validator/process/MetadataPreProcess.java +++ b/validator-core/src/main/java/fr/ign/validator/process/MetadataPreProcess.java @@ -22,10 +22,10 @@ /** * Pre-process extracting data charset from metadata file - * + * * Note that future version may also extract CRS (see * https://github.com/IGNF/validator/issues/40) - * + * * @author CBouche */ public class MetadataPreProcess implements ValidatorListener { @@ -88,7 +88,7 @@ public void beforeValidate(Context context, Document document) throws Exception /** * Read charset from metadata (returns null if not found) - * + * * @param context * @param document * @return @@ -125,7 +125,7 @@ private Charset readCharsetFromMetadata(File metadataFile) { /** * Generates a concatenated list of filenames - * + * * @param context * @param matchingFiles * @return diff --git a/validator-core/src/main/java/fr/ign/validator/process/NormalizePostProcess.java b/validator-core/src/main/java/fr/ign/validator/process/NormalizePostProcess.java index 3dfec2c8..ca8b8d22 100644 --- a/validator-core/src/main/java/fr/ign/validator/process/NormalizePostProcess.java +++ b/validator-core/src/main/java/fr/ign/validator/process/NormalizePostProcess.java @@ -13,7 +13,7 @@ /** * Invoke {@link DocumentNormalizer} to normalize input data in validation * directory. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/process/ProjectionPreProcess.java b/validator-core/src/main/java/fr/ign/validator/process/ProjectionPreProcess.java index 5f7fe859..93d43228 100644 --- a/validator-core/src/main/java/fr/ign/validator/process/ProjectionPreProcess.java +++ b/validator-core/src/main/java/fr/ign/validator/process/ProjectionPreProcess.java @@ -7,9 +7,9 @@ import fr.ign.validator.model.Projection; /** - * + * * Provides informations messages about project - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/process/RemovePreviousFilesPreProcess.java b/validator-core/src/main/java/fr/ign/validator/process/RemovePreviousFilesPreProcess.java index 24ba6a30..11cfab8d 100644 --- a/validator-core/src/main/java/fr/ign/validator/process/RemovePreviousFilesPreProcess.java +++ b/validator-core/src/main/java/fr/ign/validator/process/RemovePreviousFilesPreProcess.java @@ -16,9 +16,9 @@ import fr.ign.validator.tools.TableReader; /** - * + * * Remove temp files from previous run before running validator. - * + * * @author MBorne * */ @@ -29,7 +29,7 @@ public class RemovePreviousFilesPreProcess implements ValidatorListener { /** * Run process on document directory. - * + * * @param documentPath */ public void run(File documentPath) { @@ -51,7 +51,7 @@ public void run(File documentPath) { /** * Is generated by {@link MultiTableReader}? - * + * * @param file * @return */ @@ -61,7 +61,7 @@ private boolean isMultiTableReaderFile(File file) { /** * Is generated by {@link TableReader}? - * + * * @param file * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/report/FilteredReportBuilder.java b/validator-core/src/main/java/fr/ign/validator/report/FilteredReportBuilder.java index 4fec3e63..882208d1 100644 --- a/validator-core/src/main/java/fr/ign/validator/report/FilteredReportBuilder.java +++ b/validator-core/src/main/java/fr/ign/validator/report/FilteredReportBuilder.java @@ -8,10 +8,10 @@ import fr.ign.validator.error.ValidatorError; /** - * + * * Decorate a ReportBuilder to limit the maximum number of error reported for * each type (avoid to handle large file parsing) - * + * * @author FCerizay * */ @@ -31,7 +31,7 @@ public class FilteredReportBuilder implements ReportBuilder { /** * Constructor with an existing reportBuilder - * + * * @param original * @param maxError */ @@ -59,7 +59,7 @@ public void addError(ValidatorError error) { /** * Get count key taking in account xsdErrorCode for XSD_SCHEMA_ERROR. - * + * * @param error * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/report/InMemoryReportBuilder.java b/validator-core/src/main/java/fr/ign/validator/report/InMemoryReportBuilder.java index 44640112..326fa7ce 100644 --- a/validator-core/src/main/java/fr/ign/validator/report/InMemoryReportBuilder.java +++ b/validator-core/src/main/java/fr/ign/validator/report/InMemoryReportBuilder.java @@ -8,9 +8,9 @@ import fr.ign.validator.error.ValidatorError; /** - * + * * Store ValidatorError in memory (designed for test purpose and UI). - * + * * @author MBorne * */ @@ -28,7 +28,7 @@ public void addError(ValidatorError error) { /** * Get reported errors - * + * * @return */ public List getErrors() { @@ -37,7 +37,7 @@ public List getErrors() { /** * Get reported errors for a given ErrorLevel - * + * * @param code * @return */ @@ -53,7 +53,7 @@ public List getErrorsByLevel(ErrorLevel level) { /** * Get reported errors for a given ErrorCode - * + * * @param code * @return */ @@ -69,7 +69,7 @@ public List getErrorsByCode(ErrorCode code) { /** * Count errors - * + * * @return */ public int countErrors() { @@ -78,7 +78,7 @@ public int countErrors() { /** * Count errors for a given code - * + * * @param code * @return */ @@ -88,7 +88,7 @@ public int countErrors(ErrorCode code) { /** * Count errors for a given level - * + * * @param level * @return */ @@ -99,7 +99,7 @@ public int countErrors(ErrorLevel level) { /** * Check that report contains any ValidatorError with level = FATAL or level = * ERROR - * + * * @return */ public boolean isValid() { diff --git a/validator-core/src/main/java/fr/ign/validator/report/JsonReportBuilder.java b/validator-core/src/main/java/fr/ign/validator/report/JsonReportBuilder.java index ecb72b93..86f79e46 100644 --- a/validator-core/src/main/java/fr/ign/validator/report/JsonReportBuilder.java +++ b/validator-core/src/main/java/fr/ign/validator/report/JsonReportBuilder.java @@ -13,7 +13,7 @@ /** * Create a JSON report file (experimental, ValidatorError serialization has to * be improved) - * + * * @author MBorne */ public class JsonReportBuilder implements ReportBuilder, Closeable { diff --git a/validator-core/src/main/java/fr/ign/validator/report/ReportBuilder.java b/validator-core/src/main/java/fr/ign/validator/report/ReportBuilder.java index 6edded0f..d792f4ef 100644 --- a/validator-core/src/main/java/fr/ign/validator/report/ReportBuilder.java +++ b/validator-core/src/main/java/fr/ign/validator/report/ReportBuilder.java @@ -3,9 +3,9 @@ import fr.ign.validator.error.ValidatorError; /** - * + * * Build validation report - * + * * @author MBorne * */ @@ -13,7 +13,7 @@ public interface ReportBuilder { /** * Add error to the report - * + * * @param error */ public void addError(ValidatorError error); diff --git a/validator-core/src/main/java/fr/ign/validator/string/StringFixer.java b/validator-core/src/main/java/fr/ign/validator/string/StringFixer.java index f4b848bb..ec7649b9 100644 --- a/validator-core/src/main/java/fr/ign/validator/string/StringFixer.java +++ b/validator-core/src/main/java/fr/ign/validator/string/StringFixer.java @@ -12,10 +12,10 @@ import fr.ign.validator.string.transform.StringSimplifier; /** - * + * * Compose transforms to fix a input string applying operation in the given * order : - * + * *
          *
        • Detect and fix double UTF-8 encoding relative to LATIN1
          • *
        • Simplify characters for a better support by fonts (common) or by a given @@ -23,7 +23,7 @@ *
        • Escape controls characters and characters not supported by a given * charset
          • *
        - * + * * @author MBorne */ public class StringFixer implements StringTransform { @@ -35,14 +35,14 @@ public class StringFixer implements StringTransform { /** * Enable common character simplification are applied - * + * * @see /validator-core/src/main/resources/simplify/common.csv */ private boolean commonSimplified = false; /** * Enable character simplification relative to this charset (null if disabled) - * + * * @see /validator-core/src/main/resources/simplify/[CHARSET].csv */ private Charset charsetSimplified = null; @@ -59,14 +59,14 @@ public class StringFixer implements StringTransform { /** * Transforms (cached, null if not yet generated) - * + * * @param options */ private List transforms; /** * Create a full string fixer for a given charset (simplify & escape) - * + * * @param charset * @return */ @@ -143,7 +143,7 @@ public String transform(String value) { /** * Get transforms - * + * * @return */ private List getTransforms() { @@ -153,14 +153,14 @@ private List getTransforms() { /** * Build transforms according to options in a given order - * + * *
          *
        • double utf-8 fixing
          • *
        • simplification
          • *
        • escape controls
          • *
        • escape charset specific
          • *
        - * + * */ private void buildTransformsIfRequired() { if (transforms != null) { @@ -192,7 +192,7 @@ private void buildTransformsIfRequired() { /** * Add a transform - * + * * @param transform */ private void addTransform(StringTransform transform) { diff --git a/validator-core/src/main/java/fr/ign/validator/string/StringTransform.java b/validator-core/src/main/java/fr/ign/validator/string/StringTransform.java index 2852575f..f4194c1f 100644 --- a/validator-core/src/main/java/fr/ign/validator/string/StringTransform.java +++ b/validator-core/src/main/java/fr/ign/validator/string/StringTransform.java @@ -2,7 +2,7 @@ /** * Transform a string to an other - * + * * @author MBorne * */ @@ -10,7 +10,7 @@ public interface StringTransform { /** * Transform string to output value - * + * * @param value * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/string/transform/DoubleUtf8Decoder.java b/validator-core/src/main/java/fr/ign/validator/string/transform/DoubleUtf8Decoder.java index 33c5cd8c..9ca14a8b 100644 --- a/validator-core/src/main/java/fr/ign/validator/string/transform/DoubleUtf8Decoder.java +++ b/validator-core/src/main/java/fr/ign/validator/string/transform/DoubleUtf8Decoder.java @@ -8,11 +8,11 @@ import fr.ign.validator.string.StringTransform; /** - * + * * Correction of string in double-encoded utf-8. Proceeds by finding badly * encoded sequences (unefficient if it is sure that the string is badly * encoded) - * + * * @author MBorne * */ @@ -67,7 +67,7 @@ public String transform(String value) { /** * "è" => "è" - * + * * @param s * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/string/transform/EscapeForCharset.java b/validator-core/src/main/java/fr/ign/validator/string/transform/EscapeForCharset.java index 474103a6..f17a0f98 100644 --- a/validator-core/src/main/java/fr/ign/validator/string/transform/EscapeForCharset.java +++ b/validator-core/src/main/java/fr/ign/validator/string/transform/EscapeForCharset.java @@ -7,9 +7,9 @@ import fr.ign.validator.tools.Characters; /** - * + * * Escape characters not supported by a given Charset - * + * * @author MBorne * */ @@ -23,7 +23,7 @@ public EscapeForCharset(Charset charset) { /** * Tests if a character is convertible to the given charset - * + * * @param codePoint * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/string/transform/IsoControlEscaper.java b/validator-core/src/main/java/fr/ign/validator/string/transform/IsoControlEscaper.java index 205f97c6..774bfbf3 100644 --- a/validator-core/src/main/java/fr/ign/validator/string/transform/IsoControlEscaper.java +++ b/validator-core/src/main/java/fr/ign/validator/string/transform/IsoControlEscaper.java @@ -4,9 +4,9 @@ import fr.ign.validator.tools.Characters; /** - * + * * Escape characters marked as ISO controls - * + * * @author MBorne * */ @@ -14,7 +14,7 @@ public class IsoControlEscaper implements StringTransform { /** * Ignores standard controls? - * + * * @see standard controls definition {@link Characters#isStandardControl} */ private boolean standardControlsAllowed; diff --git a/validator-core/src/main/java/fr/ign/validator/string/transform/StringSimplifier.java b/validator-core/src/main/java/fr/ign/validator/string/transform/StringSimplifier.java index 29306c6e..b243a8d2 100644 --- a/validator-core/src/main/java/fr/ign/validator/string/transform/StringSimplifier.java +++ b/validator-core/src/main/java/fr/ign/validator/string/transform/StringSimplifier.java @@ -20,7 +20,7 @@ /** * Replace codePoint a string - * + * * @author MBorne * */ @@ -33,7 +33,7 @@ public class StringSimplifier implements StringTransform { /** * Add replacement - * + * * @param before * @param after */ @@ -43,7 +43,7 @@ public void addReplacement(String before, String after) { /** * Get replacement map - * + * * @return */ public Map getReplacements() { @@ -64,7 +64,7 @@ public String transform(String value) { /** * Load common replacements stored in /simplify/common.csv - * + * * @throws IOException */ public void loadCommon() { @@ -81,7 +81,7 @@ public void loadCommon() { /** * Load charset specific replacements stored in /simplify/[CHARSET-NAME].csv - * + * * @param charset * @throws IOException */ @@ -99,7 +99,7 @@ public void loadCharset(Charset charset) { /** * Load mapping from CSV file (before,after,comment) - * + * * @param file * @throws IOException */ @@ -111,7 +111,7 @@ public void loadCSV(File file) throws IOException { /** * Load mapping from CSV file (before,after,comment) - * + * * @param file * @throws IOException */ @@ -123,7 +123,7 @@ public void loadCSV(Reader reader) throws IOException { /** * Parser CSV - * + * * @param parser */ private void loadCSV(CSVParser parser) { diff --git a/validator-core/src/main/java/fr/ign/validator/tools/AutoFeatureType.java b/validator-core/src/main/java/fr/ign/validator/tools/AutoFeatureType.java index 635eb97b..97fd3eaf 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/AutoFeatureType.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/AutoFeatureType.java @@ -18,7 +18,7 @@ /** * Dirty way to create minimal {@link FeatureType} reading data from table in * order to allow geometry validation when no model is provided for data. - * + * * @author MBorne * */ @@ -38,7 +38,7 @@ private AutoFeatureType() { *
      • WKT column is defined as {@link GeometryType}
        • *
      • other fields are defined as {@link StringType}
        • *
      - * + * * @param path * @return * @throws IOException diff --git a/validator-core/src/main/java/fr/ign/validator/tools/Characters.java b/validator-core/src/main/java/fr/ign/validator/tools/Characters.java index 4adc63a5..24c1a01b 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/Characters.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/Characters.java @@ -1,9 +1,9 @@ package fr.ign.validator.tools; /** - * + * * Utility class validating & escaping characters - * + * * @author MBorne * */ @@ -11,7 +11,7 @@ public class Characters { /** * Test if a character is a standard control : - * + * *
        *
      • Backspace (\b)
        • *
      • Form feed (\f)
        • @@ -19,7 +19,7 @@ public class Characters { *
      • Carriage return (\r)
        • *
      • Tab (\t)
        • *
      - * + * * @param codePoint */ public static boolean isStandardControl(int codePoint) { @@ -36,7 +36,7 @@ public static boolean isStandardControl(int codePoint) { } /** - * + * * @param codePoint * @return */ @@ -59,7 +59,7 @@ public static String escapeControl(int codePoint) { /** * Convert character to URI displaying details - * + * * @param codePoint * @return */ @@ -70,7 +70,7 @@ public static String toURI(int codePoint) { /** * Converts character to hexa representation - * + * * @param codePoint * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/tools/CharsetDetector.java b/validator-core/src/main/java/fr/ign/validator/tools/CharsetDetector.java index 0eead2df..4b21dc9b 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/CharsetDetector.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/CharsetDetector.java @@ -23,14 +23,14 @@ public class CharsetDetector { /** * Detects character encoding from data source between UTF-8 and LATIN1. - * + * * Warning : *
        *
      • Returns UTF-8 first if characters are valid by UTF-8
        • *
      • Consequently, can return UTF-8 if text is ISO_8859_1 without accent
        • *
      - * - * + * + * * @param file * @return * @throws IOException @@ -48,7 +48,7 @@ public static Charset detectCharset(File file) throws IOException { /** * Tests if file is encoded in UTF-8 - * + * * @param file * @return * @throws FileNotFoundException @@ -59,7 +59,7 @@ public static boolean isValidUTF8(File file) { /** * Tests if file is encoded in given charset - * + * * @param file * @param charset * @return diff --git a/validator-core/src/main/java/fr/ign/validator/tools/CompanionFileUtils.java b/validator-core/src/main/java/fr/ign/validator/tools/CompanionFileUtils.java index 190bde18..e4e44be6 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/CompanionFileUtils.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/CompanionFileUtils.java @@ -5,12 +5,12 @@ import org.apache.commons.io.FilenameUtils; /** - * + * * Allows to manipulate file with same name and different extension * (my_table.shp, my_table.dbf, my_table.cpg,...) - * + * * Note that all methods are case sensitive - * + * * @author MBorne * */ @@ -18,7 +18,7 @@ public class CompanionFileUtils { /** * Finds companion file - * + * * @param source Reference file (ex : PARCELLE.dbf) * @param extension companion file extension (ex: shp) * @return companion file (ex : PARCELLE.shp) @@ -33,7 +33,7 @@ public static File getCompanionFile(File source, String extension) { /** * Tests if a companion file exists - * + * * @param source * @param extension * @return @@ -50,7 +50,7 @@ public static boolean hasCompanionFile(File source, String extension) { /** * Removes a companion file - * + * * @param source * @param extension * @return diff --git a/validator-core/src/main/java/fr/ign/validator/tools/EnvelopeUtils.java b/validator-core/src/main/java/fr/ign/validator/tools/EnvelopeUtils.java index 849b1739..a4d93c28 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/EnvelopeUtils.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/EnvelopeUtils.java @@ -13,7 +13,7 @@ /** * Manipulates Bounding Boxes (envelope or bbox) - * + * * @author MBorne * */ @@ -21,7 +21,7 @@ public class EnvelopeUtils { /** * Get bounding box from WKT string. - * + * * @param wkt * @return */ @@ -40,7 +40,7 @@ public static Envelope getEnvelope(String wkt) { /** * Get CRS:84 envelope from WKT string with a given projection. - * + * * @param wkt * @param projection * @return @@ -56,7 +56,7 @@ public static Envelope getEnvelope(String wkt, Projection projection) { /** * Formats bbox as string : "xmin,ymin,xmax,ymax" - * + * * @param env * @return */ @@ -72,7 +72,7 @@ public static String format(Envelope env) { /** * Format double - * + * * @param value * @return */ @@ -82,7 +82,7 @@ public static String formatDouble(double value) { /** * Indicates if bbox is null - * + * * @param env * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/tools/FileConverter.java b/validator-core/src/main/java/fr/ign/validator/tools/FileConverter.java index 6b20ce56..b6d3f2e7 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/FileConverter.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/FileConverter.java @@ -24,12 +24,12 @@ import fr.ign.validator.tools.ogr.OgrVersion; /** - * + * * Helper based on GDAL/ogr2ogr to convert spatial file formats - * + * * @author MBorne * @author CBouche - * + * */ public class FileConverter { @@ -57,7 +57,7 @@ public class FileConverter { /** * EXPERIMENTAL - PCRS - Optional GMLAS config path provided by GMLAS_CONFIG * environment variable. - * + * * @see CONFIG_FILE option for GMLAS driver * https://gdal.org/drivers/vector/gmlas.html#dataset-creation-options */ @@ -75,7 +75,7 @@ private FileConverter() { /** * Get instance - * + * * @return */ public static FileConverter getInstance() { @@ -84,7 +84,7 @@ public static FileConverter getInstance() { /** * returns ogr2ogr version - * + * * @return null if command `ogr2ogr --version` fails */ public OgrVersion getVersion() { @@ -94,7 +94,7 @@ public OgrVersion getVersion() { /** * Convert a source file with a given sourceCharset to an UTF-8 encoded CSV * target. - * + * * @param source * @param target * @param options @@ -214,7 +214,7 @@ public void convertToCSV(File source, File target, TableReaderOptions options) t /** * Convert a source file with a given sourceCharset to an UTF-8 encoded CSV * target. - * + * * @param source * @param target * @param sourceCharset @@ -227,10 +227,10 @@ public void convertToCSV(File source, File target, Charset sourceCharset) throws /** * Converts a VRT file to a LATIN1 encoded shapefile. - * + * * @deprecated related to a legacy datastore (EaaS / mongeoportail), used only * by plugin-cnig - * + * * @param files * @throws IOException */ @@ -285,7 +285,7 @@ public void convertToShapefile(File source, File target) throws IOException { *
    • Environment variable OGR2OGR_PATH
      • *
    • System property ogr2ogr_path
      • *
    - * + * * @return */ private String retrieveOgr2ogrPath() { @@ -305,7 +305,7 @@ private String retrieveOgr2ogrPath() { /** * Get ogr2ogr version - * + * * @return */ private OgrVersion retrieveAndValidateOgrVersion() { @@ -318,7 +318,7 @@ private OgrVersion retrieveAndValidateOgrVersion() { /** * Get path to GMLAS driver config. - * + * * @return */ private File retrieveAndValidateGmlasConfig() { @@ -340,7 +340,7 @@ private File retrieveAndValidateGmlasConfig() { /** * Set gmlasConfig for test purpose. - * + * * @param gmlasConfig */ public void setGmlasConfig(File gmlasConfig) { @@ -349,7 +349,7 @@ public void setGmlasConfig(File gmlasConfig) { /** * Call `ogr2ogr --version` to get GDAL version - * + * * @return */ private String retrieveFullVersion() { @@ -375,7 +375,7 @@ private String retrieveFullVersion() { /** * Convert java charset to GDAL encoding - * + * * @param sourceCharset * @return */ @@ -389,10 +389,10 @@ private String toEncoding(Charset sourceCharset) { /** * Indicates if a source file has a geometry column - * + * * Note : This is used to avoid the different behaviors of ogr2ogr when treating * dbf files - * + * * @param source * @return */ @@ -410,7 +410,7 @@ private boolean hasSpatialColumn(File source) { /** * Run command line - * + * * @throws IOException */ private void runCommand(List args, Map envs) throws IOException { @@ -444,7 +444,7 @@ private void runCommand(List args, Map envs) throws IOEx /** * Logs the execution of a command - * + * * @param args */ private String commandToString(List args) { diff --git a/validator-core/src/main/java/fr/ign/validator/tools/FileUtils.java b/validator-core/src/main/java/fr/ign/validator/tools/FileUtils.java index 16a99226..56edf118 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/FileUtils.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/FileUtils.java @@ -11,7 +11,7 @@ /** * Helper class to find Document files. - * + * * @see http://techblog.sharpmind.de/?p=228 */ public class FileUtils { diff --git a/validator-core/src/main/java/fr/ign/validator/tools/HeaderHelper.java b/validator-core/src/main/java/fr/ign/validator/tools/HeaderHelper.java index ca66600c..49aaf0c3 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/HeaderHelper.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/HeaderHelper.java @@ -2,7 +2,7 @@ /** * Helper to manipulate column names. - * + * * @author MBorne * */ @@ -10,7 +10,7 @@ public class HeaderHelper { /** * Find the position of a given columnName in an header (case insensitive). - * + * * @param header * @param columnName * @return The index of the column, -1 if not found diff --git a/validator-core/src/main/java/fr/ign/validator/tools/ModelHelper.java b/validator-core/src/main/java/fr/ign/validator/tools/ModelHelper.java index 6653d66a..b484a512 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/ModelHelper.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/ModelHelper.java @@ -12,7 +12,7 @@ /** * Helpers to manipulate models. - * + * * @author MBorne * */ @@ -25,7 +25,7 @@ public ModelHelper() { /** * Traverse {@link DocumentModel} to retrieve all {@link SingleTableModel} and * {@link EmbeddedTableModel} - * + * * @param documentModel * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/tools/MultiTableReader.java b/validator-core/src/main/java/fr/ign/validator/tools/MultiTableReader.java index 5120aac6..8928810f 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/MultiTableReader.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/MultiTableReader.java @@ -15,7 +15,7 @@ /** * Helper class to read data from {@link MultiTableFile}. - * + * * @author MBorne * */ @@ -43,7 +43,7 @@ public class MultiTableReader { /** * Create a {@link MultiTableReader} with a source gmlPath and a csvDirectory * produced by an ogr2ogr conversion. - * + * * @param gmlPath * @param csvDirectory */ @@ -58,7 +58,7 @@ private MultiTableReader(File gmlPath, File csvDirectory) { /** * Retrieve table names listing files in converted folder. - * + * * @return */ private List retrieveTableNames() { @@ -79,7 +79,7 @@ private List retrieveTableNames() { /** * Get available table names. - * + * * @return */ public List getTableNames() { @@ -88,7 +88,7 @@ public List getTableNames() { /** * Get reader for a specific table. - * + * * @param tableName * @return * @throws IOException @@ -100,7 +100,7 @@ public TableReader getTableReader(String tableName) throws IOException { /** * Get path to the table converted to CSV. - * + * * @param tableName * @return * @throws IOException @@ -119,9 +119,9 @@ public File getTablePath(String tableName) throws IOException { /** * Create a multiple table reader converting source file to a CSV directory. - * + * * @see {@link fr.ign.validator.data.file.MultiTableFile.MultiTableFile#getReader()} - * + * * @param file * @param preferedCharset * @return diff --git a/validator-core/src/main/java/fr/ign/validator/tools/Networking.java b/validator-core/src/main/java/fr/ign/validator/tools/Networking.java index bfb19062..3921c1d9 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/Networking.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/Networking.java @@ -12,7 +12,7 @@ /** * Helper class to configure networking options (SSL, proxy,...) - * + * * @author MBorne * */ @@ -35,7 +35,7 @@ public static void configureHttpClient() { /** * Configure networking options (ssl, proxy,...) using proxy from command line * options. - * + * * @param proxy * @throws ParseException */ diff --git a/validator-core/src/main/java/fr/ign/validator/tools/ProxyParser.java b/validator-core/src/main/java/fr/ign/validator/tools/ProxyParser.java index b1e72b3c..4ee151da 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/ProxyParser.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/ProxyParser.java @@ -12,7 +12,7 @@ /** * Parse proxy string to get compatibility with HTTP_PROXY environment variables - * + * * @author MBorne * */ @@ -20,13 +20,13 @@ public class ProxyParser { /** * Parse proxy provided as a single string with one of the following format - * + * *
      *
    • {proxyHost}:{proxyPort}
      • *
    • http://{proxyHost}:{proxyPort}
      • *
    • http://{proxyUser}:{proxyPassword}@{proxyHost}:{proxyPort}
      • *
    - * + * * @param proxy * @return the corresponding system properties * @throws ParseException @@ -44,7 +44,7 @@ public static Map parse(String proxy) { /** * Convert syntax from NO_PROXY env variable to java's nonProxyHosts - * + * * @param noProxy * @return */ @@ -69,7 +69,7 @@ public static String toNonProxyHosts(String noProxy) { /** * Parse legacy format {proxyHost}:{proxyPort} - * + * * @param proxy * @param properties * @return @@ -91,7 +91,7 @@ private static Map parseProxyHost(String proxy) { /** * Parse proxy defined as an URL - * + * * @param proxy * @param properties * @return diff --git a/validator-core/src/main/java/fr/ign/validator/tools/ResourceHelper.java b/validator-core/src/main/java/fr/ign/validator/tools/ResourceHelper.java index 046a6b8e..5458c9a9 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/ResourceHelper.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/ResourceHelper.java @@ -6,7 +6,7 @@ public class ResourceHelper { /** * Get resource File corresponding to a given path in clazz package - * + * * @param path ex : "/config/cnig_PLU_2014/files.xml" * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/tools/TableReader.java b/validator-core/src/main/java/fr/ign/validator/tools/TableReader.java index f760f504..f8fa28f8 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/TableReader.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/TableReader.java @@ -25,15 +25,15 @@ /** * Read spatial and non spatial tables from different formats (CSV, Shapefile, * MapInfo, GML, GeoJSON,...). - * + * * Note that : - * + * *
      *
    • CSV files are read using apache-common-csv
      • *
    • Other formats are converted to CSV files (.vrows) using "ogr2ogr"
      • *
    • reader.charsetValid is set to false when charset is invalid
      • *
    - * + * * @author MBorne */ public class TableReader implements Iterator { @@ -60,10 +60,10 @@ public class TableReader implements Iterator { private boolean charsetValid = true; /** - * + * * Reading file with given charset (validated by system). - * - * + * + * * @param file * @param charset * @throws IOException @@ -80,10 +80,10 @@ public class TableReader implements Iterator { } /** - * + * * Reading file with given charset (validated by system). - * - * + * + * * @param file * @param charset * @throws IOException @@ -96,7 +96,7 @@ public class TableReader implements Iterator { /** * Indicate if charset used to open file is valid. - * + * * @return */ public boolean isCharsetValid() { @@ -105,11 +105,11 @@ public boolean isCharsetValid() { /** * Header reading - * - * + * + * * Note : NULL or empty fields are filtered to avoid problems with files with * only one column - * + * * @throws IOException */ private void readHeader() throws IOException { @@ -151,7 +151,7 @@ public void remove() { } /** - * + * * @param row * @return */ @@ -165,7 +165,7 @@ private String[] toArray(CSVRecord row) { /** * Trims a string - * + * * @param value * @return */ @@ -178,7 +178,7 @@ private String trimString(String value) { /** * Converts to NULL an empty string - * + * * @param value */ private String nullifyEmptyString(String value) { @@ -191,7 +191,7 @@ private String nullifyEmptyString(String value) { /** * Finds the position of a column by its name in header - * + * * @param string * @return */ @@ -202,7 +202,7 @@ public int findColumn(String name) { /** * Same as {@link #findColumn(String)} throwing exception when column is not * found. - * + * * @param name * @return * @throws ColumnNotFoundException @@ -218,7 +218,7 @@ public int findColumnRequired(String name) throws ColumnNotFoundException { /** * Creates a reader from a file and a charset. If preferedCharset is invalid, a * valid charset is detected to read the file. - * + * * @param file * @param preferedCharset * @return @@ -255,7 +255,7 @@ public static TableReader createTableReader(File file, Charset preferedCharset) } /** - * + * * @param url * @param charset * @return diff --git a/validator-core/src/main/java/fr/ign/validator/tools/TableReaderOptions.java b/validator-core/src/main/java/fr/ign/validator/tools/TableReaderOptions.java index 2772c75b..1b9c60ce 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/TableReaderOptions.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/TableReaderOptions.java @@ -6,7 +6,7 @@ /** * Options to read table data. - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrBadVersionException.java b/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrBadVersionException.java index 13f319e1..ad7c8152 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrBadVersionException.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrBadVersionException.java @@ -1,9 +1,9 @@ package fr.ign.validator.tools.ogr; /** - * + * * ogr2ogr's version is not supported - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrNotFoundException.java b/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrNotFoundException.java index 3e967112..b1f8c8f1 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrNotFoundException.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrNotFoundException.java @@ -1,9 +1,9 @@ package fr.ign.validator.tools.ogr; /** - * + * * ogr2ogr is missing in the system - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrVersion.java b/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrVersion.java index 5588ab70..72d0e0a5 100644 --- a/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrVersion.java +++ b/validator-core/src/main/java/fr/ign/validator/tools/ogr/OgrVersion.java @@ -6,10 +6,10 @@ import org.apache.commons.lang.StringUtils; /** - * + * * Wrapper around GDAL version provided by "ogr2ogr --version" with the * following format : "GDAL 2.2.2, released 2017/09/15" - * + * * @author MBorne * */ @@ -25,7 +25,7 @@ public class OgrVersion { /** * Result of the command "ogr2ogr --version", for example : - * + * *
      *
    • GDAL 1.9.1, released 2012/05/15
      • *
    • GDAL 2.2.2, released 2017/09/15
      • @@ -41,7 +41,7 @@ public class OgrVersion { /** * Create OgrVersion parsing fullVersion string. - * + * * @param fullVersion * @throws OgrNotFoundException on failure to parse fullVersion */ @@ -68,7 +68,7 @@ public int getPatch() { /** * Indicates if version is supported by IGNF/validator. - * + * * @return */ public boolean isSupported() { @@ -106,7 +106,7 @@ public String toString() { /** * Parse major, minor and patch from fullVersion string. - * + * * @throws OgrNotFoundException */ private void parseFullVersion() throws OgrNotFoundException { diff --git a/validator-core/src/main/java/fr/ign/validator/validation/Validatable.java b/validator-core/src/main/java/fr/ign/validator/validation/Validatable.java index acdf3de6..703af907 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/Validatable.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/Validatable.java @@ -3,9 +3,9 @@ import fr.ign.validator.Context; /** - * + * * Represents a validatable data - * + * * @author MBorne * */ @@ -13,7 +13,7 @@ public interface Validatable { /** * Validates a data with a context - * + * * @param context */ public void validate(Context context) throws Exception; diff --git a/validator-core/src/main/java/fr/ign/validator/validation/Validator.java b/validator-core/src/main/java/fr/ign/validator/validation/Validator.java index b72f17c8..cae336b0 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/Validator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/Validator.java @@ -3,9 +3,9 @@ import fr.ign.validator.Context; /** - * + * * Interface representing a validator for a validatable data - * + * * @author MBorne * * @param @@ -14,7 +14,7 @@ public interface Validator { /** * Validates the element - * + * * @param context * @param validatable */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/AttributeRequiredValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/AttributeRequiredValidator.java index e8e26a88..6b382127 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/AttributeRequiredValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/AttributeRequiredValidator.java @@ -8,7 +8,7 @@ /** * Validates if an attribute is nullable or not (reports unexpected null * attribute) - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/CharactersValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/CharactersValidator.java index 3ef25e26..6b5567d6 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/CharactersValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/CharactersValidator.java @@ -9,9 +9,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validate characters according to {@link StringFixer} - * + * * @author MBorne * * @param diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/FilenameExistsValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/FilenameExistsValidator.java index f8df10fa..f64a0b5f 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/FilenameExistsValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/FilenameExistsValidator.java @@ -13,9 +13,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates that the path exists for PathAttribute type attributes - * + * * @author MBorne * */ @@ -46,7 +46,7 @@ public void validate(Context context, Attribute attribute) { /** * Recursive search of a file in a directory - * + * * @param root * @param filename * @return @@ -66,7 +66,7 @@ private List findFilesByFilename(File root, String filename) { /** * Remove fragment from URI (#page=125) - * + * * @param path * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryDataExtentValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryDataExtentValidator.java index ed11e0c2..b1701a1e 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryDataExtentValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryDataExtentValidator.java @@ -8,11 +8,11 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validation de la projection déclarée sur une géométrie en comparaison avec * l'emprise de définition de la projection Validates that the geometry fits in * data extent - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryErrorCode.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryErrorCode.java index 527a6333..159dc195 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryErrorCode.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryErrorCode.java @@ -34,7 +34,7 @@ public static GeometryErrorCode valueOf(String code) { /** * Get associated message - * + * * @return */ public String getMessage() { @@ -43,7 +43,7 @@ public String getMessage() { /** * Translate JTS code - * + * * @param errorType * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryIsValidValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryIsValidValidator.java index 44db1a62..64a7a66a 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryIsValidValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/GeometryIsValidValidator.java @@ -13,9 +13,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates a geometry - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/MaxLengthValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/MaxLengthValidator.java index 265e6c12..c14f73e2 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/MaxLengthValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/MaxLengthValidator.java @@ -7,7 +7,7 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates the size of a StringType Attribute * * @author MBorne diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/MinLengthValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/MinLengthValidator.java index 7310a60e..7d478324 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/MinLengthValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/MinLengthValidator.java @@ -7,7 +7,7 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates the size of a StringType Attribute * * @author MBorne diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/PathExistsValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/PathExistsValidator.java index 5c6d1362..ae36aa5d 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/PathExistsValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/PathExistsValidator.java @@ -8,9 +8,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates that the path exists for PathAttribute type attributes - * + * * @author MBorne * */ @@ -39,7 +39,7 @@ public void validate(Context context, Attribute attribute) { /** * Remove fragment from URI (#page=125) - * + * * @param path * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/StringEnumValuesValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/StringEnumValuesValidator.java index af8bb893..00f06d59 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/StringEnumValuesValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/StringEnumValuesValidator.java @@ -9,9 +9,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates according to a list of values - * + * * @author MBorne * */ @@ -52,7 +52,7 @@ public void validate(Context context, Attribute attribute) { /** * Formatting a list of values for error report - * + * * @param listOfValues * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/StringPatternValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/StringPatternValidator.java index 0e4f2595..f6eeac31 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/StringPatternValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/StringPatternValidator.java @@ -9,9 +9,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates a StringType Attribute according to a regexp - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/attribute/UrlValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/attribute/UrlValidator.java index 282cfa6c..402309ea 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/attribute/UrlValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/attribute/UrlValidator.java @@ -8,7 +8,7 @@ /** * Validates the URL - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/database/AttributeReferenceValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/database/AttributeReferenceValidator.java index 7465cbe1..24000045 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/database/AttributeReferenceValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/database/AttributeReferenceValidator.java @@ -24,7 +24,7 @@ /** * Validate "reference" constraints using validation database. - * + * * @author MBorne * */ @@ -164,7 +164,7 @@ private void doValidate(Context context, Database database) throws SQLException, /** * Get SQL statement to retrieve rows with invalid reference. - * + * * @param sourceTableName * @param sourceColumnName * @param targetTableName diff --git a/validator-core/src/main/java/fr/ign/validator/validation/database/AttributeUniqueValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/database/AttributeUniqueValidator.java index 750cba2e..f9872b89 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/database/AttributeUniqueValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/database/AttributeUniqueValidator.java @@ -22,7 +22,7 @@ /** * Validate attributes according to "unique" constraints. - * + * * @author CBouche * @author MBorne */ @@ -35,7 +35,7 @@ public class AttributeUniqueValidator implements Validator { /** * Check if there every ID is unique in a given table - * + * * @param context * @param document * @param database diff --git a/validator-core/src/main/java/fr/ign/validator/validation/database/FeatureTypeConditionsValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/database/FeatureTypeConditionsValidator.java index 646e1c57..eb48a6a5 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/database/FeatureTypeConditionsValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/database/FeatureTypeConditionsValidator.java @@ -24,7 +24,7 @@ * FeatureType Condition Validator - Database Validator - Search FeatureType * which has conditions constraints - Perform ConditionMismatchFinder method on * each conditions - * + * * @author cbouche * */ @@ -37,7 +37,7 @@ public class FeatureTypeConditionsValidator implements Validator { /** * Check if every conditions is respected - * + * * @param context * @param document * @param database diff --git a/validator-core/src/main/java/fr/ign/validator/validation/database/ForeignKeyValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/database/ForeignKeyValidator.java index 39ae3470..6f34a732 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/database/ForeignKeyValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/database/ForeignKeyValidator.java @@ -23,7 +23,7 @@ /** * Database validator - * + * * @author cbouche * */ @@ -36,7 +36,7 @@ public class ForeignKeyValidator implements Validator { /** * Check if every conditions is respected - * + * * @param context * @param document * @param database diff --git a/validator-core/src/main/java/fr/ign/validator/validation/document/DocumentFolderNameValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/document/DocumentFolderNameValidator.java index 39b6c91b..936d7338 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/document/DocumentFolderNameValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/document/DocumentFolderNameValidator.java @@ -8,10 +8,10 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensure that the name of the document directory correspond the regexp defined * in DocumentModel - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/document/DocumentMandatoryFileValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/document/DocumentMandatoryFileValidator.java index 713edb70..b553f35e 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/document/DocumentMandatoryFileValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/document/DocumentMandatoryFileValidator.java @@ -9,9 +9,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensure that mandatory files are presents - * + * * @author MBorne * */ @@ -51,10 +51,10 @@ public void validate(Context context, Document document) { /** * ErrorCode according to FileModel - * + * * Note : Did not want to explain to users that a directory is a particular file - * - * + * + * * @param fileModel * @return */ @@ -68,7 +68,7 @@ private ErrorCode getErrorCodeRecommanded(FileModel fileModel) { /** * ErrorCode according to FileModel - * + * * @param fileModel * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/XsdSchemaValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/XsdSchemaValidator.java index eb5c4fd8..b85cb452 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/XsdSchemaValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/XsdSchemaValidator.java @@ -34,9 +34,9 @@ /** * Validate a file according to a given XSD schema. - * + * * @see https://stackoverflow.com/a/7114306 - * + * * @author MBorne * */ @@ -82,7 +82,7 @@ public void startElement(String uri, String localName, String qName, Attributes /** * Get identifier from attributes - * + * * @param attributes * @return */ @@ -144,7 +144,7 @@ private void report(SAXParseException e) { /** * Format elements stack to pseudo XPath - * + * * @return */ private String getCurrentPath() { @@ -166,7 +166,7 @@ public void validate(Context context, DocumentFile documentFile) { /** * Validate xmlFile according to xsdSchema. - * + * * @param context * @param xsdSchema * @param xmlFile @@ -194,7 +194,7 @@ void validate(Context context, URL xsdSchema, File xmlFile) { } /** - * + * * @param xsdSchemaUrl * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/AbstractValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/AbstractValidator.java index ba7e0754..ea620678 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/AbstractValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/AbstractValidator.java @@ -12,9 +12,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "abstract" is defined and not empty - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/CharacterSetValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/CharacterSetValidator.java index f250da4f..1f4d6d4c 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/CharacterSetValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/CharacterSetValidator.java @@ -13,9 +13,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates metadata.characterSet - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/ContactValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/ContactValidator.java index 42455ce3..7dcf6a2e 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/ContactValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/ContactValidator.java @@ -12,9 +12,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "contact" is defined - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/DatesValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/DatesValidator.java index 1053832d..3f5518cb 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/DatesValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/DatesValidator.java @@ -11,14 +11,14 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates dateOfPublication, dateOfLastRevision and dateOfCreation : - * + * *
        *
      • Ensures that at least one date is defined
        • *
      • Ensures that each defined date is in a valid format
        • *
      - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/DistributionFormatsValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/DistributionFormatsValidator.java index 5b6dcdc1..ea8d3bee 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/DistributionFormatsValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/DistributionFormatsValidator.java @@ -15,9 +15,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "distributionFormats" is not empty and that formats are valid - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/ExtentsValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/ExtentsValidator.java index acbb4cae..8db2520d 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/ExtentsValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/ExtentsValidator.java @@ -14,9 +14,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "extents" is defined and is valid - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/FileIdentifierValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/FileIdentifierValidator.java index 87b4b0fa..352742a5 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/FileIdentifierValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/FileIdentifierValidator.java @@ -12,9 +12,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "fileIdentifier" is defined and not empty - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/IdentifiersValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/IdentifiersValidator.java index 8d867def..38f4a18c 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/IdentifiersValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/IdentifiersValidator.java @@ -14,9 +14,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "identifier" is defined and not empty - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LanguageValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LanguageValidator.java index 60b87437..1ecf54bf 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LanguageValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LanguageValidator.java @@ -13,9 +13,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates metadata.language - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LineageValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LineageValidator.java index d75e1948..dd8c4717 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LineageValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LineageValidator.java @@ -12,9 +12,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "lineage" is defined and not empty - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LocatorsValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LocatorsValidator.java index b60dabdf..faceecd5 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LocatorsValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/LocatorsValidator.java @@ -15,9 +15,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "locators" is defined and each locator is valid - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataContactValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataContactValidator.java index 6d7ba2a5..d32a2f1b 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataContactValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataContactValidator.java @@ -12,9 +12,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "metadataContact" is defined - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataDateValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataDateValidator.java index 8501e963..fb20c161 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataDateValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataDateValidator.java @@ -12,9 +12,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "metadataDate" is defined and valid - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataLanguageValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataLanguageValidator.java index 6d6009ed..7a0768af 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataLanguageValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/MetadataLanguageValidator.java @@ -13,9 +13,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates metadata.language - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpatialRepresentationTypeValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpatialRepresentationTypeValidator.java index 722d5fbb..f7903d81 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpatialRepresentationTypeValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpatialRepresentationTypeValidator.java @@ -13,9 +13,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Validates metadata.spatialRepresentationType - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpatialResolutionsValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpatialResolutionsValidator.java index 3ec87330..2d124591 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpatialResolutionsValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpatialResolutionsValidator.java @@ -14,10 +14,10 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "spatialResolutions" is not empty and that content (denominator * or distance) is valid. - * + * * @author MBorne * */ @@ -62,7 +62,7 @@ public void validate(Context context, Metadata metadata) { /** * TODO move to IntegerType - * + * * @param value * @return */ @@ -80,7 +80,7 @@ private boolean isValidInteger(String value) { /** * TODO move to DoubleType - * + * * @param value * @return */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpecificationsValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpecificationsValidator.java index 8ed5902b..9402ec21 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpecificationsValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/SpecificationsValidator.java @@ -15,10 +15,10 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "specifications" is not empty and that each "specification" is * valid - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TitleValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TitleValidator.java index fbf30f8f..40a4a5cd 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TitleValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TitleValidator.java @@ -12,9 +12,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "title" is defined and not empty - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TopicCategoryValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TopicCategoryValidator.java index e0cf483b..1842ee6f 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TopicCategoryValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TopicCategoryValidator.java @@ -13,9 +13,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "topicCategory" is defined and valid - * + * * @author MBorne * */ diff --git a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TypeValidator.java b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TypeValidator.java index fcbe3304..bfff0bfb 100644 --- a/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TypeValidator.java +++ b/validator-core/src/main/java/fr/ign/validator/validation/file/metadata/TypeValidator.java @@ -13,9 +13,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Ensures that "type" is defined and allowed - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/command/MetadataToJsonCommandRegressTest.java b/validator-core/src/test/java/fr/ign/validator/command/MetadataToJsonCommandRegressTest.java index 0c7e02a5..f2b88856 100644 --- a/validator-core/src/test/java/fr/ign/validator/command/MetadataToJsonCommandRegressTest.java +++ b/validator-core/src/test/java/fr/ign/validator/command/MetadataToJsonCommandRegressTest.java @@ -16,7 +16,7 @@ /** * Regress test for metadata_to_json command - * + * * @author FCerizay */ public class MetadataToJsonCommandRegressTest { diff --git a/validator-core/src/test/java/fr/ign/validator/command/options/OutputFileOptionTest.java b/validator-core/src/test/java/fr/ign/validator/command/options/OutputFileOptionTest.java index 5ced8b13..94ac263a 100644 --- a/validator-core/src/test/java/fr/ign/validator/command/options/OutputFileOptionTest.java +++ b/validator-core/src/test/java/fr/ign/validator/command/options/OutputFileOptionTest.java @@ -14,7 +14,7 @@ /** * Test {@link OutputFileOption} helper. - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/command/options/OutputProjectionOptionTest.java b/validator-core/src/test/java/fr/ign/validator/command/options/OutputProjectionOptionTest.java index a7632d1c..40a1b6f5 100644 --- a/validator-core/src/test/java/fr/ign/validator/command/options/OutputProjectionOptionTest.java +++ b/validator-core/src/test/java/fr/ign/validator/command/options/OutputProjectionOptionTest.java @@ -15,7 +15,7 @@ /** * Test {@link OutputProjectionOption} helper. - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/database/DatabaseTest.java b/validator-core/src/test/java/fr/ign/validator/database/DatabaseTest.java index 6e54b8a2..3d622964 100644 --- a/validator-core/src/test/java/fr/ign/validator/database/DatabaseTest.java +++ b/validator-core/src/test/java/fr/ign/validator/database/DatabaseTest.java @@ -33,7 +33,7 @@ public class DatabaseTest { /** * Create an SQLITE database with a specific path and performs basic tests - * + * * @throws Exception */ @Test @@ -66,7 +66,7 @@ public void testUpdateFail() throws SQLException, IOException { /** * Performs basic test with some queries - * + * * @throws Exception */ @Test @@ -91,7 +91,7 @@ public void testCreateInsertSelect() throws Exception { /** * Load DUMMY.csv file with A,B,WKT columns in table with A,B columns. - * + * * @throws Exception */ @Test @@ -113,7 +113,7 @@ public void testLoadSimpleFileWithColumnsAandB() throws Exception { /** * Load DUMMY.csv file with A,B,WKT columns in table with C,D columns. - * + * * @throws Exception */ @Test @@ -153,7 +153,7 @@ public void testLoadAdresseMultiple() throws Exception { /** * Get sample Document - * + * * @return * @throws IOException */ @@ -172,7 +172,7 @@ protected Document getSampleDocument(String documentModelName, String documentNa /** * Create a test context - * + * * @return */ private Context createTestContext() { diff --git a/validator-core/src/test/java/fr/ign/validator/error/ErrorFactoryTest.java b/validator-core/src/test/java/fr/ign/validator/error/ErrorFactoryTest.java index b7020808..e30dc76a 100644 --- a/validator-core/src/test/java/fr/ign/validator/error/ErrorFactoryTest.java +++ b/validator-core/src/test/java/fr/ign/validator/error/ErrorFactoryTest.java @@ -10,9 +10,9 @@ import fr.ign.validator.tools.ResourceHelper; /** - * + * * Test ErrorFactory according to error codes - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/error/ValidatorErrorTest.java b/validator-core/src/test/java/fr/ign/validator/error/ValidatorErrorTest.java index 467366df..01be3019 100644 --- a/validator-core/src/test/java/fr/ign/validator/error/ValidatorErrorTest.java +++ b/validator-core/src/test/java/fr/ign/validator/error/ValidatorErrorTest.java @@ -4,9 +4,9 @@ import org.junit.Test; /** - * + * * Test ValidatorError behavior about parameters. - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/geometry/GeometryLengthTest.java b/validator-core/src/test/java/fr/ign/validator/geometry/GeometryLengthTest.java index 1db4e46a..3d4d0e01 100644 --- a/validator-core/src/test/java/fr/ign/validator/geometry/GeometryLengthTest.java +++ b/validator-core/src/test/java/fr/ign/validator/geometry/GeometryLengthTest.java @@ -16,7 +16,7 @@ import fr.ign.validator.model.Projection; /** - * + * * @author cbouche * */ diff --git a/validator-core/src/test/java/fr/ign/validator/geometry/GeotoolsLonLatBehaviorTest.java b/validator-core/src/test/java/fr/ign/validator/geometry/GeotoolsLonLatBehaviorTest.java index c0f031d2..11586413 100644 --- a/validator-core/src/test/java/fr/ign/validator/geometry/GeotoolsLonLatBehaviorTest.java +++ b/validator-core/src/test/java/fr/ign/validator/geometry/GeotoolsLonLatBehaviorTest.java @@ -10,9 +10,9 @@ /** * Test geotools behavior with lat,lon order for EPSG codes. - * + * * Note that gt-epsg-hsql provides a different behavior than gt-epsg-wkt - * + * * @see http://docs.geotools.org/latest/userguide/library/referencing/order.html */ public class GeotoolsLonLatBehaviorTest { @@ -38,7 +38,7 @@ public void testDefaultBehaviorForEpsg4326() throws Exception { CoordinateReferenceSystem targetCRS = CRS.decode("EPSG:4326"); /* * Should be NORTH_EAST according to GML description - * + * * @see http://www.opengis.net/def/crs/EPSG/0/4326 * "Ellipsoidal 2D CS. Axes: latitude, longitude. Orientations: north, east. UoM: degree" */ @@ -50,7 +50,7 @@ public void testDefaultBehaviorForEpsg2154() throws Exception { CoordinateReferenceSystem targetCRS = CRS.decode("EPSG:2154"); /* * Should be NORTH_EAST according to GML description - * + * * @see http://www.opengis.net/def/crs/EPSG/0/2154 * "This EuroGeographics identifier is for a CRS similar to this but with CS axes in order north, east." */ @@ -59,7 +59,7 @@ public void testDefaultBehaviorForEpsg2154() throws Exception { /** * Ensure that forcing lon,lat lead to EAST_NORTH for "EPSG:4326" - * + * * @throws Exception */ @Test @@ -70,7 +70,7 @@ public void testNonNormativeBehaviorForEpsg4326() throws Exception { /** * Ensure that CRS:84 is lon,lat - * + * * @throws Exception */ @Test diff --git a/validator-core/src/test/java/fr/ign/validator/geometry/ProjectionListTest.java b/validator-core/src/test/java/fr/ign/validator/geometry/ProjectionListTest.java index 0489663b..039fc188 100644 --- a/validator-core/src/test/java/fr/ign/validator/geometry/ProjectionListTest.java +++ b/validator-core/src/test/java/fr/ign/validator/geometry/ProjectionListTest.java @@ -8,9 +8,9 @@ import fr.ign.validator.model.Projection; /** - * + * * TODO add control about validity domain (check WKT validity for example) - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/geometry/ProjectionTransformTest.java b/validator-core/src/test/java/fr/ign/validator/geometry/ProjectionTransformTest.java index 3ec3c504..da6bbedf 100644 --- a/validator-core/src/test/java/fr/ign/validator/geometry/ProjectionTransformTest.java +++ b/validator-core/src/test/java/fr/ign/validator/geometry/ProjectionTransformTest.java @@ -17,9 +17,9 @@ * validator-core/src/test/resources/projection/reference_postgis.csv to perform * test about coordinate transforms. Basically, it compares postgis and geotools * transforms. - * + * * @see validator-core/src/test/resources/projection/README.md - * + * * @author MBorne * */ @@ -76,7 +76,7 @@ public void testCRS84to4471() throws Exception { } /** - * + * * @param sourceSRID * @param targetSRID * @param tolerance diff --git a/validator-core/src/test/java/fr/ign/validator/io/JsonModelReaderTest.java b/validator-core/src/test/java/fr/ign/validator/io/JsonModelReaderTest.java index bbacfa5a..4bb77c84 100644 --- a/validator-core/src/test/java/fr/ign/validator/io/JsonModelReaderTest.java +++ b/validator-core/src/test/java/fr/ign/validator/io/JsonModelReaderTest.java @@ -31,9 +31,9 @@ import fr.ign.validator.tools.ResourceHelper; /** - * + * * JsonReaderModel regress tests based on samples in /resources/config-json/ - * + * * @author MBorne * */ @@ -60,7 +60,7 @@ public void testLoadDocumentModelFileNotFound() { /** * Ensure that ModelNotFoundException are thrown if DocumentModel URL doesn't * exists - * + * * @throws MalformedURLException */ @Test(expected = ModelNotFoundException.class) @@ -71,7 +71,7 @@ public void testLoadDocumentModelUrlNotFound() throws MalformedURLException { /** * Read DocumentModel from GpU - * + * * @throws MalformedURLException */ @Test @@ -100,7 +100,7 @@ public void testLoadDocumentModelFromGpU() throws MalformedURLException { /** * Read DocumentModel from GpU - * + * * @throws MalformedURLException */ @Test @@ -259,7 +259,7 @@ public void testLoadFeatureTypeAdresse() { /** * Check FeatureType for /config-json/adresse/types/ADRESSE.json - * + * * @param featureType */ private void assertExceptedFeatureTypeAdresse(FeatureType featureType) { @@ -319,7 +319,7 @@ private void assertExceptedFeatureTypeAdresse(FeatureType featureType) { /** * Check FeatureType for /config-json/cnig_SUP_EL9_2013/types/SERVITUDE.json - * + * * @param featureType */ private void assertExceptedFeatureTypeServitude(FeatureType featureType) { @@ -434,7 +434,7 @@ public void testLoadDocumentModelPCRS() { /** * Performs basic consistency checks on DocumentModel - * + * * @param documentModel */ private void assertIsValid(DocumentModel documentModel) { @@ -452,7 +452,7 @@ private void assertIsValid(DocumentModel documentModel) { /** * Performs basic consistency checks on FeatureType - * + * * @param documentModel */ private void assertIsValid(FeatureType featureType) { diff --git a/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java b/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java index df1faa24..e50928a8 100644 --- a/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java +++ b/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java @@ -54,7 +54,7 @@ public void testLoadDocumentModelFileNotFound() { /** * Ensure that ModelNotFoundException are thrown if DocumentModel URL doesn't * exists - * + * * @throws MalformedURLException */ @Test @@ -72,7 +72,7 @@ public void testLoadDocumentModelUrlNotFound() throws MalformedURLException { /** * Ensure that ModelNotFoundException are thrown if a FeatureType is missing - * + * * @throws MalformedURLException */ @Test @@ -92,7 +92,7 @@ public void testLoadDocumentModelFeatureTypeNotFound() throws MalformedURLExcept /** * Read cnig_PLU_2014 and performs regress test - * + * * @throws JsonProcessingException */ @Test @@ -107,7 +107,7 @@ public void testLoadDocumentModelCnigPlu2014() { /** * Read adresse model and performs regress test - * + * * @throws JsonProcessingException */ @Test @@ -195,7 +195,7 @@ public void testLoadDocumentModelSampleDocument() { /** * Check FeatureType definition for * /config-xml/sample-document/types/COMMUNE.xml - * + * * @param featureType */ private void assertExceptedFeatureTypeCommune(FeatureType featureType) { @@ -287,7 +287,7 @@ public void testLoadFeatureTypeWithCDATA() { /** * Performs basic consistency checks on DocumentModel - * + * * @param documentModel */ private void assertIsValid(DocumentModel documentModel) { @@ -305,7 +305,7 @@ private void assertIsValid(DocumentModel documentModel) { /** * Performs basic consistency checks on FeatureType - * + * * @param documentModel */ private void assertIsValid(FeatureType featureType) { diff --git a/validator-core/src/test/java/fr/ign/validator/mapping/FeatureTypeMapperTest.java b/validator-core/src/test/java/fr/ign/validator/mapping/FeatureTypeMapperTest.java index e85f5bf7..533a937d 100644 --- a/validator-core/src/test/java/fr/ign/validator/mapping/FeatureTypeMapperTest.java +++ b/validator-core/src/test/java/fr/ign/validator/mapping/FeatureTypeMapperTest.java @@ -9,7 +9,7 @@ /** * Test FeatureTypeMapper - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/metadata/gmd/MetadataISO19115Test.java b/validator-core/src/test/java/fr/ign/validator/metadata/gmd/MetadataISO19115Test.java index 6fe86840..54fee66e 100644 --- a/validator-core/src/test/java/fr/ign/validator/metadata/gmd/MetadataISO19115Test.java +++ b/validator-core/src/test/java/fr/ign/validator/metadata/gmd/MetadataISO19115Test.java @@ -31,7 +31,7 @@ /** * Test GMD metadata reader - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/model/AttributeTypeTest.java b/validator-core/src/test/java/fr/ign/validator/model/AttributeTypeTest.java index 35617b87..0fe9d9ad 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/AttributeTypeTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/AttributeTypeTest.java @@ -36,7 +36,7 @@ public void testConsistencyForNameGetTypeName() { /** * Test jackson's config - * + * * @throws IOException */ @Test diff --git a/validator-core/src/test/java/fr/ign/validator/model/DocumentModelTest.java b/validator-core/src/test/java/fr/ign/validator/model/DocumentModelTest.java index eebd8aef..9f78b575 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/DocumentModelTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/DocumentModelTest.java @@ -13,7 +13,7 @@ public class DocumentModelTest { /** * Helper to create a fake DocumentModel - * + * * @return */ private DocumentModel createFakeDocumentModel() { diff --git a/validator-core/src/test/java/fr/ign/validator/model/FeatureTypeTest.java b/validator-core/src/test/java/fr/ign/validator/model/FeatureTypeTest.java index e909469c..b0c3fb2d 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/FeatureTypeTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/FeatureTypeTest.java @@ -7,7 +7,7 @@ import fr.ign.validator.model.type.StringType; /** - * + * * @author CBouche * */ diff --git a/validator-core/src/test/java/fr/ign/validator/model/FileModelTest.java b/validator-core/src/test/java/fr/ign/validator/model/FileModelTest.java index 7e456cfb..e3e650ed 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/FileModelTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/FileModelTest.java @@ -15,7 +15,7 @@ public class FileModelTest { /** * Test jackson's config - * + * * @throws IOException */ @Test diff --git a/validator-core/src/test/java/fr/ign/validator/model/type/AbstractTypeTest.java b/validator-core/src/test/java/fr/ign/validator/model/type/AbstractTypeTest.java index 3a9ac493..38be677b 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/type/AbstractTypeTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/type/AbstractTypeTest.java @@ -26,7 +26,7 @@ public AbstractTypeTest(AttributeType type) { /** * bind and validate attribute - * + * * @param context * @param inputValue * @return diff --git a/validator-core/src/test/java/fr/ign/validator/model/type/BooleanTypeTest.java b/validator-core/src/test/java/fr/ign/validator/model/type/BooleanTypeTest.java index f4689cba..a2af2d8c 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/type/BooleanTypeTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/type/BooleanTypeTest.java @@ -4,7 +4,7 @@ import static org.junit.Assert.*; /** - * + * * @author CBouche * */ diff --git a/validator-core/src/test/java/fr/ign/validator/model/type/DateTypeTest.java b/validator-core/src/test/java/fr/ign/validator/model/type/DateTypeTest.java index 2ebf29cf..91955e9e 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/type/DateTypeTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/type/DateTypeTest.java @@ -13,7 +13,7 @@ import org.junit.Test; /** - * + * * @author CBouche * */ diff --git a/validator-core/src/test/java/fr/ign/validator/model/type/GeometryTypeTest.java b/validator-core/src/test/java/fr/ign/validator/model/type/GeometryTypeTest.java index 876d6bf1..4d8a7628 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/type/GeometryTypeTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/type/GeometryTypeTest.java @@ -11,7 +11,7 @@ import fr.ign.validator.error.CoreErrorCodes; /** - * + * * @author CBouche * */ diff --git a/validator-core/src/test/java/fr/ign/validator/model/type/StringTypeTest.java b/validator-core/src/test/java/fr/ign/validator/model/type/StringTypeTest.java index c101e243..19c90c55 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/type/StringTypeTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/type/StringTypeTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.*; /** - * + * * @author CBouche * */ diff --git a/validator-core/src/test/java/fr/ign/validator/model/type/UrlTypeTest.java b/validator-core/src/test/java/fr/ign/validator/model/type/UrlTypeTest.java index 42f41d16..503dd07e 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/type/UrlTypeTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/type/UrlTypeTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.*; /** - * + * * @author CBouche * */ diff --git a/validator-core/src/test/java/fr/ign/validator/process/ProjectionPreProcessTest.java b/validator-core/src/test/java/fr/ign/validator/process/ProjectionPreProcessTest.java index aebcad82..ee662a16 100644 --- a/validator-core/src/test/java/fr/ign/validator/process/ProjectionPreProcessTest.java +++ b/validator-core/src/test/java/fr/ign/validator/process/ProjectionPreProcessTest.java @@ -73,7 +73,7 @@ public void testEpsg2154() throws Exception { /** * Create validation context - * + * * @param crs * @return */ diff --git a/validator-core/src/test/java/fr/ign/validator/regress/PprRegressTest.java b/validator-core/src/test/java/fr/ign/validator/regress/PprRegressTest.java index 7da58455..3551a36b 100644 --- a/validator-core/src/test/java/fr/ign/validator/regress/PprRegressTest.java +++ b/validator-core/src/test/java/fr/ign/validator/regress/PprRegressTest.java @@ -28,9 +28,9 @@ import fr.ign.validator.report.InMemoryReportBuilder; /** - * + * * Regress test for some GpU documents. - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/report/FilteredReportBuilderRegressTest.java b/validator-core/src/test/java/fr/ign/validator/report/FilteredReportBuilderRegressTest.java index 15d67338..d5e84bf0 100644 --- a/validator-core/src/test/java/fr/ign/validator/report/FilteredReportBuilderRegressTest.java +++ b/validator-core/src/test/java/fr/ign/validator/report/FilteredReportBuilderRegressTest.java @@ -12,7 +12,7 @@ /** * Regress test for {@link FilteredReportBuilder} - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/tools/FileConverterTest.java b/validator-core/src/test/java/fr/ign/validator/tools/FileConverterTest.java index 47bd82b1..48551a59 100644 --- a/validator-core/src/test/java/fr/ign/validator/tools/FileConverterTest.java +++ b/validator-core/src/test/java/fr/ign/validator/tools/FileConverterTest.java @@ -20,7 +20,7 @@ /** * Regress test for format conversions - * + * * @author MBorne */ public class FileConverterTest { @@ -160,9 +160,9 @@ public void testConvertGmlInvalid() throws IOException { /** * Regress test about GDAL coordinate precision while converting to CSV - * + * * @see validator-core/src/test/resources/data/POINT.README.md - * + * * @throws IOException */ @Test @@ -192,10 +192,10 @@ public void testCoordinatePrecision() throws IOException { /** * Find expected CSV POINT file according to the GDAL current version - * + * * @deprecated GDAL >= 2.3 is now required (POINT_EXPECTED_1.10.x.csv and * POINT_EXPECTED_1.11.x.csv kept for trace) - * + * * @return */ private String getExpectedPointName() { diff --git a/validator-core/src/test/java/fr/ign/validator/tools/MultiTableReaderTest.java b/validator-core/src/test/java/fr/ign/validator/tools/MultiTableReaderTest.java index eada8acd..5fe7853c 100644 --- a/validator-core/src/test/java/fr/ign/validator/tools/MultiTableReaderTest.java +++ b/validator-core/src/test/java/fr/ign/validator/tools/MultiTableReaderTest.java @@ -24,7 +24,7 @@ public void setUp() { /** * Test without providing an XSDschema (use standard GML driver in GDAL) - * + * * @throws IOException */ @Test @@ -57,7 +57,7 @@ public void testReadPcrsLyon01() throws IOException { /** * Test without providing an XSDschema (using GMLAS driver in GDAL) - * + * * @throws IOException */ @Test @@ -161,7 +161,7 @@ public void testReadPcrsLyon01WithSchema() throws IOException { /** * Test without providing an XSDschema (using GMLAS driver in GDAL) - * + * * @throws IOException */ @Test diff --git a/validator-core/src/test/java/fr/ign/validator/tools/NetworkingTest.java b/validator-core/src/test/java/fr/ign/validator/tools/NetworkingTest.java index 5fe498a7..708978e9 100644 --- a/validator-core/src/test/java/fr/ign/validator/tools/NetworkingTest.java +++ b/validator-core/src/test/java/fr/ign/validator/tools/NetworkingTest.java @@ -17,7 +17,7 @@ public class NetworkingTest { /** * Ensure that proxy is correctly defined from CLI option (--proxy) - * + * * @throws ParseException */ @Test @@ -35,7 +35,7 @@ public void testConfigureHttpClientSample() { /** * Ensure that proxy is correctly defined from environment variables while * running tests so that URL content can be retreived. - * + * * @throws IOException * @throws MalformedURLException * @throws ParseException diff --git a/validator-core/src/test/java/fr/ign/validator/tools/ResourceHelperTest.java b/validator-core/src/test/java/fr/ign/validator/tools/ResourceHelperTest.java index 0bdf09e6..edf17e7d 100644 --- a/validator-core/src/test/java/fr/ign/validator/tools/ResourceHelperTest.java +++ b/validator-core/src/test/java/fr/ign/validator/tools/ResourceHelperTest.java @@ -43,7 +43,7 @@ public void testGetMissingCoreTestResource() { /** * Get validator-core/src/main/resources/error-code.json - * + * * @throws IOException */ @Test diff --git a/validator-core/src/test/java/fr/ign/validator/tools/TableReaderCSVTest.java b/validator-core/src/test/java/fr/ign/validator/tools/TableReaderCSVTest.java index b88d8c2b..75c449ba 100644 --- a/validator-core/src/test/java/fr/ign/validator/tools/TableReaderCSVTest.java +++ b/validator-core/src/test/java/fr/ign/validator/tools/TableReaderCSVTest.java @@ -17,9 +17,9 @@ import fr.ign.validator.exception.ColumnNotFoundException; /** - * + * * Test CSV file reading with TableReader - * + * * @author mickael * */ @@ -98,7 +98,7 @@ public void testReadCsvLatin1BadCharset() throws IOException { /** * Performs basic feature checks - * + * * @param reader * @throws IOException */ diff --git a/validator-core/src/test/java/fr/ign/validator/tools/TableReaderGMLTest.java b/validator-core/src/test/java/fr/ign/validator/tools/TableReaderGMLTest.java index ae1a8466..2e5342ab 100644 --- a/validator-core/src/test/java/fr/ign/validator/tools/TableReaderGMLTest.java +++ b/validator-core/src/test/java/fr/ign/validator/tools/TableReaderGMLTest.java @@ -14,9 +14,9 @@ import org.junit.Test; /** - * + * * Test CSV file reading with TableReader - * + * * @author mickael * */ diff --git a/validator-core/src/test/java/fr/ign/validator/tools/TableReaderSHPTest.java b/validator-core/src/test/java/fr/ign/validator/tools/TableReaderSHPTest.java index 53cb14c0..01e2ccec 100644 --- a/validator-core/src/test/java/fr/ign/validator/tools/TableReaderSHPTest.java +++ b/validator-core/src/test/java/fr/ign/validator/tools/TableReaderSHPTest.java @@ -12,7 +12,7 @@ /** * Test TableReader with ESRI Shapefiles - * + * * @author mborne */ public class TableReaderSHPTest { diff --git a/validator-core/src/test/java/fr/ign/validator/validation/attribute/GeometryIsValidValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/attribute/GeometryIsValidValidatorTest.java index 453421fc..67d2bbf5 100644 --- a/validator-core/src/test/java/fr/ign/validator/validation/attribute/GeometryIsValidValidatorTest.java +++ b/validator-core/src/test/java/fr/ign/validator/validation/attribute/GeometryIsValidValidatorTest.java @@ -39,7 +39,7 @@ public void setUp() throws Exception { /** * bind and validate attribute - * + * * @param context * @param wkt * @return diff --git a/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeReferenceValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeReferenceValidatorTest.java index c21998e1..2eb57b3c 100644 --- a/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeReferenceValidatorTest.java +++ b/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeReferenceValidatorTest.java @@ -44,7 +44,7 @@ public void setUp() throws NoSuchAuthorityCodeException, FactoryException { /** * Create a sample DocumentModel with USER associated to a single TEAM. - * + * * @return */ private DocumentModel createTestDocumentModel() { diff --git a/validator-core/src/test/java/fr/ign/validator/validation/file/MetadataValidatorRegressTest.java b/validator-core/src/test/java/fr/ign/validator/validation/file/MetadataValidatorRegressTest.java index 27711120..72980077 100644 --- a/validator-core/src/test/java/fr/ign/validator/validation/file/MetadataValidatorRegressTest.java +++ b/validator-core/src/test/java/fr/ign/validator/validation/file/MetadataValidatorRegressTest.java @@ -16,7 +16,7 @@ /** * High level regression test - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/validation/file/XsdSchemaValidatorRegressTest.java b/validator-core/src/test/java/fr/ign/validator/validation/file/XsdSchemaValidatorRegressTest.java index b6f83475..0432c27e 100644 --- a/validator-core/src/test/java/fr/ign/validator/validation/file/XsdSchemaValidatorRegressTest.java +++ b/validator-core/src/test/java/fr/ign/validator/validation/file/XsdSchemaValidatorRegressTest.java @@ -24,7 +24,7 @@ /** * Regress test for {{@link XsdSchemaValidator} - * + * * @author MBorne * */ diff --git a/validator-core/src/test/java/fr/ign/validator/validation/file/metadata/FileIdentifierValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/file/metadata/FileIdentifierValidatorTest.java index fd7252ef..5b98026b 100644 --- a/validator-core/src/test/java/fr/ign/validator/validation/file/metadata/FileIdentifierValidatorTest.java +++ b/validator-core/src/test/java/fr/ign/validator/validation/file/metadata/FileIdentifierValidatorTest.java @@ -125,7 +125,7 @@ public void testInvalidSpecialChars() { /** * Ensure that all fileIdentifiers in are valid in * "sample-fileidentifiers-valid.txt" file - * + * * @throws IOException */ @Test diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/CnigPlugin.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/CnigPlugin.java index a16d310f..e0109a2d 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/CnigPlugin.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/CnigPlugin.java @@ -27,10 +27,10 @@ /** * Customizes validator for CNIG standard validation - * + * * @see http://www.geoportail-urbanisme.gouv.fr/standard - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/command/CnigExtractIdgestCommand.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/command/CnigExtractIdgestCommand.java index 5329a9fc..debff8d0 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/command/CnigExtractIdgestCommand.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/command/CnigExtractIdgestCommand.java @@ -14,9 +14,9 @@ import fr.ign.validator.command.AbstractCommand; /** - * + * * Extracts IDGEST for SUP (cnig pre-validator) - * + * * @author fcerizay * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/error/CnigErrorCodes.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/error/CnigErrorCodes.java index 1dfa5523..b32f7219 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/error/CnigErrorCodes.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/error/CnigErrorCodes.java @@ -4,7 +4,7 @@ /** * CNIG specific error codes - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/DocumentModelName.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/DocumentModelName.java index b197948b..1533d721 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/DocumentModelName.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/DocumentModelName.java @@ -1,12 +1,12 @@ package fr.ign.validator.cnig.model; /** - * + * * Parse document model name to extract informations according to naming * convention : - * + * * cnig_{DocumentType}[_{SupCategory}]_YYYY - * + * * @author MBorne * */ @@ -20,7 +20,7 @@ public class DocumentModelName { /** * Test if document model is a CNIG standard - * + * * @param documentModelName * @return */ @@ -30,7 +30,7 @@ public static boolean isCnigStandard(String documentModelName) { /** * Get document type from standard name (ex : PLU, SUP, etc.) - * + * * @param documentModelName * @return */ @@ -44,7 +44,7 @@ public static String getDocumentType(String documentModelName) { /** * Check that document name belong to SUP type - * + * * @param documentModelName * @return */ @@ -57,7 +57,7 @@ public static boolean isDocumentModelSup(String documentModelName) { /** * Get version - * + * * @param documentModelName * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/DocumentName.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/DocumentName.java index 568f3b9d..4128d62b 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/DocumentName.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/DocumentName.java @@ -3,15 +3,15 @@ import org.apache.commons.lang3.StringUtils; /** - * + * * Helper to manipulate document name according to CNIG naming conventions : - * + * *
        *
      • DU : {CodeTerritoire}_(PLU|PLUi|POS|CC|PSMV)_{YYYYMMDD}[_{CodeDU}]
        • *
      • SUP : {SirenGestionnaire}_{CategorieSUP}_{CodeTerritoire}_{YYYYMMDD}
        • *
      • SCOT : {SirenScot}_scot or {SirenScot}_scot_{YYYYMMDD}[_{CodeDU}] *
      - * + * * @author MBorne * */ @@ -114,7 +114,7 @@ public String getPart() { /** * Parse value to retrieve properties - * + * * @throws InvalidDocumentName */ private void parse() { @@ -164,7 +164,7 @@ public String toString() { /** * Get regexp for SCOT document name - * + * * @return */ public static String getRegexpSCOT() { @@ -175,7 +175,7 @@ public static String getRegexpSCOT() { /** * Get pattern to validate the name of a PLU, PLUi, POS, CC, PSMV - * + * * @return */ public static String getRegexpDU() { @@ -187,7 +187,7 @@ public static String getRegexpDU() { /** * Get pattern to validate the name of a SUP - * + * * @return */ public static String getRegexpSUP() { diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/MunicipalityCode.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/MunicipalityCode.java index 58a81636..253bbab0 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/MunicipalityCode.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/MunicipalityCode.java @@ -3,9 +3,9 @@ import org.apache.commons.lang.StringUtils; /** - * + * * Validates INSEE codes for municipalities - * + * * @author MBorne * */ @@ -14,7 +14,7 @@ public class MunicipalityCode { /** * Validates a municipality code - * + * * @param value * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/SirenCode.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/SirenCode.java index d3305890..7c401433 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/SirenCode.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/SirenCode.java @@ -3,11 +3,11 @@ import org.apache.commons.lang.StringUtils; /** - * + * * Validates SIREN codes (on 9 digits) - * + * * @see http://www.insee.fr/fr/methodes/default.asp?page=definitions/numero-siren.htm - * + * * @author MBorne * */ @@ -17,7 +17,7 @@ public class SirenCode { /** * Indicates if given parameter is a valid SIREN code - * + * * @param value * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/SupCategory.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/SupCategory.java index 874b7885..1628af67 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/SupCategory.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/model/SupCategory.java @@ -8,7 +8,7 @@ public class SupCategory { /** * Indicates if given parameter is a valid SUP category - * + * * @param siren * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/CreateShapefilesPostProcess.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/CreateShapefilesPostProcess.java index 501dcc40..f96f424d 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/CreateShapefilesPostProcess.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/CreateShapefilesPostProcess.java @@ -20,10 +20,10 @@ import fr.ign.validator.tools.FileConverter; /** - * + * * Effectue une conversion en SHP des CSV présents dans le dossier validation. * Converts csv files (in validation directory) to shp - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/CustomizeIdurbaPreProcess.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/CustomizeIdurbaPreProcess.java index 29cb63ed..26360f55 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/CustomizeIdurbaPreProcess.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/CustomizeIdurbaPreProcess.java @@ -22,9 +22,9 @@ import fr.ign.validator.model.type.StringType; /** - * + * * Customize validation to validate IDURBA attributes. - * + * * @author MBorne * */ @@ -34,7 +34,7 @@ public class CustomizeIdurbaPreProcess implements ValidatorListener { /** * Extends the validation of DOC_URBA table - * + * * @param context * @param document * @throws Exception diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/SupRelationsPostProcess.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/SupRelationsPostProcess.java index 72d05129..1a38a250 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/SupRelationsPostProcess.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/process/SupRelationsPostProcess.java @@ -30,7 +30,7 @@ /** * Post-process relations between SUP tables to adds columns to "GENERATEUR" and * "ASSIETE" tables in output data. - * + * * @author MBorne */ public class SupRelationsPostProcess implements ValidatorListener { @@ -119,7 +119,7 @@ public void afterValidate(Context context, Document document) throws Exception { /** * Test if document model is a SUP. - * + * * @param documentModel * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/AdditionalColumnsBuilder.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/AdditionalColumnsBuilder.java index a06a6c6c..892952eb 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/AdditionalColumnsBuilder.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/AdditionalColumnsBuilder.java @@ -22,12 +22,12 @@ /** * Helper class to add columns on GENERATEUR and ASSIETTE tables output data : - * + * *
        *
      • "fichier" is reported from "acte_sup" table exploring relations
        • *
      • "nomsuplitt" is reported from "servitude" table exploring relations
        • *
      - * + * * @author MBorne * */ @@ -50,7 +50,7 @@ enum FileType { private File tempDirectory; /** - * + * * @param tempDirectory directory in which temporary CSV files are created. * @param dataDirectory */ @@ -61,7 +61,7 @@ public AdditionalColumnsBuilder(DatabaseSUP database, File tempDirectory) { /** * Add columns to GENERATEUR_SUP and ASSIETTE_SUP files in dataDirectory. - * + * * @throws Exception */ public void addColumnsToGenerateurAndAssietteFiles(File dataDirectory) throws Exception { @@ -85,7 +85,7 @@ public void addColumnsToGenerateurAndAssietteFiles(File dataDirectory) throws Ex /** * Ajout de la colonne "fichiers" au fichier generateursFile - * + * * @param database * @param generateursFile * @throws IOException @@ -149,7 +149,7 @@ private void addColumnsToFile(FileType fileType, File file) throws Exception { /** * Create output header with new column names. - * + * * @param inputHeader * @return */ @@ -162,7 +162,7 @@ private List createOutputHeader(String[] inputHeader) { /** * Create output row with new column values. - * + * * @param inputRow * @param fichiers * @return @@ -180,7 +180,7 @@ private List createOutputRow(String[] inputRow, List fichiers, L /** * Concatène la liste des fichiers avec des pipes "|" - * + * * @param fichiers * @return */ @@ -197,7 +197,7 @@ private String concat(List fichiers) { /** * Get ActeServitude for an assiette or generateur id. - * + * * @param database * @param fileType * @param id @@ -219,7 +219,7 @@ private List getActesById( /** * Get Servitude for an assiette or generateur id. - * + * * @param database * @param fileType * @param id @@ -241,7 +241,7 @@ private List getServitudesById( /** * Renvoie le nom de la colonne identifiant en fonction du type de fichier - * + * * @param fileType * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/DatabaseSUP.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/DatabaseSUP.java index af0f7d2f..431c3549 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/DatabaseSUP.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/DatabaseSUP.java @@ -23,12 +23,12 @@ import fr.ign.validator.model.FileModel; /** - * + * * Helper class to manipulate relations between ACTE, SERVITUDE, GENERATEUR and * ASSIETTE files. - * + * * @warning it relies on merged GENERATEUR and ASSIETTE tables. - * + * * @see http://cnig.gouv.fr/wp-content/uploads/2014/09/20140930_STANDARD_SUP_V2013.pdf#page=20&zoom=auto,-260,773 * @see https://github.com/IGNF/validator/issues/176 (except TABLE_GENERATEUR * and TABLE_ASSIETTE, tables are already loaded in validation database) @@ -115,7 +115,7 @@ public class AssietteSup { /** * Create DatabaseSUP as an SQLite database. - * + * * @param tempDirectory * @throws SQLException */ @@ -126,7 +126,7 @@ public DatabaseSUP(Database database) throws SQLException { /** * Create DatabaseSUP merging GENERATEUR and ASSIETTE tables in the validation * database. - * + * * @param validationDatabase * @return */ @@ -158,7 +158,7 @@ public static DatabaseSUP createFromValidationDatabase(Context context) { /** * Get database connection - * + * * @return */ private Connection getConnection() { @@ -167,9 +167,9 @@ private Connection getConnection() { /** * Create SQL table "generateur". - * + * * @throws SQLException - * + * * @see {@link #loadTableGenerateur(File)} */ void createTableGenerateur() throws SQLException { @@ -184,7 +184,7 @@ void createTableGenerateur() throws SQLException { * Create SQL table "assiette". * * @throws SQLException - * + * * @see {@link #loadTableAssiette(File)} */ void createTableAssiete() throws SQLException { @@ -197,7 +197,7 @@ void createTableAssiete() throws SQLException { /** * Insert rows from tableName into TABLE_GENERATEUR. - * + * * @param tableName * @throws SQLException */ @@ -211,7 +211,7 @@ void loadGenerateursFromTable(String tableName) throws SQLException { /** * Insert rows from tableName into TABLE_ASSIETTE. - * + * * @param tableName * @throws SQLException */ @@ -225,7 +225,7 @@ void loadAssiettesFromTable(String tableName) throws SQLException { /** * Return the number of rows in a given table. - * + * * @return * @throws SQLException */ @@ -255,7 +255,7 @@ public List findActesByGenerateur(String idGen) { /** * Find actes for a given idAss. - * + * * @param idAss * @return */ @@ -276,7 +276,7 @@ public List findActesByAssiette(String idAss) { /** * Fetch unique Acte from ResultSet. - * + * * @param rs * @return * @throws SQLException @@ -294,7 +294,7 @@ private List fetchActes(ResultSet rs) throws SQLException { /** * Helper to extract "fichier" values - * + * * @param actes * @return */ @@ -330,7 +330,7 @@ public List findServitudesByGenerateur(String idGen) { /** * Find servitudes for a given idAss. - * + * * @param idAss * @return */ @@ -350,7 +350,7 @@ public List findServitudesByAssiette(String idAss) { /** * Fetch unique Acte from ResultSet. - * + * * @param rs * @return * @throws SQLException @@ -368,7 +368,7 @@ private List fetchServitudes(ResultSet rs) throws SQLException { /** * Helper to extract "nomSupLitt" values - * + * * @param actes * @return */ @@ -385,7 +385,7 @@ public List getNomSupLitts(List servitudes) { /** * Validation - Find non unique IDGEN values. - * + * * @return * @throws SQLException * @throws IOException @@ -397,7 +397,7 @@ public List findDuplicatedValuesForIDGEN() throws SQLException, /** * Validation - Find non unique IDASS values. - * + * * @return * @throws SQLException * @throws IOException @@ -409,7 +409,7 @@ public List findDuplicatedValuesForIDASS() throws SQLException, /** * Validation - find AssietteSup with invalid IDGEN - * + * * @param limit maximum number of results. * @return * @throws SQLException @@ -429,7 +429,7 @@ public List findAssiettesWithInvalidIDGEN(int limit) throws SQLExce /** * Fetch unique AssietteSup from ResultSet. - * + * * @param rs * @return * @throws SQLException diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/IdgestExtractor.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/IdgestExtractor.java index 48fe7a42..8881ac48 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/IdgestExtractor.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/IdgestExtractor.java @@ -26,7 +26,7 @@ public IdgestExtractor() { } /** - * + * * @param filePath */ public String findIdGest(File servitudeFile) { diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/internal/FileLocator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/internal/FileLocator.java index f8a22ff7..6034e1b0 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/internal/FileLocator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/sup/internal/FileLocator.java @@ -12,7 +12,7 @@ /** * Helper to locate CSV files in output directory. - * + * * @author MBorne * */ @@ -46,7 +46,7 @@ public List findAssietteSupFiles() { /** * Helper - find a single CSV file - * + * * @param name * @return */ @@ -65,7 +65,7 @@ File findByName(String name) { /** * Helper - find multiple single CSV file - * + * * @param regexp * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/CSV.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/CSV.java index f6906fb5..5f0cd56f 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/CSV.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/CSV.java @@ -10,7 +10,7 @@ public class CSV { /** * Count rows in a CSV file. - * + * * @param csvFile * @return * @throws IOException diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/CnigSpecificationFinder.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/CnigSpecificationFinder.java index 2aab6183..f84962e2 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/CnigSpecificationFinder.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/CnigSpecificationFinder.java @@ -15,7 +15,7 @@ /** * Extract CNIG specification from metadata - * + * * @author MBorne * */ @@ -26,7 +26,7 @@ public class CnigSpecificationFinder { /** * Get regexp corresponding to "CNIG {DocumentType} v{YYYY}" - * + * * @return */ public static String getRegexpTitle() { @@ -38,7 +38,7 @@ public static String getRegexpTitle() { /** * Find specification definition according to CNIG DU or SUP profile - * + * * @param metadata * @return */ @@ -63,7 +63,7 @@ public static Specification findCnigSpecification(Metadata metadata) { /** * Test if specification.dateType is "publication" - * + * * @param specification * @return */ @@ -76,7 +76,7 @@ private static boolean specificationDateTypeIsPublication(Specification specific /** * Test if specification title - * + * * @param specification * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormat.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormat.java index bd355016..c80b9560 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormat.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormat.java @@ -2,7 +2,7 @@ /** * Allows IDURBA validation. Note that : - * + * *
        *
      • Only PLU, POS, CC, PLUi and PSMV documents are concerned
        • *
      • {@link IdurbaFormatV1} is relative to CNIG standard v2013 and v2014
        • @@ -11,7 +11,7 @@ * corresponding to the DocumentModel version *
      • *
      - * + * * @author MBorne * */ @@ -19,7 +19,7 @@ public interface IdurbaFormat { /** * True if value is valid according to this format - * + * * @param value * @return */ @@ -27,7 +27,7 @@ public interface IdurbaFormat { /** * Get regexp to produce help message for the format - * + * * @return */ @Deprecated @@ -35,7 +35,7 @@ public interface IdurbaFormat { /** * Validates an idUrba according to a documentName - * + * * @param value * @param documentName * @return @@ -44,7 +44,7 @@ public interface IdurbaFormat { /** * Get expected regexp for a given documentName - * + * * @param documentName * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatFactory.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatFactory.java index d43d33df..078cdee1 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatFactory.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatFactory.java @@ -8,14 +8,14 @@ /** * Helper to create {@link IdurbaFormat} format instances. - * + * * @author MBorne */ public class IdurbaFormatFactory { /** * Get supported formats - * + * * @return */ public static List getFormats() { @@ -28,7 +28,7 @@ public static List getFormats() { /** * Create format corresponding to the version of the DocumentModel. - * + * * @param documentModel * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatSCOT.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatSCOT.java index c8bf7dea..a7e5abdf 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatSCOT.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatSCOT.java @@ -5,9 +5,9 @@ import fr.ign.validator.cnig.model.DocumentName; /** - * + * * Helper to validate IDURBA format according to CNIG standards v2017 or more. - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatV1.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatV1.java index cdd3c556..a71a3067 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatV1.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatV1.java @@ -8,7 +8,7 @@ import fr.ign.validator.cnig.model.DocumentName; /** - * + * * Helper to validate IDURBA format according to CNIG standards v2013 and v2014. * * @author MBorne @@ -28,7 +28,7 @@ public boolean isValid(String value) { /** * Get regexp to validate the format - * + * * @return */ public String getRegexp() { @@ -48,7 +48,7 @@ public boolean isValid(String idurba, String documentName) { /** * Gets regexp to find idUrba - * + * * @param documentName * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatV2.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatV2.java index 16e71104..168c9211 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatV2.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/IdurbaFormatV2.java @@ -5,9 +5,9 @@ import fr.ign.validator.cnig.model.DocumentName; /** - * + * * Helper to validate IDURBA format according to CNIG standards v2017 or more. - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/VRT.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/VRT.java index 165ed86f..bd94e9ad 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/VRT.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/tools/VRT.java @@ -21,7 +21,7 @@ /** * Utility class that creates a VRT file to go with WKT files - * + * * @author MBorne * */ @@ -34,7 +34,7 @@ public class VRT { /** * Creates a vrt corresponding to a sourceFile for a given FeatureType - * + * * @param csvFile * @param featureType * @return @@ -52,7 +52,7 @@ public static File createFile(File csvFile, FeatureType featureType) { /** * #FIX genetares vrt files compatible with ogr2ogr 1.9 - * + * * @param csvFile * @param featureType * @return @@ -85,10 +85,10 @@ public static File createVRTfile(File csvFile, FeatureType featureType) throws E /* * Each except WKT - * + * * Note : this step is mandatory so that ogr2ogr doesn't truncate the text * fields to 80 characters when converting in shapefile - * + * */ List fieldNames = getFieldNamesFromCSV(csvFile); for (String fieldName : fieldNames) { @@ -109,7 +109,7 @@ public static File createVRTfile(File csvFile, FeatureType featureType) throws E /** * Gets the list of fields in csv file (except for geometry) - * + * * @param csvFile * @return * @throws IOException diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/GeometryComplexityValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/GeometryComplexityValidator.java index f5344c99..aad06f1c 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/GeometryComplexityValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/GeometryComplexityValidator.java @@ -97,9 +97,9 @@ private Double isDensityInvalid(Geometry geometry, double density, int maxRingPo } /** - * + * * cnig-plugin-validator: we allow french usage to message error. - * + * * @param geometry * @param pointCount * @param ringCount diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/IdurbaFormatValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/IdurbaFormatValidator.java index e6c168df..9d72bc04 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/IdurbaFormatValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/IdurbaFormatValidator.java @@ -15,10 +15,10 @@ import fr.ign.validator.validation.Validator; /** - * + * * Dedicated to IDURBA validation in DOC_URBA table. Ensure that the value * matches one of the supported {@link IdurbaFormat}. - * + * * @author MBorne * */ @@ -30,7 +30,7 @@ public class IdurbaFormatValidator implements Validator> { /** * Test if string value is valid - * + * * @param value * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/IdurbaValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/IdurbaValidator.java index e87253d5..e7a805e6 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/IdurbaValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/IdurbaValidator.java @@ -31,7 +31,7 @@ public IdurbaValidator(IdurbaFormat idurbaFormat, String documentName) { /** * Test if string value is valid - * + * * @param value * @return */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/InseeValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/InseeValidator.java index 04285771..c2f3822b 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/InseeValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/attribute/InseeValidator.java @@ -23,7 +23,7 @@ /** * Extends validator to validate INSEE codes - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdassIsUniqueValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdassIsUniqueValidator.java index b5e20212..28ad39b4 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdassIsUniqueValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdassIsUniqueValidator.java @@ -12,7 +12,7 @@ /** * Ensure that IDASS is unique in ASSIETTE_SUP_P/L/S tables. - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdgenExistsValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdgenExistsValidator.java index badbb8d4..fed1298d 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdgenExistsValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdgenExistsValidator.java @@ -13,7 +13,7 @@ /** * Ensure that IDGEN in ASSIETTE_SUP_P/L/S tables exists in GENERATEUR_SUP_P/L/S * tables. - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdgenIsUniqueValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdgenIsUniqueValidator.java index 0d09282a..0290f1ce 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdgenIsUniqueValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/database/IdgenIsUniqueValidator.java @@ -12,7 +12,7 @@ /** * Ensure that IDGEN is unique in GENERATEUR_SUP_P/L/S tables. - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/document/AtLeastOneWritingMaterialValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/document/AtLeastOneWritingMaterialValidator.java index 3ec1534d..d5c1a2b8 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/document/AtLeastOneWritingMaterialValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/document/AtLeastOneWritingMaterialValidator.java @@ -14,9 +14,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Checking the document contains at least one written material ("Pièce écrite") - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/document/DocumentNameValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/document/DocumentNameValidator.java index 2bae914a..715d4e8c 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/document/DocumentNameValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/document/DocumentNameValidator.java @@ -15,9 +15,9 @@ import fr.ign.validator.validation.Validator; /** - * + * * Checking the document contains at least one written material ("Pièce écrite") - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/AbstractCnigMetadataValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/AbstractCnigMetadataValidator.java index 153059a5..e8ffbc6d 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/AbstractCnigMetadataValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/AbstractCnigMetadataValidator.java @@ -11,7 +11,7 @@ /** * Base class for custom Metadata validation providing registration on each * Metadata FileModel. - * + * * @author mborne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataDateOfLastRevisionValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataDateOfLastRevisionValidator.java index b5532b70..35e9b86e 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataDateOfLastRevisionValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataDateOfLastRevisionValidator.java @@ -7,10 +7,10 @@ /** * Validates that dateOfLastRevision is defined - * + * * Note that CNIG DU and SUP profiles are more restrictive than INSPIRE on this * point and that date content is validated in core - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataKeywordsValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataKeywordsValidator.java index 389027c1..6cf5e316 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataKeywordsValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataKeywordsValidator.java @@ -20,14 +20,14 @@ /** * Validate metadata according to CNIG standards : - * + * * @see http://cnig.gouv.fr/wp-content/uploads/2020/05/200511_Consignes_saisie_metadonnees_DU_v2020-05.pdf#page=8 * for PLU,PLUI,POS,CC,PSMV documents * @see http://cnig.gouv.fr/wp-content/uploads/2020/05/200511_Consignes_saisie_metadonnees_SUP_v2020-05.pdf#page=8 * for SUP documents * @see http://cnig.gouv.fr/wp-content/uploads/2020/05/200511_Consignes_saisie_metadonnees_SCOT_v2020-05.pdf#page=7&zoom=auto,-92,444 * for SCOT documents - * + * * @author mborne * */ @@ -48,7 +48,7 @@ public class CnigMetadataKeywordsValidator extends AbstractCnigMetadataValidator /** * Provide the list of required keywords according to document name. - * + * * @param documentName * @return */ @@ -183,7 +183,7 @@ public void validate(Context context, Metadata metadata) { /** * Get first value in keyword list. - * + * * @param keywords * @return */ @@ -196,7 +196,7 @@ private String getFirstValue(Keywords keywords) { /** * Find keyword by thesaurus name. - * + * * @param metadata * @param expectedThesaurusName * @return diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataReferenceSystemIdentifierValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataReferenceSystemIdentifierValidator.java index 659878d2..b6adf569 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataReferenceSystemIdentifierValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigMetadataReferenceSystemIdentifierValidator.java @@ -11,9 +11,9 @@ /** * Ensures that ReferenceSystemIdentifier is defined according to guidelines : - * + * * http://cnig.gouv.fr/wp-content/uploads/2017/12/171219_Consignes_saisie_metadonnees_DU_v2017.pdf#page=10 - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigSpecificationsValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigSpecificationsValidator.java index a48f4c45..a58db300 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigSpecificationsValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigSpecificationsValidator.java @@ -8,10 +8,10 @@ /** * Ensures that "specifications" contains an element with the following form : - * + * * ex : "CNIG PLU v2013" - * - * + * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigTypeValidator.java b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigTypeValidator.java index dd5c3487..0328cdf4 100644 --- a/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigTypeValidator.java +++ b/validator-plugin-cnig/src/main/java/fr/ign/validator/cnig/validation/metadata/CnigTypeValidator.java @@ -7,7 +7,7 @@ /** * Ensures that "type" is defined to "dataset" - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/CnigRegressHelper.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/CnigRegressHelper.java index c5a06ed5..cbae5d46 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/CnigRegressHelper.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/CnigRegressHelper.java @@ -12,9 +12,9 @@ import fr.ign.validator.tools.ResourceHelper; /** - * + * * Helper class to build regress test for CNIG validation - * + * * @author MBorne * */ @@ -22,9 +22,9 @@ public class CnigRegressHelper { /** * Get document model - * + * * @see validator-plugin-cnig/test/resources/config/{documentModelName} - * + * * @param documentModelName * @return * @throws Exception @@ -43,9 +43,9 @@ public static DocumentModel getDocumentModel(String documentModelName) { /** * Get sample document. If folder is not null, document is copied to a temp * folder (keep this explicit) - * + * * @see validator-plugin-cnig/test/resources/documents/{documentName} - * + * * @param documentName * @param folder * @return @@ -64,7 +64,7 @@ public static File getSampleDocument(String documentName, TemporaryFolder folder /** * Get path to expected document-info.json - * + * * @param documentName * @return */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/ReportAssert.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/ReportAssert.java index 62e90542..7c2752d7 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/ReportAssert.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/ReportAssert.java @@ -11,7 +11,7 @@ /** * Helper class to write test counting errors in report. - * + * * @author MBorne * */ @@ -19,7 +19,7 @@ public class ReportAssert { /** * Check error count for a given level - * + * * @param expected * @param level * @param report @@ -35,7 +35,7 @@ public static void assertCount(int expected, ErrorLevel level, InMemoryReportBui /** * Check error count for a given code - * + * * @param expected * @param level * @param report @@ -51,7 +51,7 @@ public static void assertCount(int expected, ErrorCode code, InMemoryReportBuild /** * Get counts by code - * + * * @param errors * @return */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/command/CnigExtractIdgestCommandTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/command/CnigExtractIdgestCommandTest.java index 01b2abd9..ffa424df 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/command/CnigExtractIdgestCommandTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/command/CnigExtractIdgestCommandTest.java @@ -14,9 +14,9 @@ import fr.ign.validator.tools.ResourceHelper; /** - * + * * Test command CnigExtractIdgestCommand - * + * * @author FCerizay * */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/error/CnigErrorCodesTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/error/CnigErrorCodesTest.java index d5ef2e77..e52025db 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/error/CnigErrorCodesTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/error/CnigErrorCodesTest.java @@ -14,9 +14,9 @@ import fr.ign.validator.error.ValidatorError; /** - * + * * Ensure that CnigErrorCodes have default configuration - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/regress/CnigValidatorRegressTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/regress/CnigValidatorRegressTest.java index 6f08ba9f..cbb512a9 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/regress/CnigValidatorRegressTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/regress/CnigValidatorRegressTest.java @@ -51,9 +51,9 @@ import fr.ign.validator.tools.TableReader; /** - * + * * Regress test for some GpU documents. - * + * * @author MBorne * */ @@ -597,7 +597,7 @@ public void test172014607_AC1_2A_20180130() throws Exception { /** * Controls normalized files for SUP - * + * * @param dataDirectory * @throws IOException */ @@ -986,7 +986,7 @@ public void test200078244_SCOT_20180218() throws Exception { /** * Test 123456789_A5_88_20200313 - * + * * @see https://github.com/IGNF/validator/issues/260 */ @Test @@ -1044,7 +1044,7 @@ public void testSupWithCodeDepOn2Characters() throws Exception { /** * Test 123456789_A5_088_20200313 - * + * * @see https://github.com/IGNF/validator/issues/260 */ @Test diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPDuplicatedIdgenTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPDuplicatedIdgenTest.java index 694475c5..dbcb07d9 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPDuplicatedIdgenTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPDuplicatedIdgenTest.java @@ -16,12 +16,12 @@ /** * Performs the following tests on {@link DatabaseSUP} : - * + * *
        *
      • Load CSV files from /jointure_sup/one2one/DATA checking row counts
        • *
      • Ensure that ONE-TO-ONE relations are supported by find methods.
        • *
      - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPDuplicatedTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPDuplicatedTest.java index 96f2d6fd..7f1117a0 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPDuplicatedTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPDuplicatedTest.java @@ -18,14 +18,14 @@ /** * Performs the following tests on {@link DatabaseSUP} : - * + * *
        *
      • Load CSV files from /jointure_sup/duplicated/DATA checking row * counts
        • *
      • Ensure that the process doesn't crash and the finder produces unique * values if multiple SERVITUDE rows have the same IDSUP (2147483647).
        • *
      - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPMany2ManyTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPMany2ManyTest.java index 5d84de52..73b43c37 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPMany2ManyTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPMany2ManyTest.java @@ -16,13 +16,13 @@ /** * Performs the following tests on {@link DatabaseSUP} : - * + * *
        *
      • Load CSV files from /jointure_sup/many2many/DATA checking row counts
        • *
      • Ensure that "dummy" is supported by find methods.
        • *
      • Ensure that MANY-TO-MANY relations are supported by find methods.
        • *
      - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPOne2OneTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPOne2OneTest.java index 078581a7..4d4fedfb 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPOne2OneTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/DatabaseSUPOne2OneTest.java @@ -15,12 +15,12 @@ /** * Performs the following tests on {@link DatabaseSUP} : - * + * *
        *
      • Load CSV files from /jointure_sup/one2one/DATA checking row counts
        • *
      • Ensure that ONE-TO-ONE relations are supported by find methods.
        • *
      - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/TestDatabaseFactory.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/TestDatabaseFactory.java index b35f87eb..d3902682 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/TestDatabaseFactory.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/TestDatabaseFactory.java @@ -19,7 +19,7 @@ /** * Create DatabaseSUP instances for test purpose (legacy method replaced after * moving validation database to the core). - * + * * @author MBorne * */ @@ -36,7 +36,7 @@ public TestDatabaseFactory(File tempDirectory) { /** * Create DatabaseSUP from CSV files in dataDirectory for test purpose - * + * * @param dataDirectory * @return */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/internal/FileLocatorTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/internal/FileLocatorTest.java index 51d14cf6..098eea61 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/internal/FileLocatorTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/sup/internal/FileLocatorTest.java @@ -14,7 +14,7 @@ /** * Test class {@link FileLocatorTest} - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/tools/DocUrbaFilterTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/tools/DocUrbaFilterTest.java index d96f749d..59985a80 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/tools/DocUrbaFilterTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/tools/DocUrbaFilterTest.java @@ -19,7 +19,7 @@ /** * Test sur l'extraction de typeref - * + * * @author MBorne * */ diff --git a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/tools/VRTTest.java b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/tools/VRTTest.java index 66fdeae2..1a324ea1 100644 --- a/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/tools/VRTTest.java +++ b/validator-plugin-cnig/src/test/java/fr/ign/validator/cnig/tools/VRTTest.java @@ -21,7 +21,7 @@ /** * Test VRT generation - * + * * @author MBorne * */ diff --git a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/database/DatabaseUtils.java b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/database/DatabaseUtils.java index 8eb20488..3fc57d09 100644 --- a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/database/DatabaseUtils.java +++ b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/database/DatabaseUtils.java @@ -21,7 +21,7 @@ /** * Helpers developed for DGPR plugin. - * + * * @author CBouche * */ @@ -51,7 +51,7 @@ public class DatabaseUtils { /** * Perform unions of Geometry from two geometries - * + * * @param a * @param b * @return @@ -68,7 +68,7 @@ public static Geometry getUnion(Geometry a, Geometry b) { /** * Perform unions of Geometry from a database result set Feature must contains * 'WKT' columns - * + * * @param rowIterator * @return * @throws Exception @@ -119,10 +119,10 @@ public static List getInvalidGeometries(RowIterator rowIterator, String /** * Return enveloppe of giving Wkt Geometry - * + * * @deprecated moved to validator-core * @see EnvelopeUtils#getEnvelope(String, fr.ign.validator.model.Projection) - * + * * @param wkt * @param wktProjection * @return @@ -136,7 +136,7 @@ public static Envelope getEnveloppe(String wkt, Projection wktProjection) throws /** * Identify invalid geometry on which union and intersect operation will failed - * + * * @param geometry * @return */ @@ -146,7 +146,7 @@ public static boolean isValid(Geometry geometry) { /** * Identify invalid geometry on which union and intersect operation will failed - * + * * @param geometry * @return */ @@ -205,7 +205,7 @@ public static Geometry getGeometryFromWkt(String wkt, Double tolerance, Boolean } /** - * + * * @param geom * @param tolerance * @return diff --git a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/process/CreateTheGeomColumn.java b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/process/CreateTheGeomColumn.java index c61c63e4..59eebf40 100644 --- a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/process/CreateTheGeomColumn.java +++ b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/process/CreateTheGeomColumn.java @@ -16,7 +16,7 @@ /** * Add column the_geom from WKT to all spatial tables. - * + * * @author CBouche * @author MBorne * diff --git a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/attribute/DebLinMaxValidator.java b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/attribute/DebLinMaxValidator.java index be5cce26..16c34e22 100644 --- a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/attribute/DebLinMaxValidator.java +++ b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/attribute/DebLinMaxValidator.java @@ -58,7 +58,7 @@ public void validate(Context context, Attribute debMaxAttribute) { } /** - * + * * @param context * @param debMaxValue */ @@ -72,7 +72,7 @@ private void reportNoMinValue(Context context, String debMaxValue) { /** * Report if DebMin > DebMax - * + * * @param context * @param debMaxValue */ diff --git a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/GraphTopologyValidator.java b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/GraphTopologyValidator.java index c15949d4..01cd861e 100644 --- a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/GraphTopologyValidator.java +++ b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/GraphTopologyValidator.java @@ -33,7 +33,7 @@ public class GraphTopologyValidator implements Validator { /** * Iso classe de hauteur et débit respectent une topologie de graphe - * + * * @param context * @param document * @param database diff --git a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/InclusionValidator.java b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/InclusionValidator.java index ff091daa..79ae4c6e 100644 --- a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/InclusionValidator.java +++ b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/InclusionValidator.java @@ -33,7 +33,7 @@ public class InclusionValidator implements Validator { /** * Ensure feature of high risk are included in any feature of a lower risk - * + * * @param context * @param document * @param database diff --git a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/ScenarioValidator.java b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/ScenarioValidator.java index f1b5689c..e2cf3784 100644 --- a/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/ScenarioValidator.java +++ b/validator-plugin-dgpr/src/main/java/fr/ign/validator/dgpr/validation/database/ScenarioValidator.java @@ -102,7 +102,7 @@ private void validateTable(String tablename, String attributeId) throws Exceptio /** * Test de l'appartenance d'une surfaces et de la zone au même scénario - * + * * @param isoId * @param isoScn * @param surfaceId diff --git a/validator-plugin-pcrs/src/main/java/fr/ign/validator/pcrs/PcrsPlugin.java b/validator-plugin-pcrs/src/main/java/fr/ign/validator/pcrs/PcrsPlugin.java index ee817316..167ed4f5 100644 --- a/validator-plugin-pcrs/src/main/java/fr/ign/validator/pcrs/PcrsPlugin.java +++ b/validator-plugin-pcrs/src/main/java/fr/ign/validator/pcrs/PcrsPlugin.java @@ -6,7 +6,7 @@ /** * Customizes validator for PCRS standard validation - * + * * @author CBouche * */ diff --git a/validator-plugin-pcrs/src/main/java/fr/ign/validator/pcrs/report/CodeFilteredReportBuilder.java b/validator-plugin-pcrs/src/main/java/fr/ign/validator/pcrs/report/CodeFilteredReportBuilder.java index 7ebc6b9f..f100b18e 100644 --- a/validator-plugin-pcrs/src/main/java/fr/ign/validator/pcrs/report/CodeFilteredReportBuilder.java +++ b/validator-plugin-pcrs/src/main/java/fr/ign/validator/pcrs/report/CodeFilteredReportBuilder.java @@ -9,10 +9,10 @@ import fr.ign.validator.report.ReportBuilder; /** - * + * * Decorate a ReportBuilder. Filter specific error (codes/message) - * FILE_UNEXPECTED - MULTITABLE_UNEXPECTED - * + * * @author cbouche * */ @@ -27,7 +27,7 @@ public class CodeFilteredReportBuilder implements ReportBuilder { /** * Constructor with an existing reportBuilder - * + * * @param original * @param maxError */ diff --git a/validator-plugin-pcrs/src/test/java/fr/ign/validator/pcrs/ValidatePcrsRegressTest.java b/validator-plugin-pcrs/src/test/java/fr/ign/validator/pcrs/ValidatePcrsRegressTest.java index d8e877f8..507cbc21 100644 --- a/validator-plugin-pcrs/src/test/java/fr/ign/validator/pcrs/ValidatePcrsRegressTest.java +++ b/validator-plugin-pcrs/src/test/java/fr/ign/validator/pcrs/ValidatePcrsRegressTest.java @@ -210,7 +210,7 @@ public void testPcrsGeovendee() throws Exception { /** * Get sample document copied on - * + * * @param documentName * @return * @throws IOException diff --git a/validator-plugin-pcrs/src/test/java/fr/ign/validator/pcrs/report/CodeFilteredReportBuilderRegressTest.java b/validator-plugin-pcrs/src/test/java/fr/ign/validator/pcrs/report/CodeFilteredReportBuilderRegressTest.java index d448f6c0..16606267 100644 --- a/validator-plugin-pcrs/src/test/java/fr/ign/validator/pcrs/report/CodeFilteredReportBuilderRegressTest.java +++ b/validator-plugin-pcrs/src/test/java/fr/ign/validator/pcrs/report/CodeFilteredReportBuilderRegressTest.java @@ -13,7 +13,7 @@ /** * Regress test for {@link FilteredReportBuilder} - * + * * @author MBorne * */