From a2c97f0b2d0f75116998ec20bbb7dd860eae3ddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Fri, 20 Mar 2020 15:44:12 +0100 Subject: [PATCH] nits --- run.sh | 2 +- src/main/java/fr/emse/gitlab/saref/Constants.java | 1 - src/main/java/fr/emse/gitlab/saref/Main.java | 14 ++++++++------ .../saref/jobs/CheckRepositoryStructure.java | 4 +--- .../fr/emse/gitlab/saref/jobs/CheckShapes.java | 3 ++- .../gitlab/saref/{ => jobs}/CopyStaticFiles.java | 5 +++-- .../emse/gitlab/saref/jobs/ReadRepositories.java | 7 +++++-- 7 files changed, 20 insertions(+), 16 deletions(-) rename src/main/java/fr/emse/gitlab/saref/{ => jobs}/CopyStaticFiles.java (82%) diff --git a/run.sh b/run.sh index ddd7707..4b1d328 100644 --- a/run.sh +++ b/run.sh @@ -1 +1 @@ -mvn exec:java -Dexec.mainClass="fr.emse.gitlab.saref.Main" -Dexec.args="-d ../saref-core" +mvn exec:java -Dexec.args="-d ../saref-core" diff --git a/src/main/java/fr/emse/gitlab/saref/Constants.java b/src/main/java/fr/emse/gitlab/saref/Constants.java index 1946b65..b76665f 100644 --- a/src/main/java/fr/emse/gitlab/saref/Constants.java +++ b/src/main/java/fr/emse/gitlab/saref/Constants.java @@ -34,7 +34,6 @@ public class Constants { public static final String STATIC_TARGET_DIR = SITE_DIR + File.separator + "static"; public static final String SAREF_ACCESS_TOKEN = "SAREF_ACCESS_TOKEN"; - public static final String SAREF_ACCESS_USERNAME = "SAREF_ACCESS_USERNAME"; public static final String propertyFile = ".saref-repositories"; diff --git a/src/main/java/fr/emse/gitlab/saref/Main.java b/src/main/java/fr/emse/gitlab/saref/Main.java index c5f09e4..8102c68 100644 --- a/src/main/java/fr/emse/gitlab/saref/Main.java +++ b/src/main/java/fr/emse/gitlab/saref/Main.java @@ -45,6 +45,7 @@ import fr.emse.gitlab.saref.jobs.WriteRDFFiles; import fr.emse.gitlab.saref.jobs.CheckOWLProfile; import fr.emse.gitlab.saref.jobs.CheckRepositoryStructure; import fr.emse.gitlab.saref.jobs.CheckShapes; +import fr.emse.gitlab.saref.jobs.CopyStaticFiles; public class Main { @@ -93,12 +94,13 @@ public class Main { LOG.info("Starting pipeline"); doJob(new CheckRepositoryStructure(directory)); - doJob(new CheckShapes(directory)); - Repositories repositories = doJob(new ReadRepositories(directory)); - Dataset dataset = doJob(new CreateDataset(directory, repositories)); - doJob(new CopyStaticFiles(directory)); - Set mappers = doJob(new WriteRDFFiles(directory, dataset)); - doJob(new CheckOWLProfile(directory, mappers)); +// doJob(new CheckShapes(directory)); +// Repositories repositories = doJob(new ReadRepositories(directory)); +// Repositories repositories = new Repositories(); +// Dataset dataset = doJob(new CreateDataset(directory, repositories)); +// doJob(new CopyStaticFiles(directory)); +// Set mappers = doJob(new WriteRDFFiles(directory, dataset)); +// doJob(new CheckOWLProfile(directory, mappers)); reportAndExit(0); } diff --git a/src/main/java/fr/emse/gitlab/saref/jobs/CheckRepositoryStructure.java b/src/main/java/fr/emse/gitlab/saref/jobs/CheckRepositoryStructure.java index c1f8977..3fe17e7 100644 --- a/src/main/java/fr/emse/gitlab/saref/jobs/CheckRepositoryStructure.java +++ b/src/main/java/fr/emse/gitlab/saref/jobs/CheckRepositoryStructure.java @@ -49,9 +49,7 @@ public class CheckRepositoryStructure extends AbstractJobRunner { private void checkThereExistsDirectory(String dirName) { final File dir = new File(directory, dirName); try { - if (dir.isDirectory()) { - success(String.format("There exists a folder named `%s`", dirName)); - } else { + if (!dir.isDirectory()) { failure(String.format("There should exist a folder named `%s`", dirName)); } } catch (SecurityException ex) { diff --git a/src/main/java/fr/emse/gitlab/saref/jobs/CheckShapes.java b/src/main/java/fr/emse/gitlab/saref/jobs/CheckShapes.java index ae8cde8..71e8dfb 100644 --- a/src/main/java/fr/emse/gitlab/saref/jobs/CheckShapes.java +++ b/src/main/java/fr/emse/gitlab/saref/jobs/CheckShapes.java @@ -30,7 +30,8 @@ public class CheckShapes extends AbstractJobRunner { static final String SELECT_VIOLATION = "PREFIX sh: \n" + "SELECT ?focusNode ?resultMessage ?resultPath ?value ?severity\n" + "WHERE { \n" - + " ?violation sh:focusNode ?focusNode .\n" + " ?violation sh:resultMessage ?resultMessage .\n" + + " ?violation sh:focusNode ?focusNode .\n" + + " ?violation sh:resultMessage ?resultMessage .\n" + " ?violation sh:resultSeverity ?severity .\n" + " OPTIONAL { ?violation sh:resultPath ?resultPath . }\n" + " OPTIONAL { ?violation sh:value ?value . } \n" + "}"; diff --git a/src/main/java/fr/emse/gitlab/saref/CopyStaticFiles.java b/src/main/java/fr/emse/gitlab/saref/jobs/CopyStaticFiles.java similarity index 82% rename from src/main/java/fr/emse/gitlab/saref/CopyStaticFiles.java rename to src/main/java/fr/emse/gitlab/saref/jobs/CopyStaticFiles.java index 1bb81ab..791a939 100644 --- a/src/main/java/fr/emse/gitlab/saref/CopyStaticFiles.java +++ b/src/main/java/fr/emse/gitlab/saref/jobs/CopyStaticFiles.java @@ -1,10 +1,11 @@ -package fr.emse.gitlab.saref; +package fr.emse.gitlab.saref.jobs; import java.io.File; import org.apache.commons.io.FileUtils; -import fr.emse.gitlab.saref.jobs.AbstractJobRunner; +import fr.emse.gitlab.saref.Constants; +import fr.emse.gitlab.saref.Main; public class CopyStaticFiles extends AbstractJobRunner { diff --git a/src/main/java/fr/emse/gitlab/saref/jobs/ReadRepositories.java b/src/main/java/fr/emse/gitlab/saref/jobs/ReadRepositories.java index b198399..2ebe3fe 100644 --- a/src/main/java/fr/emse/gitlab/saref/jobs/ReadRepositories.java +++ b/src/main/java/fr/emse/gitlab/saref/jobs/ReadRepositories.java @@ -82,6 +82,9 @@ public class ReadRepositories extends AbstractJobRunner { File repoDir = new File(directory, Constants.GIT_DIR); try { FileUtils.forceDelete(repoDir); + } catch (IOException ex) { + } + try { FileUtils.forceMkdir(repoDir); } catch (IOException ex) { error(String.format("Error while creating repository directory %s", repoDir.getPath()), ex); @@ -124,7 +127,7 @@ public class ReadRepositories extends AbstractJobRunner { } else { if (console != null) { username = console - .readLine(String.format("Please enter your EOL account username for %s:\n", hostName)); + .readLine(String.format("Please enter your account username for %s:\n", hostName)); } else if (System.getenv("GITLAB_CI") != null) { LOG.info("using username 'gitlab-ci-token'"); username = "gitlab-ci-token"; @@ -138,7 +141,7 @@ public class ReadRepositories extends AbstractJobRunner { } else { if (console != null) { password = console - .readPassword(String.format("Please enter your EOL account password for %s:\n", hostName)); + .readPassword(String.format("Please enter your account password for %s:\n", hostName)); } else if (System.getenv("GITLAB_CI") != null) { password = System.getenv("CI_JOB_TOKEN").toCharArray(); } else { -- GitLab