From 8b6e2a40941c4ecab639749549d55ea945a47688 Mon Sep 17 00:00:00 2001 From: s5260822 Date: Fri, 14 Mar 2025 13:04:39 +0100 Subject: [PATCH] globallified directory constants --- .../org/texttechnologylab/project/gruppe_05_1/Main.java | 6 ++++++ .../project/gruppe_05_1/database/MongoDBHandler.java | 2 +- .../project/gruppe_05_1/nlp/XmiExtractor.java | 4 +++- .../project/gruppe_05_1/rest/RESTHandler.java | 8 +++++--- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/Main.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/Main.java index 362e308..6b47797 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/Main.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/Main.java @@ -22,6 +22,12 @@ public class Main { private static final FileObjectFactory xmlFactory = FileObjectFactory.getFactory(); private static final MongoObjectFactory mongoFactory = MongoObjectFactory.getFactory(); + public static final String CONFIG_DIR = "src/main/resources/config"; + public static final String JAVALIN_TEMPLATE_DIR = "src/main/resources/templates"; + public static final String JAVALIN_STATIC_FILES_DIR = "src/main/resources/public"; + public static final String JCAS_SPEECHES_TYPESYSTEM_DIR = "src/main/resources/speeches/TypeSystem"; + public static final String MEMBER_IMAGES_DIR = "src/main/resources/membersOfParliamentImages/"; + public static void main(String[] args) throws Exception { UPLOAD_MEMBER_PHOTOS = Arrays.asList(args).contains("uploadMemberPhotos"); FORCE_UPLOAD_MEMBERS = Arrays.asList(args).contains("forceUploadMembers"); diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java index edc05c2..8815e25 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java @@ -30,12 +30,12 @@ import java.util.*; import java.util.concurrent.TimeUnit; import static com.mongodb.client.model.Filters.eq; +import static org.texttechnologylab.project.gruppe_05_1.Main.MEMBER_IMAGES_DIR; public class MongoDBHandler { public static final String propertiesFileName = "mongoDB.properties"; public static final String DEFAULT_ID_FIELD_NAME = "_id"; - public static final String MEMBER_IMAGES_DIR = "src/main/resources/membersOfParliamentImages/"; private final MongoClient mongoClient; private final MongoDatabase database; private static MongoDatabase mongoDatabase = null; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/XmiExtractor.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/XmiExtractor.java index 2463891..30566ff 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/XmiExtractor.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/XmiExtractor.java @@ -26,6 +26,8 @@ import org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler; import org.hucompute.textimager.uima.type.category.CategoryCoveredTagged; import org.texttechnologylab.project.gruppe_05_1.util.Logger; +import static org.texttechnologylab.project.gruppe_05_1.Main.JCAS_SPEECHES_TYPESYSTEM_DIR; + public class XmiExtractor { @@ -65,7 +67,7 @@ public class XmiExtractor { private void processXmiGzStream(InputStream inputStream, String filename) { JCas jCas = null; try (GZIPInputStream gis = new GZIPInputStream(inputStream)) { - jCas = JCasFactory.createJCas("src/main/resources/speeches/TypeSystem"); + jCas = JCasFactory.createJCas(JCAS_SPEECHES_TYPESYSTEM_DIR); XmiCasDeserializer.deserialize(gis, jCas.getCas(), true); // Build structured analysisResults Document diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/RESTHandler.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/RESTHandler.java index 7017301..e1de2a4 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/RESTHandler.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/rest/RESTHandler.java @@ -12,8 +12,10 @@ import org.texttechnologylab.project.gruppe_05_1.util.Logger; import java.io.File; import java.io.IOException; +import static org.texttechnologylab.project.gruppe_05_1.Main.JAVALIN_STATIC_FILES_DIR; +import static org.texttechnologylab.project.gruppe_05_1.Main.JAVALIN_TEMPLATE_DIR; + public class RESTHandler { - public static final String TEMPLATE_DIR = "src/main/java/org/texttechnologylab/project/gruppe_05_1/website/templates"; public void startJavalin() { @@ -25,7 +27,7 @@ public class RESTHandler { Configuration fmConfig = new Configuration(Configuration.VERSION_2_3_33); fmConfig.setDefaultEncoding("UTF-8"); try { - fmConfig.setDirectoryForTemplateLoading(new File(TEMPLATE_DIR)); + fmConfig.setDirectoryForTemplateLoading(new File(JAVALIN_TEMPLATE_DIR)); } catch (IOException e) { throw new RuntimeException(e); } @@ -34,7 +36,7 @@ public class RESTHandler { // Erzeuge die Javalin app Javalin app = Javalin.create(config -> { - config.staticFiles.add("src/main/resources/public", Location.EXTERNAL); // momentan nicht benutzt + config.staticFiles.add(JAVALIN_STATIC_FILES_DIR, Location.EXTERNAL); // momentan nicht benutzt config.fileRenderer(new JavalinFreemarker(fmConfig));