Changes(2) for clauses 9.3, 9.5, 9.6, 9.7, 9.8. (161589d6) · Commits · SAREF / saref-pipeline

src/main/java/fr/mines_stetienne/ci/saref/CLIExecution.java

+3 −10

Original line number	Diff line number	Diff line
		@@ -63,15 +63,10 @@ public class CLIExecution implements SAREFCredentialsProvider {
		private static final String ARG_IGNORE_TERMS_LONG = "no-terms";
		private static final String ARG_IGNORE_TERMS_MAN = "Do not generate the static portal for terms";

		private static final String ARG_IGNORE_DOCUMENTATION = "d";
		private static final String ARG_IGNORE_DOCUMENTATION_LONG = "no-documentation";
		private static final String ARG_IGNORE_DOCUMENTATION_MAN = "Do not check documentation";

		private static final Options OPTIONS = new Options()
		.addOption(ARG_IGNORE_EXAMPLES, ARG_IGNORE_EXAMPLES_LONG, false, ARG_IGNORE_EXAMPLES_MAN)
		.addOption(ARG_IGNORE_TERMS, ARG_IGNORE_TERMS_LONG, false, ARG_IGNORE_TERMS_MAN)
		.addOption(ARG_IGNORE_SITE, ARG_IGNORE_SITE_LONG, false, ARG_IGNORE_SITE_MAN)
		.addOption(ARG_IGNORE_DOCUMENTATION, ARG_IGNORE_DOCUMENTATION_LONG, false, ARG_IGNORE_DOCUMENTATION_MAN);
		.addOption(ARG_IGNORE_SITE, ARG_IGNORE_SITE_LONG, false, ARG_IGNORE_SITE_MAN);

		private static final Console console = System.console();

		@@ -84,7 +79,6 @@ public class CLIExecution implements SAREFCredentialsProvider {
		final boolean ignoreExamples;
		final boolean ignoreTerms;
		final boolean ignoreSite;
		final boolean ignoreDocumentation;
		final File directory;

		try {
		@@ -135,9 +129,8 @@ public class CLIExecution implements SAREFCredentialsProvider {
		ignoreExamples = cl.hasOption(ARG_IGNORE_EXAMPLES);
		ignoreTerms = cl.hasOption(ARG_IGNORE_TERMS);
		ignoreSite = cl.hasOption(ARG_IGNORE_SITE);
		ignoreDocumentation = cl.hasOption(ARG_IGNORE_DOCUMENTATION);

		return new SAREFPipeline(this, directory, mode, ignoreExamples, ignoreTerms, ignoreSite, ignoreDocumentation);
		return new SAREFPipeline(this, directory, mode, ignoreExamples, ignoreTerms, ignoreSite);
		} catch (IOException \| ParseException ex) {
		LOG.debug("Exception while parsing arguments", ex);
		throw new RuntimeException();

src/main/java/fr/mines_stetienne/ci/saref/SAREFPipeline.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ public class SAREFPipeline {
		public final boolean ignoreExamples;
		public final boolean ignoreTerms;
		public final boolean ignoreSite;
		public final boolean ignoreDocumentation;

		private Logger logger;
		private DatasetManager datasetManager;
		@@ -93,7 +92,7 @@ public class SAREFPipeline {
		return ontologyManager;
		}

		public SAREFPipeline(SAREFCredentialsProvider credentialsProvider, File directory, Mode mode, boolean ignoreExamples, boolean ignoreTerms, boolean ignoreSite, boolean ignoreDocumentation) {
		public SAREFPipeline(SAREFCredentialsProvider credentialsProvider, File directory, Mode mode, boolean ignoreExamples, boolean ignoreTerms, boolean ignoreSite) {
		this.credentialsProvider = credentialsProvider;
		this.directory = directory;
		targetDir = new File(directory, NAME_TARGET);
		@@ -101,7 +100,6 @@ public class SAREFPipeline {
		this.ignoreExamples = ignoreExamples;
		this.ignoreTerms = ignoreTerms;
		this.ignoreSite = ignoreSite;
		this.ignoreDocumentation = ignoreDocumentation;
		}

		public TestSuites run() {

src/main/java/fr/mines_stetienne/ci/saref/checkers/Clause_9_8_Checker.java

+3 −23

Original line number	Diff line number	Diff line
		@@ -26,31 +26,12 @@
		package fr.mines_stetienne.ci.saref.checkers;

		import java.io.File;
		import java.io.FileOutputStream;
		import java.io.FileReader;
		import java.io.IOException;
		import java.nio.charset.StandardCharsets;
		import java.nio.file.Files;
		import java.util.List;
		import java.util.stream.Collectors;

		import fr.mines_stetienne.ci.saref.SAREF;
		import org.apache.commons.io.FileUtils;
		import org.apache.jena.rdf.model.Model;
		import org.apache.jena.rdf.model.Resource;
		import org.apache.jena.vocabulary.DCTerms;
		import org.apache.jena.vocabulary.RDF;

		import com.opencsv.CSVParser;
		import com.opencsv.CSVParserBuilder;
		import com.opencsv.CSVReader;
		import com.opencsv.CSVReaderBuilder;

		import fr.mines_stetienne.ci.saref.SAREFPipelineException;
		import fr.mines_stetienne.ci.saref.managers.GenerateRDFaManager;
		import fr.mines_stetienne.ci.saref.managers.RepositoryManager;
		import fr.mines_stetienne.ci.saref.utils.Languages;
		import fr.mines_stetienne.ci.saref.vocabs.VTC;

		/**
		* Checks TS 103 673 Clause 9.8: Vocabularies
		@@ -60,8 +41,8 @@ public class Clause_9_8_Checker extends AbstractClauseChecker {

		private static final String FIRST_LINE = "Id;Vocabulary;Requirement"; //<<<

		private static enum MESSAGE {
		missing, ioexception, line;
		private enum MESSAGE {
		missing, ioexception, line
		}

		public Clause_9_8_Checker(RepositoryManager repositoryManager) {
		@@ -87,9 +68,8 @@ public class Clause_9_8_Checker extends AbstractClauseChecker {
		return;
		}
		List<String> lines = FileUtils.readLines(file, StandardCharsets.UTF_8);
		if (lines.size() < 1 \|\| !lines.get(0).equals(FIRST_LINE)) {
		if (lines.isEmpty() \|\| !lines.get(0).equals(FIRST_LINE)) {
		logError(getMessage(MESSAGE.line));
		return;
		}
		} catch (IOException ex) {
		logError(getMessage(MESSAGE.ioexception), ex);

src/main/java/fr/mines_stetienne/ci/saref/checkers/Clause_9_Checker.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ import fr.mines_stetienne.ci.saref.managers.RepositoryManager;
		*/
		public class Clause_9_Checker extends AbstractClauseChecker {

		private static enum MESSAGE {
		error;
		private enum MESSAGE {
		error
		}

		public Clause_9_Checker(RepositoryManager repositoryManager) {
		@@ -51,9 +51,8 @@ public class Clause_9_Checker extends AbstractClauseChecker {
		new Clause_9_5_Checker(repositoryManager).check();
		if(!pipeline.ignoreExamples) {
		new Clause_9_6_Checker(repositoryManager).check();
		}
		if(!pipeline.ignoreDocumentation) {
		new Clause_9_7_Checker(repositoryManager).check();
		new Clause_9_8_Checker(repositoryManager).check();
		}
		} catch (SAREFPipelineException ex) {
		logError(getMessage(MESSAGE.error), ex);

src/main/java/fr/mines_stetienne/ci/saref/gui/FunctionalitiesPanel.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ public class FunctionalitiesPanel extends JPanel {
		final JCheckBox ignoreSite;
		final JCheckBox ignoreExamples;
		final JCheckBox ignoreTerms;
		final JCheckBox ignoreDocumentation;

		public FunctionalitiesPanel(MainFrame mainFrame) {
		super();
		@@ -141,22 +140,12 @@ public class FunctionalitiesPanel extends JPanel {
		}
		});

		ignoreDocumentation = new JCheckBox(SAREF.getMessage("ignoreDocumentation"), false);
		ignoreDocumentation.setToolTipText(SAREF.getMessage("ignoreDocumentation_tooltip"));
		ignoreDocumentation.addActionListener(new ActionListener() {
		@Override
		public void actionPerformed(ActionEvent e) {
		mainFrame.setIgnoreDocumentation(ignoreDocumentation.isSelected());
		}
		});

		JPanel panel3 = new JPanel();
		panel3.setLayout(new BoxLayout(panel3, BoxLayout.Y_AXIS));
		panel3.add(new JLabel(SAREF.getMessage("options")));
		panel3.add(ignoreSite);
		panel3.add(ignoreExamples);
		panel3.add(ignoreTerms);
		panel3.add(ignoreDocumentation);
		add(panel3);

		start = new JButton(SAREF.getMessage("run"));