diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/SpeechIndex.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/SpeechIndex.java index 935e5da..1696c86 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/SpeechIndex.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/database/SpeechIndex.java @@ -5,12 +5,23 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.*; import java.util.List; -@Getter public class SpeechIndex { private final List sessions; private final List speeches; private final List agendaItems; + public List getSessions() { + return sessions; + } + + public List getSpeeches() { + return speeches; + } + + public List getAgendaItems() { + return agendaItems; + } + public SpeechIndex(List sessions, List speeches, List agendaItems) { this.sessions = sessions; this.speeches = speeches; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/AgendaItem_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/AgendaItem_File_Impl.java index 878099c..b7a28b4 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/AgendaItem_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/AgendaItem_File_Impl.java @@ -8,13 +8,32 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntry import java.util.ArrayList; -@Getter public class AgendaItem_File_Impl implements AgendaItem { private final int id; private final int sessionId; private final String title; private final ArrayList speeches; + @Override + public int getId() { + return id; + } + + @Override + public int getSessionId() { + return sessionId; + } + + @Override + public String getTitle() { + return title; + } + + @Override + public ArrayList getSpeeches() { + return speeches; + } + public AgendaItem_File_Impl(int id, int sessionId, String title) { this.id = id; this.sessionId = sessionId; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Comment_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Comment_File_Impl.java index ce5c029..0adc36d 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Comment_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Comment_File_Impl.java @@ -6,8 +6,27 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Content import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntryType; -@Getter public class Comment_File_Impl implements Content, Comment { + @Override + public int getContentId() { + return contentId; + } + + @Override + public int getSpeechId() { + return speechId; + } + + @Override + public String getComment() { + return comment; + } + + @Override + public String getCommentatorName() { + return commentatorName; + } + private final int contentId; private final int speechId; private final String comment; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Constituency_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Constituency_File_Impl.java index 751b7ed..90ef8cf 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Constituency_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Constituency_File_Impl.java @@ -5,12 +5,26 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Constit import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntryType; -@Getter public class Constituency_File_Impl implements Constituency { private final int id; private final String name; private final String federalState; + @Override + public int getId() { + return id; + } + + @Override + public String getName() { + return name; + } + + @Override + public String getFederalState() { + return federalState; + } + public Constituency_File_Impl(int id, String name, String federalState) { this.id = id; this.name = name; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Fraction_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Fraction_File_Impl.java index 0d0546a..dbbe513 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Fraction_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Fraction_File_Impl.java @@ -7,12 +7,26 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntry import java.util.List; -@Getter public class Fraction_File_Impl implements Fraction { private String name; private final String longName; private final List members; + @Override + public String getName() { + return name; + } + + @Override + public String getLongName() { + return longName; + } + + @Override + public List getMembers() { + return members; + } + public Fraction_File_Impl(String name, String longName, List members) { this.name = name; this.longName = longName; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/HistoryEntry_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/HistoryEntry_File_Impl.java index 9000f52..960ee54 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/HistoryEntry_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/HistoryEntry_File_Impl.java @@ -5,13 +5,26 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.History import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntryType; -@Getter public class HistoryEntry_File_Impl implements HistoryEntry { private final String action; private final String content; private final String contentType; private final String date; + @Override + public String getContent() { + return content; + } + + public String getContentType() { + return contentType; + } + + @Override + public String getDate() { + return date; + } + public HistoryEntry_File_Impl(String content, String contentType, String date, String action) { this.action = action; this.content = content; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Individual_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Individual_File_Impl.java index 3c0cc5c..5493449 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Individual_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Individual_File_Impl.java @@ -4,7 +4,6 @@ import lombok.Getter; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Individual; -@Getter public abstract class Individual_File_Impl implements Individual { private final String name; private final String firstName; @@ -15,6 +14,46 @@ public abstract class Individual_File_Impl implements Individual { private final String gender; private final String religion; + @Override + public String getName() { + return name; + } + + @Override + public String getFirstName() { + return firstName; + } + + @Override + public String getTitle() { + return title; + } + + @Override + public String getDateOfBirth() { + return dateOfBirth; + } + + @Override + public String getDateOfDeath() { + return dateOfDeath; + } + + @Override + public String getPlaceOfBirth() { + return placeOfBirth; + } + + @Override + public String getGender() { + return gender; + } + + @Override + public String getReligion() { + return religion; + } + public Individual_File_Impl(String name, String firstName, String title, String dateOfBirth, String dateOfDeath, String placeOfBirth, String gender, String religion) { this.name = name; this.firstName = firstName; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/LegislativePeriod_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/LegislativePeriod_File_Impl.java index 9c1e981..fb806a3 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/LegislativePeriod_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/LegislativePeriod_File_Impl.java @@ -5,13 +5,32 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Legisla import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntryType; -@Getter public class LegislativePeriod_File_Impl implements LegislativePeriod { private final int id; private final String startDate; private final String endDate; private final String constituency; + @Override + public int getId() { + return id; + } + + @Override + public String getStartDate() { + return startDate; + } + + @Override + public String getEndDate() { + return endDate; + } + + @Override + public String getConstituency() { + return constituency; + } + public LegislativePeriod_File_Impl(int id, String startDate, String endDate, String constituency) { this.id = id; this.startDate = startDate; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Line_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Line_File_Impl.java index 7d951a3..70efaff 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Line_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Line_File_Impl.java @@ -5,12 +5,26 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Content import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Line; import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntryType; -@Getter public class Line_File_Impl implements Content, Line { private final int contentId; protected final int speechId; private final String content; + @Override + public int getContentId() { + return contentId; + } + + @Override + public int getSpeechId() { + return speechId; + } + + @Override + public String getContent() { + return content; + } + public Line_File_Impl(int contentId, int speechId, String content) { this.contentId = contentId; this.speechId = speechId; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/MemberOfParliament_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/MemberOfParliament_File_Impl.java index 82d23b8..2b8bf36 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/MemberOfParliament_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/MemberOfParliament_File_Impl.java @@ -8,7 +8,6 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntry import java.util.List; -@Getter public class MemberOfParliament_File_Impl extends Individual_File_Impl implements MemberOfParliament { private final int id; private String party; @@ -17,6 +16,36 @@ public class MemberOfParliament_File_Impl extends Individual_File_Impl implement private final int lastLegislativePeriodId; private final String photo; + @Override + public int getId() { + return id; + } + + @Override + public String getParty() { + return party; + } + + @Override + public List getLegislativePeriods() { + return legislativePeriods; + } + + @Override + public int getFirstLegislativePeriodId() { + return firstLegislativePeriodId; + } + + @Override + public int getLastLegislativePeriodId() { + return lastLegislativePeriodId; + } + + @Override + public String getPhoto() { + return photo; + } + public MemberOfParliament_File_Impl(String name, String firstName, String title, String dateOfBirth, String dateofDeath, String placeOfBirth, String gender, String religion, int id, String party, List legislativePeriods, int firstLegislativePeriodId, int lastLegislativePeriodId, String photo) { super(name, firstName, title, dateOfBirth, dateofDeath, placeOfBirth, gender, religion); this.id = id; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Session_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Session_File_Impl.java index 27136c9..90b282a 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Session_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Session_File_Impl.java @@ -8,7 +8,6 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntry import java.util.ArrayList; import java.util.List; -@Getter public class Session_File_Impl implements Session { private final int id; private final String legislativePeriod; @@ -16,6 +15,31 @@ public class Session_File_Impl implements Session { private final String endTime; private final List agendaItems; + @Override + public int getId() { + return id; + } + + @Override + public String getLegislativePeriod() { + return legislativePeriod; + } + + @Override + public String getDateTime() { + return dateTime; + } + + @Override + public String getEndTime() { + return endTime; + } + + @Override + public List getAgendaItems() { + return agendaItems; + } + public Session_File_Impl(String legislativePeriod, int id, String dateTime, String endTime) { this.id = id; this.legislativePeriod = legislativePeriod; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Speaker_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Speaker_File_Impl.java index c7d395e..20d7abf 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Speaker_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Speaker_File_Impl.java @@ -6,7 +6,6 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Speaker import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntryType; -@Getter public class Speaker_File_Impl implements Content, Speaker { private final int contentId; private final int speechId; @@ -14,6 +13,31 @@ public class Speaker_File_Impl implements Content, Speaker { private final String speakerName; private final String fraction; + @Override + public int getContentId() { + return contentId; + } + + @Override + public int getSpeechId() { + return speechId; + } + + @Override + public int getSpeakerId() { + return speakerId; + } + + @Override + public String getSpeakerName() { + return speakerName; + } + + @Override + public String getFraction() { + return fraction; + } + public Speaker_File_Impl(int contentId, int speechId, int speakerId, String speakerName, String fraction) { this.contentId = contentId; this.speechId = speechId; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Speech_File_Impl.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Speech_File_Impl.java index 8e62e15..739a909 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Speech_File_Impl.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/Impls/Speech_File_Impl.java @@ -9,7 +9,6 @@ import org.texttechnologylab.project.gruppe_05_1.xml.speeches.enums.MongoDBEntry import java.util.ArrayList; import java.util.List; -@Getter public class Speech_File_Impl implements Speech { private final int sessionId; private final int agendaItemId; @@ -19,6 +18,41 @@ public class Speech_File_Impl implements Speech { private final String fraction; private final List speechContents; + @Override + public int getSessionId() { + return sessionId; + } + + @Override + public int getAgendaItemId() { + return agendaItemId; + } + + @Override + public int getSpeakerId() { + return speakerId; + } + + @Override + public int getSpeechId() { + return speechId; + } + + @Override + public String getSpeakerName() { + return speakerName; + } + + @Override + public String getFraction() { + return fraction; + } + + @Override + public List getSpeechContents() { + return speechContents; + } + public Speech_File_Impl(int sessionId, int agendaItemId, int speechId, int speakerId, String speakerName, String fraction) { this.speakerId = speakerId; this.agendaItemId = agendaItemId; diff --git a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/SpeechParser.java b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/SpeechParser.java index fcb436d..d09eee1 100644 --- a/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/SpeechParser.java +++ b/src/main/java/org/texttechnologylab/project/gruppe_05_1/xml/speeches/SpeechParser.java @@ -27,13 +27,22 @@ import java.util.Set; public class SpeechParser { - @Getter private List speeches; - @Getter private List agendaItems; - @Setter private Boolean parseLegislativePeriods; + public List getSpeeches() { + return speeches; + } + + public List getAgendaItems() { + return agendaItems; + } + + public void setParseLegislativePeriods(Boolean parseLegislativePeriods) { + this.parseLegislativePeriods = parseLegislativePeriods; + } + public List parseAllSessions() { List sessionsEmpty = new ArrayList<>(); List sessions = new ArrayList<>();