Jonas_Jones/multimodal_parliament_explorer_05_1
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

major domain impl class refactoring

Browse source
This commit is contained in:
Jonas Werner 2025-03-22 13:13:05 +01:00
parent 2e5d43d34f
commit 12f1f67405
18 changed files with 39 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoDBHandler.java
View file

@ -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;

16
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoObjectFactory.java
View file

@ -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<Document> createMemberships(List<Membership> list) {
return new Membership_Mongo_Impl().createList(list);
return new Membership_MongoDB_Impl().createList(list);
}
}

4
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/MongoPprUtils.java
View file

@ -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;

BIN
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/.DS_Store vendored
View file

Binary file not shown.

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/AgendaItem_MongoDB_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/AgendaItem_MongoDB_Impl.java
View file

@ -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;

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/BiografischeAngaben_Mongo_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/BiographicalInformation_MongoDB_Impl.java
View file

@ -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<BiografischeAngaben> {
public class BiographicalInformation_MongoDB_Impl extends BiografischeAngaben implements MongoOperations<BiografischeAngaben> {
@Override
public Document createEntity(BiografischeAngaben entity) {
Map<String, Object> fields = new HashMap<>();

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Institution_Mongo_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Institution_MongoDB_Impl.java
View file

@ -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<Institution> {
public class Institution_MongoDB_Impl extends Institution implements MongoOperations<Institution> {
@Override
public Document createEntity(Institution entity) {
Map<String, Object> fields = new HashMap<>();

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Wahlperiode_Mongo_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/LegislativePeriod_MongoDB_Impl.java
View file

@ -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<Wahlperiode> {
public class LegislativePeriod_MongoDB_Impl extends Wahlperiode implements MongoOperations<Wahlperiode> {
@Override
public Document createEntity(Wahlperiode entity) {

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/MdbName_Mongo_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/MdbName_MongoDB_Impl.java
View file

@ -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<MdbName> {
public class MdbName_MongoDB_Impl extends MdbName implements MongoOperations<MdbName> {
@Override
public Document createEntity(MdbName entity) {
Map<String, Object> fields = new HashMap<>();

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Mdb_Mongo_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Mdb_MongoDB_Impl.java
View file

@ -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<Mdb> {
public class Mdb_MongoDB_Impl extends Mdb implements MongoOperations<Mdb> {
@Override
public Document createEntity(Mdb entity) {
Document bioDoc = factory.createBiografischeAngaben(entity.getBio());

5
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Membership_Mongo_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Membership_MongoDB_Impl.java
View file

@ -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<Membership> {
public class Membership_MongoDB_Impl extends Membership implements MongoOperations<Membership> {
@Override
public Document createEntity(Membership entity) {
Map<String, Object> fields = new HashMap<>();

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Session_MongoDB_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Session_MongoDB_Impl.java
View file

@ -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;

4
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speaker_Mongo_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speaker_MongoDB_Impl.java
View file

@ -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<Speaker> {
import static org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils.getMemberPhoto;
public class Speaker_MongoDB_Impl extends Speaker implements MongoOperations<Speaker> {
@Override
public Document createEntity(Speaker entity) {

15
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Speech_MongoDB_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/Speech_MongoDB_Impl.java
View file

@ -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();
}
}

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Comment_MongoDB_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Comment_MongoDB_Impl.java
View file

@ -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;

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Line_MongoDB_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Line_MongoDB_Impl.java
View file

@ -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;

2
src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimp/speeches/Speaker_MongoDB_Impl.java → src/main/java/org/texttechnologylab/project/gruppe_05_1/database/domainimpl/mdb/speechline/Speaker_MongoDB_Impl.java
View file

@ -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;

10
src/main/java/org/texttechnologylab/project/gruppe_05_1/nlp/NlpUtils.java
View file

@ -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;