From a041230f4c1f923c290e783b5200bb63b81e5750 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Wed, 30 Sep 2020 22:09:56 +0200 Subject: [PATCH] No longer snapshot --- build.gradle | 2 +- .../model/response/CategoryResponse.java | 8 +------- .../jensmemes/model/response/MemeResponse.java | 16 +--------------- .../jensmemes/model/response/UserResponse.java | 4 ++++ 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 24880dd..3beaf07 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group 'ley.jensmemes' -version '1.0-SNAPSHOT' +version '1.0' repositories { mavenCentral() diff --git a/src/main/java/ley/jensmemes/model/response/CategoryResponse.java b/src/main/java/ley/jensmemes/model/response/CategoryResponse.java index 4c950ba..229c5d5 100644 --- a/src/main/java/ley/jensmemes/model/response/CategoryResponse.java +++ b/src/main/java/ley/jensmemes/model/response/CategoryResponse.java @@ -23,15 +23,9 @@ public class CategoryResponse extends Response { } @Expose - public String id; - - @Expose - public String name; + public Category category; public Category toCategory() { - Category category = new Category(); - category.id = id; - category.name = name; return category; } diff --git a/src/main/java/ley/jensmemes/model/response/MemeResponse.java b/src/main/java/ley/jensmemes/model/response/MemeResponse.java index 101bc60..5d6e0e9 100644 --- a/src/main/java/ley/jensmemes/model/response/MemeResponse.java +++ b/src/main/java/ley/jensmemes/model/response/MemeResponse.java @@ -23,23 +23,9 @@ public class MemeResponse extends Response { } @Expose - public int id; - - @Expose - public String link; - - @Expose - public String category; - - @Expose - public String user; + public Meme meme; public Meme toMeme() { - Meme meme = new Meme(); - meme.id = id; - meme.link = link; - meme.category = category; - meme.user = user; return meme; } diff --git a/src/main/java/ley/jensmemes/model/response/UserResponse.java b/src/main/java/ley/jensmemes/model/response/UserResponse.java index 45c6d57..e2cfefb 100644 --- a/src/main/java/ley/jensmemes/model/response/UserResponse.java +++ b/src/main/java/ley/jensmemes/model/response/UserResponse.java @@ -25,4 +25,8 @@ public class UserResponse extends Response { @Expose public User user; + public User toUser() { + return user; + } + }