From 909865ea34321cc22cea0cce4e44c520192fcb20 Mon Sep 17 00:00:00 2001 From: bivashy Date: Sun, 22 Mar 2026 01:36:57 +0500 Subject: [PATCH] Some model rename --- .../title/mapper/KodikResponseMapper.java | 16 ++++++------- ...tailEntry.java => ContentDetailEntry.java} | 2 +- ...archEntry.java => ContentSearchEntry.java} | 4 ++-- ...SearchResponse.java => SearchEntries.java} | 2 +- .../title/resource/DetailResource.java | 5 ++-- .../title/resource/SearchResource.java | 8 +++---- .../service/KodikResponseConvertService.java | 24 +++++++++---------- 7 files changed, 31 insertions(+), 30 deletions(-) rename src/main/java/com/backend/unifier/title/model/{DetailEntry.java => ContentDetailEntry.java} (54%) rename src/main/java/com/backend/unifier/title/model/{SearchEntry.java => ContentSearchEntry.java} (77%) rename src/main/java/com/backend/unifier/title/model/{SearchResponse.java => SearchEntries.java} (57%) diff --git a/src/main/java/com/backend/unifier/title/mapper/KodikResponseMapper.java b/src/main/java/com/backend/unifier/title/mapper/KodikResponseMapper.java index 0e2f4b4..605d722 100644 --- a/src/main/java/com/backend/unifier/title/mapper/KodikResponseMapper.java +++ b/src/main/java/com/backend/unifier/title/mapper/KodikResponseMapper.java @@ -11,22 +11,22 @@ import org.mapstruct.Named; import com.backend.metadata.kodik.api.model.KodikResponse; import com.backend.metadata.kodik.api.model.MaterialData; -import com.backend.unifier.title.model.SearchEntry; -import com.backend.unifier.title.model.SearchResponse; +import com.backend.unifier.title.model.ContentSearchEntry; +import com.backend.unifier.title.model.SearchEntries; @Mapper public interface KodikResponseMapper { - default SearchResponse toSearchResponse(KodikResponse kodikResponse) { + default SearchEntries toSearchEntries(KodikResponse kodikResponse) { if (kodikResponse == null || kodikResponse.results == null) { - return new SearchResponse(List.of()); + return new SearchEntries(List.of()); } - List entries = kodikResponse.results.stream() - .map(this::toSearchEntryDTO) + List entries = kodikResponse.results.stream() + .map(this::toContentSearchEntry) .filter(Objects::nonNull) .collect(Collectors.toList()); - return new SearchResponse(entries); + return new SearchEntries(entries); } @Mapping(target = "id", source = "result", qualifiedByName = "extractID") @@ -39,7 +39,7 @@ public interface KodikResponseMapper { @Mapping(target = "studio", source = "materialData", qualifiedByName = "extractStudio") @Mapping(target = "genres", source = "materialData", qualifiedByName = "extractGenres") @Mapping(target = "durationMin", source = "materialData", qualifiedByName = "extractDurationMin") - SearchEntry toSearchEntryDTO(KodikResponse.Result result); + ContentSearchEntry toContentSearchEntry(KodikResponse.Result result); @Named("extractPosterUrls") default List extractPosterUrls(MaterialData materialData) { diff --git a/src/main/java/com/backend/unifier/title/model/DetailEntry.java b/src/main/java/com/backend/unifier/title/model/ContentDetailEntry.java similarity index 54% rename from src/main/java/com/backend/unifier/title/model/DetailEntry.java rename to src/main/java/com/backend/unifier/title/model/ContentDetailEntry.java index 334225c..c33d971 100644 --- a/src/main/java/com/backend/unifier/title/model/DetailEntry.java +++ b/src/main/java/com/backend/unifier/title/model/ContentDetailEntry.java @@ -1,4 +1,4 @@ package com.backend.unifier.title.model; -public record DetailEntry() { +public record ContentDetailEntry() { } diff --git a/src/main/java/com/backend/unifier/title/model/SearchEntry.java b/src/main/java/com/backend/unifier/title/model/ContentSearchEntry.java similarity index 77% rename from src/main/java/com/backend/unifier/title/model/SearchEntry.java rename to src/main/java/com/backend/unifier/title/model/ContentSearchEntry.java index ec96c2f..e6389a3 100644 --- a/src/main/java/com/backend/unifier/title/model/SearchEntry.java +++ b/src/main/java/com/backend/unifier/title/model/ContentSearchEntry.java @@ -5,7 +5,7 @@ import java.util.List; import io.soabase.recordbuilder.core.RecordBuilder; @RecordBuilder -public record SearchEntry( +public record ContentSearchEntry( String id, List posterURLs, String title, @@ -15,5 +15,5 @@ public record SearchEntry( String type, String studio, List genres, - int durationMin) implements SearchEntryBuilder.With { + int durationMin) implements ContentSearchEntryBuilder.With { } diff --git a/src/main/java/com/backend/unifier/title/model/SearchResponse.java b/src/main/java/com/backend/unifier/title/model/SearchEntries.java similarity index 57% rename from src/main/java/com/backend/unifier/title/model/SearchResponse.java rename to src/main/java/com/backend/unifier/title/model/SearchEntries.java index abd4aac..786b45b 100644 --- a/src/main/java/com/backend/unifier/title/model/SearchResponse.java +++ b/src/main/java/com/backend/unifier/title/model/SearchEntries.java @@ -5,6 +5,6 @@ import java.util.List; import io.soabase.recordbuilder.core.RecordBuilder; @RecordBuilder -public record SearchResponse(List result) implements SearchResponseBuilder.With { +public record SearchEntries(List result) implements SearchEntriesBuilder.With { } diff --git a/src/main/java/com/backend/unifier/title/resource/DetailResource.java b/src/main/java/com/backend/unifier/title/resource/DetailResource.java index 32b6348..077bc4f 100644 --- a/src/main/java/com/backend/unifier/title/resource/DetailResource.java +++ b/src/main/java/com/backend/unifier/title/resource/DetailResource.java @@ -1,7 +1,8 @@ package com.backend.unifier.title.resource; -import com.backend.unifier.title.model.DetailEntry; +import com.backend.unifier.title.model.ContentDetailEntry; +import io.smallrye.openapi.internal.models.media.Content; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; @@ -9,7 +10,7 @@ import jakarta.ws.rs.Path; public class DetailResource { @GET @Path("/detail") - public DetailEntry detail(String id) { + public ContentDetailEntry detail(String id) { return null; } } diff --git a/src/main/java/com/backend/unifier/title/resource/SearchResource.java b/src/main/java/com/backend/unifier/title/resource/SearchResource.java index d85acd0..a8451dd 100644 --- a/src/main/java/com/backend/unifier/title/resource/SearchResource.java +++ b/src/main/java/com/backend/unifier/title/resource/SearchResource.java @@ -3,7 +3,7 @@ package com.backend.unifier.title.resource; import org.eclipse.microprofile.rest.client.inject.RestClient; import com.backend.unifier.title.api.KodikSearchService; -import com.backend.unifier.title.model.SearchResponse; +import com.backend.unifier.title.model.SearchEntries; import com.backend.unifier.title.service.KodikResponseConvertService; import io.smallrye.mutiny.Uni; @@ -24,7 +24,7 @@ public class SearchResource { @GET @Path("/search") - public Uni search(@QueryParam("title") String title) { + public Uni search(@QueryParam("title") String title) { return kodikSearchService.searchAsync(title) .onItem().ifNotNull() .transformToUni(response -> kodikConvertService.convertAsync(response)); @@ -32,14 +32,14 @@ public class SearchResource { @GET @Path("/search-fast") - public SearchResponse searchFast(@QueryParam("title") String title) { + public SearchEntries searchFast(@QueryParam("title") String title) { var result = kodikSearchService.search(title); return kodikConvertService.convert(result); } @GET @Path("/list") - public SearchResponse list() { + public SearchEntries list() { var result = kodikSearchService.list(); return kodikConvertService.convert(result); } diff --git a/src/main/java/com/backend/unifier/title/service/KodikResponseConvertService.java b/src/main/java/com/backend/unifier/title/service/KodikResponseConvertService.java index 44fd8bd..1ad10d4 100644 --- a/src/main/java/com/backend/unifier/title/service/KodikResponseConvertService.java +++ b/src/main/java/com/backend/unifier/title/service/KodikResponseConvertService.java @@ -6,8 +6,8 @@ import org.mapstruct.factory.Mappers; import com.backend.metadata.kodik.api.model.KodikResponse; import com.backend.unifier.title.mapper.KodikResponseMapper; -import com.backend.unifier.title.model.SearchEntry; -import com.backend.unifier.title.model.SearchResponse; +import com.backend.unifier.title.model.ContentSearchEntry; +import com.backend.unifier.title.model.SearchEntries; import io.smallrye.mutiny.Uni; import jakarta.enterprise.context.ApplicationScoped; @@ -24,40 +24,40 @@ public class KodikResponseConvertService { this.posterUrlNormalizer = posterUrlNormalizer; } - public SearchResponse convert(KodikResponse response) { + public SearchEntries convert(KodikResponse response) { return convertSimple(response); } @SuppressWarnings("unchecked") - public Uni convertAsync(KodikResponse response) { + public Uni convertAsync(KodikResponse response) { if (response == null || response.results == null) { - return Uni.createFrom().item(new SearchResponse(List.of())); + return Uni.createFrom().item(new SearchEntries(List.of())); } - List> entries = convertSimple(response).result() + List> entries = convertSimple(response).result() .stream() .map(this::resolveEntryPosters) .toList(); if (entries.isEmpty()) { - return Uni.createFrom().item(new SearchResponse(List.of())); + return Uni.createFrom().item(new SearchEntries(List.of())); } return Uni.combine().all().unis(entries) - .with(list -> new SearchResponse((List) list)); + .with(list -> new SearchEntries((List) list)); } - private Uni resolveEntryPosters(SearchEntry entry) { + private Uni resolveEntryPosters(ContentSearchEntry entry) { return posterUrlValidator.resolvePosters(entry.posterURLs()) .map(entry::withPosterURLs) .onFailure().recoverWithItem(entry); } - private SearchResponse convertSimple(KodikResponse response) { - return normalizeUrls(responseMapper.toSearchResponse(response)); + private SearchEntries convertSimple(KodikResponse response) { + return normalizeUrls(responseMapper.toSearchEntries(response)); } - private SearchResponse normalizeUrls(SearchResponse response) { + private SearchEntries normalizeUrls(SearchEntries response) { var normalizedResults = response.result().stream() .map(r -> r.withPosterURLs(r.posterURLs().stream() .map(posterUrlNormalizer::normalize)