From 5812f8892c46cd48a6c2efcb8182d5eb4d51ada4 Mon Sep 17 00:00:00 2001 From: TheOtherP Date: Thu, 3 Jul 2025 18:37:39 +0200 Subject: [PATCH] Fix external API stats requests --- .../nzbhydra/api/stats/ApiHistoryRequest.java | 24 +++++++------------ .../nzbhydra/api/stats/ApiStatsRequest.java | 2 ++ .../nzbhydra/historystats/FilterModel.java | 3 +++ .../historystats/stats/HistoryRequest.java | 6 +++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/org/nzbhydra/api/stats/ApiHistoryRequest.java b/core/src/main/java/org/nzbhydra/api/stats/ApiHistoryRequest.java index 78c4070a3..dc9752e62 100644 --- a/core/src/main/java/org/nzbhydra/api/stats/ApiHistoryRequest.java +++ b/core/src/main/java/org/nzbhydra/api/stats/ApiHistoryRequest.java @@ -16,26 +16,18 @@ package org.nzbhydra.api.stats; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.nzbhydra.historystats.stats.HistoryRequest; +import org.nzbhydra.springnative.ReflectionMarker; +@AllArgsConstructor +@NoArgsConstructor +@Data +@ReflectionMarker public class ApiHistoryRequest { private String apikey; private HistoryRequest request = new HistoryRequest(); - - public String getApikey() { - return apikey; - } - - public void setApikey(String apikey) { - this.apikey = apikey; - } - - public HistoryRequest getRequest() { - return request; - } - - public void setRequest(HistoryRequest request) { - this.request = request; - } } diff --git a/core/src/main/java/org/nzbhydra/api/stats/ApiStatsRequest.java b/core/src/main/java/org/nzbhydra/api/stats/ApiStatsRequest.java index 462bdf53d..717a2a260 100644 --- a/core/src/main/java/org/nzbhydra/api/stats/ApiStatsRequest.java +++ b/core/src/main/java/org/nzbhydra/api/stats/ApiStatsRequest.java @@ -16,10 +16,12 @@ package org.nzbhydra.api.stats; +import lombok.AllArgsConstructor; import lombok.Data; import org.nzbhydra.historystats.stats.StatsRequest; import org.nzbhydra.springnative.ReflectionMarker; +@AllArgsConstructor @Data @ReflectionMarker public class ApiStatsRequest { diff --git a/shared/mapping/src/main/java/org/nzbhydra/historystats/FilterModel.java b/shared/mapping/src/main/java/org/nzbhydra/historystats/FilterModel.java index 3c89d242a..ef02cbb69 100644 --- a/shared/mapping/src/main/java/org/nzbhydra/historystats/FilterModel.java +++ b/shared/mapping/src/main/java/org/nzbhydra/historystats/FilterModel.java @@ -1,7 +1,10 @@ package org.nzbhydra.historystats; +import org.nzbhydra.springnative.ReflectionMarker; + import java.util.HashMap; +@ReflectionMarker public class FilterModel extends HashMap { } diff --git a/shared/mapping/src/main/java/org/nzbhydra/historystats/stats/HistoryRequest.java b/shared/mapping/src/main/java/org/nzbhydra/historystats/stats/HistoryRequest.java index 5331be30f..07ac0f29b 100644 --- a/shared/mapping/src/main/java/org/nzbhydra/historystats/stats/HistoryRequest.java +++ b/shared/mapping/src/main/java/org/nzbhydra/historystats/stats/HistoryRequest.java @@ -1,11 +1,15 @@ package org.nzbhydra.historystats.stats; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.nzbhydra.historystats.FilterModel; import org.nzbhydra.historystats.SortModel; import org.nzbhydra.springnative.ReflectionMarker; @Data +@AllArgsConstructor +@NoArgsConstructor @ReflectionMarker public class HistoryRequest { @@ -16,7 +20,5 @@ public class HistoryRequest { protected FilterModel filterModel = new FilterModel(); protected SortModel sortModel; - public HistoryRequest() { - } }