Skip to content

Commit 7454aee

Browse files
committed
fix mlib integration
1 parent f82312c commit 7454aee

File tree

5 files changed

+10
-14
lines changed

5 files changed

+10
-14
lines changed

src/main/java/de/mediathekview/mserver/crawler/arte/ArteRestVideoTypeMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package de.mediathekview.mserver.crawler.arte;
22

3-
import de.mediathekview.mlib.daten.Resolution;
4-
import de.mediathekview.mlib.daten.Sender;
3+
import de.mediathekview.mserver.daten.Resolution;
4+
import de.mediathekview.mserver.daten.Sender;
55
import org.apache.logging.log4j.LogManager;
66
import org.apache.logging.log4j.Logger;
77

src/main/java/de/mediathekview/mserver/crawler/arte/tasks/ArteDtoVideo2FilmTask.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
import java.util.Queue;
1616
import java.util.UUID;
1717

18+
import de.mediathekview.mserver.daten.Film;
19+
import de.mediathekview.mserver.daten.FilmUrl;
20+
import de.mediathekview.mserver.daten.GeoLocations;
21+
import de.mediathekview.mserver.daten.Resolution;
1822
import org.apache.logging.log4j.LogManager;
1923
import org.apache.logging.log4j.Logger;
2024

2125

22-
import de.mediathekview.mlib.daten.Film;
23-
import de.mediathekview.mlib.daten.FilmUrl;
24-
import de.mediathekview.mlib.daten.GeoLocations;
25-
import de.mediathekview.mlib.daten.Resolution;
2626
import de.mediathekview.mserver.crawler.arte.ArteVideoType;
2727
import de.mediathekview.mserver.crawler.arte.ArteRestVideoTypeMapper;
2828
import de.mediathekview.mserver.crawler.arte.json.ArteVideoInfoDto;

src/main/java/de/mediathekview/mserver/crawler/arte/tasks/ArteVideoLinkTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected JsonDeserializer<List<ArteVideoLinkDto>> getParser(ArteVideoInfoDto aD
4040

4141
@Override
4242
protected Type getType() {
43-
return new TypeToken<PagedElementListDTO<ArteVideoLinkDto>>() {}.getType();
43+
return new TypeToken<List<ArteVideoLinkDto>>() {}.getType();
4444
}
4545

4646
protected void postProcessingElements(List<ArteVideoLinkDto> elements, ArteVideoInfoDto aDTO) {

src/test/java/de/mediathekview/mserver/crawler/arte/tasks/ArteDtoVideo2FilmTaskTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package de.mediathekview.mserver.crawler.arte.tasks;
22

3-
import de.mediathekview.mlib.daten.Film;
4-
import de.mediathekview.mlib.daten.FilmUrl;
5-
import de.mediathekview.mlib.daten.GeoLocations;
6-
import de.mediathekview.mlib.daten.Resolution;
7-
import de.mediathekview.mlib.daten.Sender;
83
import de.mediathekview.mserver.crawler.arte.json.ArteVideoInfoDto;
94
import de.mediathekview.mserver.crawler.basic.TopicUrlDTO;
5+
import de.mediathekview.mserver.daten.*;
106
import de.mediathekview.mserver.testhelper.WireMockTestBase;
117
import org.junit.Test;
128
import org.junit.runner.RunWith;
@@ -39,7 +35,7 @@ public ArteDtoVideo2FilmTaskTest(String inputResource, Film[] expectedFilms) {
3935
public static Collection<Object[]> data() {
4036
Film film1 = new Film(
4137
UUID.randomUUID(),
42-
Sender.ARTE_DE,
38+
Sender.ARTE_DE,
4339
"Re: Der Traum vom Paradies - Nur die Liebe zählt",
4440
"Aktuelles und Gesellschaft - Reportagen und Recherchen",
4541
LocalDateTime.of(2024,04,26,19,42,32),

src/test/java/de/mediathekview/mserver/crawler/arte/tasks/ArteTaskTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.Collection;
55
import java.util.concurrent.ForkJoinPool;
66

7-
import de.mediathekview.mlib.messages.listener.MessageListener;
87
import de.mediathekview.mserver.base.config.MServerConfigManager;
8+
import de.mediathekview.mserver.base.messages.listener.MessageListener;
99
import de.mediathekview.mserver.crawler.arte.ArteCrawler;
1010
import de.mediathekview.mserver.progress.listeners.SenderProgressListener;
1111

0 commit comments

Comments
 (0)