From 12f1f6740570a3b40c2368c8f19b2b891d795613 Mon Sep 17 00:00:00 2001 From: Jonas Werner Date: Sat, 22 Mar 2025 13:13:05 +0100 Subject: [PATCH] major domain impl class refactoring --- .../gruppe_05_1/database/MongoDBHandler.java | 8 +++----- .../database/MongoObjectFactory.java | 16 ++++++++-------- .../gruppe_05_1/database/MongoPprUtils.java | 4 +--- .../gruppe_05_1/database/domainimp/.DS_Store | Bin 6148 -> 0 bytes .../mdb}/AgendaItem_MongoDB_Impl.java | 2 +- ...> BiographicalInformation_MongoDB_Impl.java} | 2 +- ..._Impl.java => Institution_MongoDB_Impl.java} | 2 +- ...java => LegislativePeriod_MongoDB_Impl.java} | 2 +- ...ongo_Impl.java => MdbName_MongoDB_Impl.java} | 2 +- ...db_Mongo_Impl.java => Mdb_MongoDB_Impl.java} | 2 +- ...o_Impl.java => Membership_MongoDB_Impl.java} | 5 +---- .../mdb}/Session_MongoDB_Impl.java | 2 +- ...ongo_Impl.java => Speaker_MongoDB_Impl.java} | 4 +++- .../mdb}/Speech_MongoDB_Impl.java | 15 +++++++++++++-- .../mdb/speechline}/Comment_MongoDB_Impl.java | 2 +- .../mdb/speechline}/Line_MongoDB_Impl.java | 2 +- .../mdb/speechline}/Speaker_MongoDB_Impl.java | 2 +- .../project/gruppe_05_1/nlp/NlpUtils.java | 10 ---------- 18 files changed, 39 insertions(+), 43 deletions(-) delete mode 100644 src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/.DS_Store rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/{domainimp/speeches => domainimpl/mdb}/AgendaItem_MongoDB_Impl.java (97%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/{BiografischeAngaben_Mongo_Impl.java => BiographicalInformation_MongoDB_Impl.java} (91%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/{Institution_Mongo_Impl.java => Institution_MongoDB_Impl.java} (90%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/{Wahlperiode_Mongo_Impl.java => LegislativePeriod_MongoDB_Impl.java} (91%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/{MdbName_Mongo_Impl.java => MdbName_MongoDB_Impl.java} (91%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/{Mdb_Mongo_Impl.java => Mdb_MongoDB_Impl.java} (92%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/{Membership_Mongo_Impl.java => Membership_MongoDB_Impl.java} (78%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/{domainimp/speeches => domainimpl/mdb}/Session_MongoDB_Impl.java (97%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/{Speaker_Mongo_Impl.java => Speaker_MongoDB_Impl.java} (89%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/{domainimp/speeches => domainimpl/mdb}/Speech_MongoDB_Impl.java (87%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/{domainimp/speeches => domainimpl/mdb/speechline}/Comment_MongoDB_Impl.java (96%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/{domainimp/speeches => domainimpl/mdb/speechline}/Line_MongoDB_Impl.java (96%) rename src/main/java/org/texttechnologylab/project/gruppe_05_1/database/{domainimp/speeches => domainimpl/mdb/speechline}/Speaker_MongoDB_Impl.java (96%) 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 d77d99d..cde1b92 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 @@ -3,8 +3,6 @@ package org.texttechnologylab.project.gruppe_05_1.database; import com.mongodb.MongoClientSettings; import com.mongodb.MongoCredential; import com.mongodb.ServerAddress; -import com.mongodb.WriteConcern; -import com.mongodb.WriteConcern; import com.mongodb.bulk.BulkWriteResult; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; @@ -16,9 +14,9 @@ import org.texttechnologylab.project.gruppe_05_1.exceptions.SessionNotFoundExcep import org.bson.Document; import org.bson.conversions.Bson; import org.bson.types.ObjectId; -import org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.AgendaItem_MongoDB_Impl; -import org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Session_MongoDB_Impl; -import org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl; +import org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.AgendaItem_MongoDB_Impl; +import org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.Session_MongoDB_Impl; +import org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.Speech_MongoDB_Impl; import org.texttechnologylab.project.gruppe_05_1.util.Logger; import org.texttechnologylab.project.gruppe_05_1.util.PPRUtils; import org.texttechnologylab.project.gruppe_05_1.util.PropertiesUtils; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoObjectFactory.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoObjectFactory.java index 9a45a4f..dd5ac73 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoObjectFactory.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoObjectFactory.java @@ -28,23 +28,23 @@ public class MongoObjectFactory { * ===================== */ public Document createBiografischeAngaben(BiografischeAngaben entity) { - return new BiografischeAngaben_Mongo_Impl().createEntity(entity); + return new BiographicalInformation_MongoDB_Impl().createEntity(entity); } public Document createInstitution(Institution entity) { - return new Institution_Mongo_Impl().createEntity(entity); + return new Institution_MongoDB_Impl().createEntity(entity); } public Document createMdb(Mdb entity) { - return new Mdb_Mongo_Impl().createEntity(entity); + return new Mdb_MongoDB_Impl().createEntity(entity); } public Document createMdbName(MdbName entity) { - return new MdbName_Mongo_Impl().createEntity(entity); + return new MdbName_MongoDB_Impl().createEntity(entity); } public Document createWahlperiode(Wahlperiode entity) { - return new Wahlperiode_Mongo_Impl().createEntity(entity); + return new LegislativePeriod_MongoDB_Impl().createEntity(entity); } /* @@ -52,14 +52,14 @@ public class MongoObjectFactory { * ======================== */ public Document createSpeaker(Speaker entity) { - return new Speaker_Mongo_Impl().createEntity(entity); + return new Speaker_MongoDB_Impl().createEntity(entity); } public Document createMembership(Membership entity) { - return new Membership_Mongo_Impl().createEntity(entity); + return new Membership_MongoDB_Impl().createEntity(entity); } public List createMemberships(List list) { - return new Membership_Mongo_Impl().createList(list); + return new Membership_MongoDB_Impl().createList(list); } } diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoPprUtils.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoPprUtils.java index fd50cce..1f92857 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoPprUtils.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoPprUtils.java @@ -8,12 +8,10 @@ import com.mongodb.client.model.Projections; import io.javalin.http.Context; import org.bson.Document; import org.bson.conversions.Bson; -import org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speaker_MongoDB_Impl; -import org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl; +import org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.Speech_MongoDB_Impl; import org.texttechnologylab.project.gruppe_05_1.domain.html.HtmlSpeech; import org.texttechnologylab.project.gruppe_05_1.domain.html.Parlamentarier; import org.texttechnologylab.project.gruppe_05_1.domain.html.ParlamentarierDetails; -import org.texttechnologylab.project.gruppe_05_1.domain.nlp.*; import org.texttechnologylab.project.gruppe_05_1.domain.speaker.Membership; import org.texttechnologylab.project.gruppe_05_1.domain.speech.SpeechMetaData; import org.texttechnologylab.project.gruppe_05_1.util.GeneralUtils; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/.DS_Store b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/.DS_Store deleted file mode 100644 index 5069ad4b78e54dfeaa4a74f0a21b7ef75164923d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5B>J5S@V_t&}Du6>?3t7eFRjPOw6vMENKwlI)5ITJ{87f^#4`?n2E4c;gv9 ztGG&mP&6ai&z_Gx`=qr!M8xC!SxGb^q5@5jWsnh3XH7@ud;;XO#*~&cr|oJ{)|rL= zqe^lwXiF{fp3|@Vr_H+6gwGyxKI^8cCaY#5w)30#^!)mEnfIH0`@Mf$4=-Nwe(kcX zfA&mU@8tDR-)&aSW`TXcw~I623^)VMfHSZc19pcL!@Z(C$Qf`34w(Tt9|D?SH0%`9 z(Sa_N0Kfs%NiddLLSlkpH0%^%fv|=GHI%KyU=4>pm|ryP6g8aKiVwD(zls-5yJP*3 z+=-*2_s)Pb&}ZOSrz5%lukg!ci~N3w&zu2g;J_H*K~+~{e3ad-JD(?aZ9uz46A`~o o1`v#Uj{r>M963!!wFeo)FB*1=vWnb%7 diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/AgendaItem_MongoDB_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/AgendaItem_MongoDB_Impl.java similarity index 97% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/AgendaItem_MongoDB_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/AgendaItem_MongoDB_Impl.java index 578255d..f4c38b1 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/AgendaItem_MongoDB_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/AgendaItem_MongoDB_Impl.java @@ -1,4 +1,4 @@ -package org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches; +package org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb; import org.bson.Document; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Impls.AgendaItem_File_Impl; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/BiografischeAngaben_Mongo_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/BiographicalInformation_MongoDB_Impl.java similarity index 91% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/BiografischeAngaben_Mongo_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/BiographicalInformation_MongoDB_Impl.java index dce9a48..f2e8ee2 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/BiografischeAngaben_Mongo_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/BiographicalInformation_MongoDB_Impl.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class BiografischeAngaben_Mongo_Impl extends BiografischeAngaben implements MongoOperations { +public class BiographicalInformation_MongoDB_Impl extends BiografischeAngaben implements MongoOperations { @Override public Document createEntity(BiografischeAngaben entity) { Map fields = new HashMap<>(); diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Institution_Mongo_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Institution_MongoDB_Impl.java similarity index 90% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Institution_Mongo_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Institution_MongoDB_Impl.java index a33bf13..39f6b54 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Institution_Mongo_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Institution_MongoDB_Impl.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class Institution_Mongo_Impl extends Institution implements MongoOperations { +public class Institution_MongoDB_Impl extends Institution implements MongoOperations { @Override public Document createEntity(Institution entity) { Map fields = new HashMap<>(); diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Wahlperiode_Mongo_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/LegislativePeriod_MongoDB_Impl.java similarity index 91% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Wahlperiode_Mongo_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/LegislativePeriod_MongoDB_Impl.java index 2dc689c..699160b 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Wahlperiode_Mongo_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/LegislativePeriod_MongoDB_Impl.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class Wahlperiode_Mongo_Impl extends Wahlperiode implements MongoOperations { +public class LegislativePeriod_MongoDB_Impl extends Wahlperiode implements MongoOperations { @Override public Document createEntity(Wahlperiode entity) { diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/MdbName_Mongo_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/MdbName_MongoDB_Impl.java similarity index 91% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/MdbName_Mongo_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/MdbName_MongoDB_Impl.java index fad4e0f..6d10af6 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/MdbName_Mongo_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/MdbName_MongoDB_Impl.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class MdbName_Mongo_Impl extends MdbName implements MongoOperations { +public class MdbName_MongoDB_Impl extends MdbName implements MongoOperations { @Override public Document createEntity(MdbName entity) { Map fields = new HashMap<>(); diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Mdb_Mongo_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Mdb_MongoDB_Impl.java similarity index 92% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Mdb_Mongo_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Mdb_MongoDB_Impl.java index f44d194..dbfa7cf 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Mdb_Mongo_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Mdb_MongoDB_Impl.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -public class Mdb_Mongo_Impl extends Mdb implements MongoOperations { +public class Mdb_MongoDB_Impl extends Mdb implements MongoOperations { @Override public Document createEntity(Mdb entity) { Document bioDoc = factory.createBiografischeAngaben(entity.getBio()); diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Membership_Mongo_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Membership_MongoDB_Impl.java similarity index 78% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Membership_Mongo_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Membership_MongoDB_Impl.java index c11be39..62f19dc 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Membership_Mongo_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Membership_MongoDB_Impl.java @@ -3,17 +3,14 @@ package org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb; import org.bson.Document; import org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler; import org.texttechnologylab.project.gruppe_05_1.database.MongoOperations; -import org.texttechnologylab.project.gruppe_05_1.domain.mdb.MdbName; -import org.texttechnologylab.project.gruppe_05_1.domain.mdb.Wahlperiode; import org.texttechnologylab.project.gruppe_05_1.domain.speaker.Membership; -import org.texttechnologylab.project.gruppe_05_1.domain.speaker.Speaker; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -public class Membership_Mongo_Impl extends Membership implements MongoOperations { +public class Membership_MongoDB_Impl extends Membership implements MongoOperations { @Override public Document createEntity(Membership entity) { Map fields = new HashMap<>(); diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Session_MongoDB_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Session_MongoDB_Impl.java similarity index 97% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Session_MongoDB_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Session_MongoDB_Impl.java index 855d076..3088031 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Session_MongoDB_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Session_MongoDB_Impl.java @@ -1,4 +1,4 @@ -package org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches; +package org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb; import org.bson.Document; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Impls.Session_File_Impl; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speaker_Mongo_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speaker_MongoDB_Impl.java similarity index 89% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speaker_Mongo_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speaker_MongoDB_Impl.java index 20fc049..5c357e0 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speaker_Mongo_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speaker_MongoDB_Impl.java @@ -11,7 +11,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class Speaker_Mongo_Impl extends Speaker implements MongoOperations { +import static org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils.getMemberPhoto; + +public class Speaker_MongoDB_Impl extends Speaker implements MongoOperations { @Override public Document createEntity(Speaker entity) { diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Speech_MongoDB_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speech_MongoDB_Impl.java similarity index 87% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Speech_MongoDB_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speech_MongoDB_Impl.java index 2f43ec7..49e26c9 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Speech_MongoDB_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speech_MongoDB_Impl.java @@ -1,12 +1,14 @@ -package org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches; +package org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb; import de.tudarmstadt.ukp.dkpro.core.api.metadata.type.DocumentMetaData; import org.apache.uima.UIMAException; import org.apache.uima.fit.factory.JCasFactory; import org.apache.uima.jcas.JCas; import org.bson.Document; +import org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.speechline.Comment_MongoDB_Impl; +import org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.speechline.Line_MongoDB_Impl; +import org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.speechline.Speaker_MongoDB_Impl; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Impls.Speech_File_Impl; -import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Content; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Speech; @@ -75,4 +77,13 @@ public class Speech_MongoDB_Impl extends Speech_File_Impl implements Speech { return jCas; } + public String toTeX() { + StringBuilder tex = new StringBuilder(); + + tex.append(""); + + + return tex.toString(); + } + } diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Comment_MongoDB_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Comment_MongoDB_Impl.java similarity index 96% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Comment_MongoDB_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Comment_MongoDB_Impl.java index 64000df..8aab442 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Comment_MongoDB_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Comment_MongoDB_Impl.java @@ -1,4 +1,4 @@ -package org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches; +package org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.speechline; import org.bson.Document; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Impls.Comment_File_Impl; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Line_MongoDB_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Line_MongoDB_Impl.java similarity index 96% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Line_MongoDB_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Line_MongoDB_Impl.java index ac951aa..ad4a362 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Line_MongoDB_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Line_MongoDB_Impl.java @@ -1,4 +1,4 @@ -package org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches; +package org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.speechline; import org.bson.Document; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Impls.Line_File_Impl; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Speaker_MongoDB_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Speaker_MongoDB_Impl.java similarity index 96% rename from src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Speaker_MongoDB_Impl.java rename to src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Speaker_MongoDB_Impl.java index 2a9aefb..1bbebd9 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Speaker_MongoDB_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Speaker_MongoDB_Impl.java @@ -1,4 +1,4 @@ -package org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches; +package org.texttechnologylab.project.gruppe_05_1.database.domainimpl.mdb.speechline; import org.bson.Document; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Impls.Speaker_File_Impl; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/NlpUtils.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/NlpUtils.java index 32f842e..17e125b 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/NlpUtils.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/NlpUtils.java @@ -2,9 +2,7 @@ package org.texttechnologylab.project.gruppe_05_1.nlp; import com.mongodb.client.model.Filters; import com.mongodb.client.model.UpdateOneModel; -import com.mongodb.client.model.Updates; import com.mongodb.client.model.WriteModel; -import de.tudarmstadt.ukp.dkpro.core.api.lexmorph.type.pos.POS; import de.tudarmstadt.ukp.dkpro.core.api.metadata.type.DocumentMetaData; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence; import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token; @@ -16,9 +14,6 @@ import org.apache.uima.fit.factory.JCasFactory; import org.apache.uima.fit.util.JCasUtil; import org.apache.uima.jcas.JCas; import org.apache.uima.resource.ResourceInitializationException; -import org.apache.uima.resource.metadata.TypeSystemDescription; -import org.apache.uima.util.CasCreationUtils; -import org.apache.uima.util.XMLInputSource; import org.bson.Document; import org.bson.conversions.Bson; import org.dkpro.core.io.xmi.XmiWriter; @@ -30,9 +25,7 @@ import org.texttechnologylab.DockerUnifiedUIMAInterface.driver.DUUIUIMADriver; import org.texttechnologylab.DockerUnifiedUIMAInterface.lua.DUUILuaContext; import org.texttechnologylab.annotation.NamedEntity; import org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler; -import org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl; import org.texttechnologylab.project.gruppe_05_1.util.Logger; -import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Content; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Speech; import org.texttechnologylab.uima.type.Sentiment; import org.xml.sax.SAXException; @@ -44,9 +37,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.*; import java.util.stream.Collectors; -import java.util.zip.GZIPInputStream; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;