getUserList(String userId, String listId) throws APIResponseException, APIMapperException {
+ Result userProfileResult = sendRequest("user/" + userId + "/lists/" + listId);
+ return apiMapper.deserialize(userProfileResult, UserList.class);
+ }
+}
diff --git a/src/main/java/me/goudham/MyWaifuClient.java b/src/main/java/me/goudham/MyWaifuClient.java
new file mode 100644
index 0000000..67bc5cb
--- /dev/null
+++ b/src/main/java/me/goudham/MyWaifuClient.java
@@ -0,0 +1,214 @@
+package me.goudham;
+
+import me.goudham.domain.pagination.PaginationData;
+import me.goudham.domain.series.FilteredSeries;
+import me.goudham.domain.series.Series;
+import me.goudham.domain.user.User;
+import me.goudham.domain.user.UserList;
+import me.goudham.domain.waifu.FilteredWaifu;
+import me.goudham.domain.waifu.Waifu;
+import me.goudham.domain.waifu.WaifuImage;
+import me.goudham.exception.APIMapperException;
+import me.goudham.exception.APIResponseException;
+import me.goudham.util.Season;
+import org.jetbrains.annotations.NotNull;
+
+import javax.net.ssl.SSLParameters;
+import java.net.Authenticator;
+import java.net.CookieHandler;
+import java.net.ProxySelector;
+import java.net.http.HttpClient;
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+/**
+ * A MyWaifuClient, the underlying client used for making requests is {@link HttpClient}
+ *
+ *
+ * Main entry point for retrieving information from MyWaifuList.
+ * {@link APIWrapper} is utilised to make the API requests
+ */
+public class MyWaifuClient {
+ private final APIWrapper APIWrapper;
+
+ /**
+ * Creates an instance of {@link MyWaifuClient}
+ *
+ * See MyWaifuList for obtaining an API Key
+ * @param apiKey API Key to authorise API request
+ * @param httpClient The underlying {@link HttpClient} to use for HttpRequests
+ *
+ */
+ MyWaifuClient(@NotNull String apiKey, @NotNull HttpClient httpClient) {
+ APIWrapper = new APIWrapper(apiKey, httpClient);
+ }
+
+ /**
+ * Creates an instance of {@link MyWaifuClient} with default {@link HttpClient} settings
+ *
+ * @param apiKey API Key to authorise API request
+ * @return {@link MyWaifuClient}
+ */
+ public static MyWaifuClient createDefault(@NotNull String apiKey) {
+ HttpClient httpClient = HttpClient.newBuilder()
+ .version(HttpClient.Version.HTTP_2)
+ .followRedirects(HttpClient.Redirect.NORMAL)
+ .connectTimeout(Duration.ofSeconds(20))
+ .build();
+
+ return new MyWaifuClient(apiKey, httpClient);
+ }
+
+ /**
+ * Retrieves information about the {@link Waifu} specified by the given slug
+ *
+ * @param slug The slug of the {@link Waifu}
+ * @return {@link Response}
+ * @throws APIResponseException If {@link APIWrapper} could not return information properly
+ * @throws APIMapperException If {@link APIMapper} could not correctly {@code deserialize} model
+ *
+ */
+ public Response getWaifu(@NotNull String slug) throws APIResponseException, APIMapperException {
+ return APIWrapper.getWaifu(slug);
+ }
+
+ /**
+ * Retrieves information about the {@link Waifu} specified by the given id
+ *
+ * @param id The id of the {@link Waifu}
+ * @return {@link Response}
+ * @throws APIResponseException If {@link APIWrapper} could not return information properly
+ * @throws APIMapperException If {@link APIMapper} could not correctly {@code deserialize} model
+ *
+ */
+ public Response getWaifu(@NotNull Integer id) throws APIResponseException, APIMapperException {
+ return APIWrapper.getWaifu(String.valueOf(id));
+ }
+
+ public Response> getWaifuImages(@NotNull Integer id, @NotNull Integer pageNum) throws APIResponseException, APIMapperException {
+ return APIWrapper.getWaifuImages(String.valueOf(id), String.valueOf(pageNum));
+ }
+
+ public Response getDailyWaifu() throws APIResponseException, APIMapperException {
+ return APIWrapper.getDailyWaifu();
+ }
+
+ public Response getRandomWaifu() throws APIResponseException, APIMapperException {
+ return APIWrapper.getRandomWaifu();
+ }
+
+ public Response> getSeasonalAnime() throws APIMapperException, APIResponseException {
+ return APIWrapper.getSeasonalAnime();
+ }
+
+ public Response> getBestWaifus() throws APIMapperException, APIResponseException {
+ return APIWrapper.getBestWaifus();
+ }
+
+ public Response> getPopularWaifus() throws APIMapperException, APIResponseException {
+ return APIWrapper.getPopularWaifus();
+ }
+
+ public Response> getTrashWaifus() throws APIMapperException, APIResponseException {
+ return APIWrapper.getTrashWaifus();
+ }
+
+ public Response getSeries(@NotNull String slug) throws APIMapperException, APIResponseException {
+ return APIWrapper.getSeries(slug);
+ }
+
+ public Response getSeries(@NotNull Integer id) throws APIMapperException, APIResponseException {
+ return APIWrapper.getSeries(String.valueOf(id));
+ }
+
+ public Response> getSeriesByPage(@NotNull Integer pageNum) throws APIMapperException, APIResponseException {
+ return APIWrapper.getSeriesByPage(String.valueOf(pageNum));
+ }
+
+ public Response> getAllSeries(@NotNull Season season, @NotNull Integer year) throws APIResponseException, APIMapperException {
+ return APIWrapper.getAllSeries(season, year);
+ }
+
+ public Response> getSeriesWaifus(@NotNull String slug) throws APIMapperException, APIResponseException {
+ return APIWrapper.getSeriesWaifus(slug);
+ }
+
+ public Response> getSeriesWaifus(@NotNull Integer id) throws APIMapperException, APIResponseException {
+ return APIWrapper.getSeriesWaifus(String.valueOf(id));
+ }
+
+ public Response getUserProfile(@NotNull Integer id) throws APIMapperException, APIResponseException {
+ return APIWrapper.getUserProfile(String.valueOf(id));
+ }
+
+ public Response> getUserLists(@NotNull Integer id) throws APIMapperException, APIResponseException {
+ return APIWrapper.getUserLists(String.valueOf(id));
+ }
+
+ public Response getUserList(@NotNull Integer userId, @NotNull Integer listId) throws APIMapperException, APIResponseException {
+ return APIWrapper.getUserList(String.valueOf(userId), String.valueOf(listId));
+ }
+
+ /**
+ * Builder for {@link MyWaifuClient}
+ *
+ */
+ public static class Builder {
+ private final String apiKey;
+ private final HttpClient.Builder httpClientBuilder = HttpClient.newBuilder();
+
+ public Builder(@NotNull String apiKey) {
+ this.apiKey = apiKey;
+ }
+
+ public Builder withCookieHandler(CookieHandler cookieHandler) {
+ httpClientBuilder.cookieHandler(cookieHandler);
+ return this;
+ }
+
+ public Builder withConnectTimeout(@NotNull Duration duration) {
+ httpClientBuilder.connectTimeout(duration);
+ return this;
+ }
+
+ public Builder withSslParameters(@NotNull SSLParameters sslParameters) {
+ httpClientBuilder.sslParameters(sslParameters);
+ return this;
+ }
+
+ public Builder withExecutor(@NotNull Executor executor) {
+ httpClientBuilder.executor(executor);
+ return this;
+ }
+
+ public Builder withFollowRedirects(@NotNull HttpClient.Redirect policy) {
+ httpClientBuilder.followRedirects(policy);
+ return this;
+ }
+
+ public Builder withVersion(@NotNull HttpClient.Version version) {
+ httpClientBuilder.version(version);
+ return this;
+ }
+
+ public Builder withPriority(int priority) {
+ httpClientBuilder.priority(priority);
+ return this;
+ }
+
+ public Builder withProxy(@NotNull ProxySelector proxySelector) {
+ httpClientBuilder.proxy(proxySelector);
+ return this;
+ }
+
+ public Builder withAuthenticator(@NotNull Authenticator authenticator) {
+ httpClientBuilder.authenticator(authenticator);
+ return this;
+ }
+
+ public MyWaifuClient build() {
+ return new MyWaifuClient(apiKey, httpClientBuilder.build());
+ }
+ }
+}
diff --git a/src/main/java/me/goudham/Response.java b/src/main/java/me/goudham/Response.java
new file mode 100644
index 0000000..0d228fa
--- /dev/null
+++ b/src/main/java/me/goudham/Response.java
@@ -0,0 +1,41 @@
+package me.goudham;
+
+import me.goudham.domain.series.Series;
+import me.goudham.domain.waifu.Waifu;
+
+/**
+ * This is returned to the User when called by methods in {@link MyWaifuClient}.
+ * E.g {@link MyWaifuClient#getWaifu(Integer)}
+ *
+ * Given a successful response, {@link #model} will be populated with the requested model.
+ *
+ * No matter successful or unsuccessful response, {@link #statusCode} and {@link #body}
+ * will be populated to ensure the user has all the information for debugging or extra information within
+ * the {@link #body}
+ *
+ * @param The type of model to be returned. E.g {@link Waifu} or {@link Series}
+ *
+ */
+public class Response {
+ private final T model;
+ private final Integer statusCode;
+ private final String body;
+
+ Response(Integer statusCode, String body, T model) {
+ this.statusCode = statusCode;
+ this.body = body;
+ this.model = model;
+ }
+
+ public T getModel() {
+ return model;
+ }
+
+ public Integer getStatusCode() {
+ return statusCode;
+ }
+
+ public String getBody() {
+ return body;
+ }
+}
diff --git a/src/main/java/org/goudham/me/Result.java b/src/main/java/me/goudham/Result.java
similarity index 65%
rename from src/main/java/org/goudham/me/Result.java
rename to src/main/java/me/goudham/Result.java
index 483e752..387ce84 100644
--- a/src/main/java/org/goudham/me/Result.java
+++ b/src/main/java/me/goudham/Result.java
@@ -1,5 +1,11 @@
-package org.goudham.me;
+package me.goudham;
+import java.net.http.HttpRequest;
+
+/**
+ * Represents a Result from a {@link HttpRequest} with the resulting
+ * {@code statusCode} and {@code body}
+ */
class Result {
private final Integer statusCode;
private final String body;
diff --git a/src/main/java/org/goudham/me/api/entity/Studio.java b/src/main/java/me/goudham/domain/Studio.java
similarity index 89%
rename from src/main/java/org/goudham/me/api/entity/Studio.java
rename to src/main/java/me/goudham/domain/Studio.java
index 7234096..2dab95c 100644
--- a/src/main/java/org/goudham/me/api/entity/Studio.java
+++ b/src/main/java/me/goudham/domain/Studio.java
@@ -1,8 +1,9 @@
-package org.goudham.me.api.entity;
+package me.goudham.domain;
-import javax.annotation.processing.Generated;
-
-import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import java.util.Objects;
@@ -24,7 +25,6 @@ import java.util.Objects;
"name",
"original_name"
})
-@Generated("jsonschema2pojo")
public class Studio {
Studio() { }
diff --git a/src/main/java/me/goudham/domain/pagination/Links.java b/src/main/java/me/goudham/domain/pagination/Links.java
new file mode 100644
index 0000000..5494764
--- /dev/null
+++ b/src/main/java/me/goudham/domain/pagination/Links.java
@@ -0,0 +1,125 @@
+package me.goudham.domain.pagination;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.Objects;
+
+/**
+ * {@link Links}
+ * Contains gallery API links for {@link Meta}
+ *
+ * Fields included are:
+ *
+ * - {@link String first}
+ * - {@link String last}
+ * - {@link String next}
+ * - {@link String prev}
+ *
+ *
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "first",
+ "last",
+ "next",
+ "prev"
+})
+public class Links {
+ /**
+ * First page of the gallery
+ *
+ */
+ @JsonProperty("first")
+ @JsonPropertyDescription("First page of the gallery")
+ private String first;
+
+ /**
+ * Last page of the gallery
+ *
+ */
+ @JsonProperty("last")
+ @JsonPropertyDescription("Last page of the gallery")
+ private String last;
+
+ /**
+ * Next page of the gallery
+ *
+ */
+ @JsonProperty("next")
+ @JsonPropertyDescription("Next page of the gallery")
+ private String next;
+
+ /**
+ * Previous page of the gallery
+ *
+ */
+ @JsonProperty("prev")
+ @JsonPropertyDescription("Previous page of the gallery")
+ private String prev;
+
+ @JsonProperty("first")
+ public String getFirst() {
+ return first;
+ }
+
+ @JsonProperty("first")
+ public void setFirst(String first) {
+ this.first = first;
+ }
+
+ @JsonProperty("last")
+ public String getLast() {
+ return last;
+ }
+
+ @JsonProperty("last")
+ public void setLast(String last) {
+ this.last = last;
+ }
+
+ @JsonProperty("next")
+ public String getNext() {
+ return next;
+ }
+
+ @JsonProperty("next")
+ public void setNext(String next) {
+ this.next = next;
+ }
+
+ @JsonProperty("prev")
+ public String getPrev() {
+ return prev;
+ }
+
+ @JsonProperty("prev")
+ public void setPrev(String prev) {
+ this.prev = prev;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ Links links = (Links) o;
+ return Objects.equals(first, links.first) && Objects.equals(last, links.last) && Objects.equals(next, links.next) && Objects.equals(prev, links.prev);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(first, last, next, prev);
+ }
+
+ @Override
+ public String toString() {
+ return "Links{" +
+ "first='" + first + '\'' +
+ ", last='" + last + '\'' +
+ ", next='" + next + '\'' +
+ ", prev='" + prev + '\'' +
+ '}';
+ }
+}
diff --git a/src/main/java/me/goudham/domain/pagination/Meta.java b/src/main/java/me/goudham/domain/pagination/Meta.java
new file mode 100644
index 0000000..41479b2
--- /dev/null
+++ b/src/main/java/me/goudham/domain/pagination/Meta.java
@@ -0,0 +1,177 @@
+package me.goudham.domain.pagination;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.Objects;
+
+
+/**
+ * {@link Meta}
+ * Contains standard Pagination data from the API
+ *
+ * Fields included are:
+ *
+ * - {@link Integer currentPage}
+ * - {@link Integer from}
+ * - {@link Integer lastPage}
+ * - {@link String path}
+ * - {@link Integer perPage}
+ * - {@link Integer to}
+ * - {@link Integer total}
+ *
+ *
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "current_page",
+ "from",
+ "last_page",
+ "path",
+ "per_page",
+ "to",
+ "total"
+})
+public class Meta {
+ /**
+ * Current requested page
+ *
+ */
+ @JsonProperty("current_page")
+ @JsonPropertyDescription("Current requested page")
+ private Integer currentPage;
+
+ /**
+ * Starting gallery image number
+ *
+ */
+ @JsonProperty("from")
+ @JsonPropertyDescription("Starting gallery image number")
+ private Integer from;
+
+ /**
+ * Last available page
+ *
+ */
+ @JsonProperty("last_page")
+ @JsonPropertyDescription("Last available page")
+ private Integer lastPage;
+
+ /**
+ * API url for gallery
+ *
+ */
+ @JsonProperty("path")
+ @JsonPropertyDescription("API url for gallery")
+ private String path;
+
+ /**
+ * Total number of items per page
+ *
+ */
+ @JsonProperty("per_page")
+ @JsonPropertyDescription("Total number of items per page")
+ private Integer perPage;
+
+ /**
+ * Last gallery image number
+ *
+ */
+ @JsonProperty("to")
+ @JsonPropertyDescription("Last gallery image number")
+ private Integer to;
+
+ /**
+ * Total number of items within the gallery
+ *
+ */
+ @JsonProperty("total")
+ @JsonPropertyDescription("Total number of items")
+ private Integer total;
+
+ @JsonProperty("current_page")
+ public Integer getCurrentPage() {
+ return currentPage;
+ }
+
+ @JsonProperty("current_page")
+ public void setCurrentPage(Integer currentPage) {
+ this.currentPage = currentPage;
+ }
+
+ @JsonProperty("from")
+ public Integer getFrom() { return from; }
+
+ @JsonProperty("from")
+ public void setFrom(Integer from) { this.from = from; }
+
+ @JsonProperty("last_page")
+ public Integer getLastPage() {
+ return lastPage;
+ }
+
+ @JsonProperty("last_page")
+ public void setLastPage(Integer lastPage) {
+ this.lastPage = lastPage;
+ }
+
+ @JsonProperty("path")
+ public String getPath() { return path; }
+
+ @JsonProperty("path")
+ public void setPath(String path) { this.path = path; }
+
+ @JsonProperty("per_page")
+ public Integer getPerPage() {
+ return perPage;
+ }
+
+ @JsonProperty("per_page")
+ public void setPerPage(Integer perPage) {
+ this.perPage = perPage;
+ }
+
+ @JsonProperty("to")
+ public Integer getTo() { return to; }
+
+ @JsonProperty("to")
+ public void setTo(Integer to) { this.to = to; }
+
+ @JsonProperty("total")
+ public Integer getTotal() {
+ return total;
+ }
+
+ @JsonProperty("total")
+ public void setTotal(Integer total) {
+ this.total = total;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ Meta meta = (Meta) o;
+ return Objects.equals(currentPage, meta.currentPage) && Objects.equals(from, meta.from) && Objects.equals(lastPage, meta.lastPage) && Objects.equals(path, meta.path) && Objects.equals(perPage, meta.perPage) && Objects.equals(to, meta.to) && Objects.equals(total, meta.total);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(currentPage, from, lastPage, path, perPage, to, total);
+ }
+
+ @Override
+ public String toString() {
+ return "Meta{" +
+ "currentPage=" + currentPage +
+ ", from=" + from +
+ ", lastPage=" + lastPage +
+ ", path=" + path +
+ ", perPage=" + perPage +
+ ", to=" + to +
+ ", total=" + total +
+ '}';
+ }
+}
diff --git a/src/main/java/me/goudham/domain/pagination/PaginationData.java b/src/main/java/me/goudham/domain/pagination/PaginationData.java
new file mode 100644
index 0000000..2437e4e
--- /dev/null
+++ b/src/main/java/me/goudham/domain/pagination/PaginationData.java
@@ -0,0 +1,84 @@
+package me.goudham.domain.pagination;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.List;
+
+/**
+ * {@link PaginationData}
+ * Contains standard Pagination data from the API including images
+ *
+ * Fields included are:
+ *
+ * - {@link Object data}
+ * - {@link Links links}
+ * - {@link Meta meta}
+ *
+ *
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "data",
+ "links",
+ "meta"
+})
+public class PaginationData {
+
+ /**
+ * Data returned from the gallery
+ *
+ */
+ @JsonProperty("data")
+ @JsonPropertyDescription("Data returned from the gallery")
+ private List data;
+
+ /**
+ * {@link Links} to other data within the gallery
+ *
+ */
+ @JsonProperty("links")
+ @JsonPropertyDescription("Links to other data within the gallery")
+ private Links links;
+
+ /**
+ * Extra pagination information
+ *
+ */
+ @JsonProperty("meta")
+ @JsonPropertyDescription("Extra pagination information")
+ private Meta meta;
+
+ @JsonProperty("data")
+ public List getData() {
+ return data;
+ }
+
+ @JsonProperty("data")
+ public void setData(List data) {
+ this.data = data;
+ }
+
+ @JsonProperty("links")
+ public Links getLinks() {
+ return links;
+ }
+
+ @JsonProperty("links")
+ public void setLinks(Links links) {
+ this.links = links;
+ }
+
+ @JsonProperty("meta")
+ public Meta getMeta() {
+ return meta;
+ }
+
+ @JsonProperty("meta")
+ public void setMeta(Meta meta) {
+ this.meta = meta;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/goudham/me/api/entity/series/FilteredSeries.java b/src/main/java/me/goudham/domain/series/FilteredSeries.java
similarity index 89%
rename from src/main/java/org/goudham/me/api/entity/series/FilteredSeries.java
rename to src/main/java/me/goudham/domain/series/FilteredSeries.java
index 27b94b5..59feee3 100644
--- a/src/main/java/org/goudham/me/api/entity/series/FilteredSeries.java
+++ b/src/main/java/me/goudham/domain/series/FilteredSeries.java
@@ -1,6 +1,4 @@
-package org.goudham.me.api.entity.series;
-
-import javax.annotation.processing.Generated;
+package me.goudham.domain.series;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -41,7 +39,6 @@ import java.util.Objects;
"url",
"id"
})
-@Generated("jsonschema2pojo")
public class FilteredSeries {
/**
* Full name, in English.
@@ -218,12 +215,12 @@ public class FilteredSeries {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FilteredSeries that = (FilteredSeries) o;
- return Objects.equals(name, that.name) && Objects.equals(originalName, that.originalName) && Objects.equals(romajiName, that.romajiName) && Objects.equals(slug, that.slug) && Objects.equals(description, that.description) && Objects.equals(url, that.url) && Objects.equals(id, that.id);
+ return Objects.equals(name, that.name) && Objects.equals(originalName, that.originalName) && Objects.equals(relevance, that.relevance) && Objects.equals(romajiName, that.romajiName) && Objects.equals(slug, that.slug) && Objects.equals(type, that.type) && Objects.equals(description, that.description) && Objects.equals(displayPicture, that.displayPicture) && Objects.equals(url, that.url) && Objects.equals(id, that.id);
}
@Override
public int hashCode() {
- return Objects.hash(name, originalName, romajiName, slug, description, url, id);
+ return Objects.hash(name, originalName, relevance, romajiName, slug, type, description, displayPicture, url, id);
}
@Override
@@ -231,9 +228,12 @@ public class FilteredSeries {
return "FilteredSeries{" +
"name='" + name + '\'' +
", originalName='" + originalName + '\'' +
+ ", relevance=" + relevance +
", romajiName='" + romajiName + '\'' +
", slug='" + slug + '\'' +
+ ", type='" + type + '\'' +
", description='" + description + '\'' +
+ ", displayPicture='" + displayPicture + '\'' +
", url='" + url + '\'' +
", id=" + id +
'}';
diff --git a/src/main/java/org/goudham/me/api/entity/series/Series.java b/src/main/java/me/goudham/domain/series/Series.java
similarity index 95%
rename from src/main/java/org/goudham/me/api/entity/series/Series.java
rename to src/main/java/me/goudham/domain/series/Series.java
index ef86aed..6b8c9b1 100644
--- a/src/main/java/org/goudham/me/api/entity/series/Series.java
+++ b/src/main/java/me/goudham/domain/series/Series.java
@@ -1,10 +1,8 @@
-package org.goudham.me.api.entity.series;
-
-import javax.annotation.processing.Generated;
+package me.goudham.domain.series;
import com.fasterxml.jackson.annotation.*;
-import org.goudham.me.api.entity.Studio;
-import org.goudham.me.api.entity.waifu.Waifu;
+import me.goudham.domain.Studio;
+import me.goudham.domain.waifu.Waifu;
import java.util.Objects;
@@ -26,7 +24,7 @@ import java.util.Objects;
* {@link String displayPicture}
* {@link String url}
* {@link Studio}
- * {@link String} type
+ * {@link String type}
* {@link Integer id}
*
*
@@ -48,7 +46,7 @@ import java.util.Objects;
"type",
"id"
})
-@Generated("jsonschema2pojo")
+@JsonIgnoreProperties(ignoreUnknown = true)
public class Series {
/**
* Full Name (in English)
@@ -302,12 +300,12 @@ public class Series {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Series series = (Series) o;
- return Objects.equals(name, series.name) && Objects.equals(originalName, series.originalName) && Objects.equals(romajiName, series.romajiName) && Objects.equals(description, series.description) && Objects.equals(slug, series.slug) && Objects.equals(releaseDate, series.releaseDate) && Objects.equals(airingStart, series.airingStart) && Objects.equals(airingEnd, series.airingEnd) && Objects.equals(episodeCount, series.episodeCount) && Objects.equals(displayPicture, series.displayPicture) && Objects.equals(url, series.url) && Objects.equals(studio, series.studio) && Objects.equals(id, series.id);
+ return Objects.equals(name, series.name) && Objects.equals(originalName, series.originalName) && Objects.equals(romajiName, series.romajiName) && Objects.equals(description, series.description) && Objects.equals(slug, series.slug) && Objects.equals(releaseDate, series.releaseDate) && Objects.equals(airingStart, series.airingStart) && Objects.equals(airingEnd, series.airingEnd) && Objects.equals(episodeCount, series.episodeCount) && Objects.equals(displayPicture, series.displayPicture) && Objects.equals(url, series.url) && Objects.equals(studio, series.studio) && Objects.equals(type, series.type) && Objects.equals(id, series.id);
}
@Override
public int hashCode() {
- return Objects.hash(name, originalName, romajiName, description, slug, releaseDate, airingStart, airingEnd, episodeCount, displayPicture, url, studio, id);
+ return Objects.hash(name, originalName, romajiName, description, slug, releaseDate, airingStart, airingEnd, episodeCount, displayPicture, url, studio, type, id);
}
@Override
@@ -322,9 +320,10 @@ public class Series {
", airingStart='" + airingStart + '\'' +
", airingEnd='" + airingEnd + '\'' +
", episodeCount=" + episodeCount +
- ", image='" + displayPicture + '\'' +
+ ", displayPicture='" + displayPicture + '\'' +
", url='" + url + '\'' +
", studio=" + studio +
+ ", type='" + type + '\'' +
", id=" + id +
'}';
}
diff --git a/src/main/java/org/goudham/me/api/entity/user/Creator.java b/src/main/java/me/goudham/domain/user/Creator.java
similarity index 87%
rename from src/main/java/org/goudham/me/api/entity/user/Creator.java
rename to src/main/java/me/goudham/domain/user/Creator.java
index 5b42b91..477107c 100644
--- a/src/main/java/org/goudham/me/api/entity/user/Creator.java
+++ b/src/main/java/me/goudham/domain/user/Creator.java
@@ -1,13 +1,10 @@
-package org.goudham.me.api.entity.user;
-
-import javax.annotation.processing.Generated;
-
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import org.goudham.me.api.entity.waifu.Waifu;
+package me.goudham.domain.user;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import me.goudham.domain.waifu.Waifu;
import java.util.Objects;
@@ -27,7 +24,6 @@ import java.util.Objects;
"id",
"name"
})
-@Generated("jsonschema2pojo")
public class Creator {
/**
@@ -35,14 +31,14 @@ public class Creator {
*
*/
@JsonProperty("id")
- @JsonPropertyDescription("")
+ @JsonPropertyDescription("Creator ID")
private Integer id;
/**
* {@link Creator} Name
*/
@JsonProperty("name")
- @JsonPropertyDescription("")
+ @JsonPropertyDescription("Creator Name")
private String name;
@JsonProperty("id")
diff --git a/src/main/java/org/goudham/me/api/entity/user/TrueLove.java b/src/main/java/me/goudham/domain/user/TrueLove.java
similarity index 93%
rename from src/main/java/org/goudham/me/api/entity/user/TrueLove.java
rename to src/main/java/me/goudham/domain/user/TrueLove.java
index 3606c89..0c7c1f4 100644
--- a/src/main/java/org/goudham/me/api/entity/user/TrueLove.java
+++ b/src/main/java/me/goudham/domain/user/TrueLove.java
@@ -1,13 +1,12 @@
-package org.goudham.me.api.entity.user;
+package me.goudham.domain.user;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyDescription;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.goudham.me.api.entity.series.Series;
+import me.goudham.domain.series.Series;
-import javax.annotation.processing.Generated;
import java.util.Objects;
/**
@@ -28,7 +27,6 @@ import java.util.Objects;
"slug",
"series"
})
-@Generated("jsonschema2pojo")
public class TrueLove {
/**
* Name of {@link TrueLove}
diff --git a/src/main/java/org/goudham/me/api/entity/user/User.java b/src/main/java/me/goudham/domain/user/User.java
similarity index 78%
rename from src/main/java/org/goudham/me/api/entity/user/User.java
rename to src/main/java/me/goudham/domain/user/User.java
index 71fad46..fcc50ea 100644
--- a/src/main/java/org/goudham/me/api/entity/user/User.java
+++ b/src/main/java/me/goudham/domain/user/User.java
@@ -1,12 +1,7 @@
-package org.goudham.me.api.entity.user;
+package me.goudham.domain.user;
-import javax.annotation.processing.Generated;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.goudham.me.api.entity.waifu.Waifu;
+import com.fasterxml.jackson.annotation.*;
+import me.goudham.domain.waifu.Waifu;
import java.util.Objects;
@@ -17,6 +12,7 @@ import java.util.Objects;
*
* Fields included are:
*
+ * - {@link String avatar}
* - {@link Integer id}
* - {@link String name}
* - {@link String twitter}
@@ -30,6 +26,7 @@ import java.util.Objects;
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
+ "avatar",
"id",
"name",
"twitter",
@@ -39,13 +36,20 @@ import java.util.Objects;
"waifus_trashed",
"true_love"
})
-@Generated("jsonschema2pojo")
+@JsonIgnoreProperties(ignoreUnknown = true)
public class User {
+ /**
+ * {@link User} Avatar
+ */
+ @JsonProperty("avatar")
+ @JsonPropertyDescription("User Avatar")
+ private String avatar;
/**
* {@link User} ID
*/
@JsonProperty("id")
+ @JsonPropertyDescription("User ID")
private Integer id;
/**
@@ -97,11 +101,19 @@ public class User {
private Integer waifusTrashed;
/**
- * User's {@link TrueLove}
+ * {@link User}'s {@link TrueLove}
+ *
*/
@JsonProperty("true_love")
+ @JsonPropertyDescription("User's True Love")
private TrueLove trueLove;
+ @JsonProperty("avatar")
+ public String getAvatar() { return avatar; }
+
+ @JsonProperty("avatar")
+ public void setAvatar(String avatar) { this.avatar = avatar; }
+
@JsonProperty("id")
public Integer getId() {
return id;
@@ -187,18 +199,19 @@ public class User {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
User user = (User) o;
- return Objects.equals(id, user.id) && Objects.equals(name, user.name) && Objects.equals(twitter, user.twitter) && Objects.equals(joined, user.joined) && Objects.equals(waifusCreated, user.waifusCreated) && Objects.equals(waifusLiked, user.waifusLiked) && Objects.equals(waifusTrashed, user.waifusTrashed) && Objects.equals(trueLove, user.trueLove);
+ return Objects.equals(avatar, user.avatar) && Objects.equals(id, user.id) && Objects.equals(name, user.name) && Objects.equals(twitter, user.twitter) && Objects.equals(joined, user.joined) && Objects.equals(waifusCreated, user.waifusCreated) && Objects.equals(waifusLiked, user.waifusLiked) && Objects.equals(waifusTrashed, user.waifusTrashed) && Objects.equals(trueLove, user.trueLove);
}
@Override
public int hashCode() {
- return Objects.hash(id, name, twitter, joined, waifusCreated, waifusLiked, waifusTrashed, trueLove);
+ return Objects.hash(avatar, id, name, twitter, joined, waifusCreated, waifusLiked, waifusTrashed, trueLove);
}
@Override
public String toString() {
return "User{" +
- "id=" + id +
+ "avatar='" + avatar + '\'' +
+ ", id=" + id +
", name='" + name + '\'' +
", twitter='" + twitter + '\'' +
", joined='" + joined + '\'' +
diff --git a/src/main/java/org/goudham/me/api/entity/user/UserList.java b/src/main/java/me/goudham/domain/user/UserList.java
similarity index 84%
rename from src/main/java/org/goudham/me/api/entity/user/UserList.java
rename to src/main/java/me/goudham/domain/user/UserList.java
index a962aaf..0764307 100644
--- a/src/main/java/org/goudham/me/api/entity/user/UserList.java
+++ b/src/main/java/me/goudham/domain/user/UserList.java
@@ -1,24 +1,20 @@
-package org.goudham.me.api.entity.user;
+package me.goudham.domain.user;
+
+import com.fasterxml.jackson.annotation.*;
+import me.goudham.domain.waifu.Waifu;
import java.util.List;
import java.util.Objects;
-import javax.annotation.processing.Generated;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.goudham.me.api.entity.waifu.Waifu;
/**
* {@link UserList}
- * Get an array of all user lists on their profile
+ * Get an array of all Waifu lists on their profile
*
* Fields included are:
*
* - {@link Integer id}
* - {@link String name}
- * - {@link String order}
+ * - {@link Integer order}
* - {@link List} of {@link Waifu}'s
*
*
@@ -30,7 +26,7 @@ import org.goudham.me.api.entity.waifu.Waifu;
"order",
"waifus"
})
-@Generated("jsonschema2pojo")
+@JsonIgnoreProperties(ignoreUnknown = true)
public class UserList {
/**
* {@link UserList} ID
diff --git a/src/main/java/org/goudham/me/api/entity/waifu/FilteredWaifu.java b/src/main/java/me/goudham/domain/waifu/FilteredWaifu.java
similarity index 83%
rename from src/main/java/org/goudham/me/api/entity/waifu/FilteredWaifu.java
rename to src/main/java/me/goudham/domain/waifu/FilteredWaifu.java
index 5f65923..9cce0fb 100644
--- a/src/main/java/org/goudham/me/api/entity/waifu/FilteredWaifu.java
+++ b/src/main/java/me/goudham/domain/waifu/FilteredWaifu.java
@@ -1,15 +1,10 @@
-package org.goudham.me.api.entity.waifu;
+package me.goudham.domain.waifu;
-import org.goudham.me.api.entity.series.FilteredSeries;
+import com.fasterxml.jackson.annotation.*;
+import me.goudham.domain.series.FilteredSeries;
import java.util.List;
import java.util.Objects;
-import javax.annotation.processing.Generated;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
/**
@@ -22,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
* - {@link String name}
* - {@link String originalName}
* - {@link Integer relevance}
+ * - {@link String romaji}
* - {@link String romajiName}
* - {@link String displayPicture}
* - {@link Integer likes}
@@ -39,6 +35,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
"name",
"original_name",
"relevance",
+ "romaji",
"romaji_name",
"display_picture",
"description",
@@ -49,7 +46,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
"appearances",
"id"
})
-@Generated("jsonschema2pojo")
+@JsonIgnoreProperties(ignoreUnknown = true)
public class FilteredWaifu {
/**
* Used to generate readable URL's for the {@link FilteredWaifu}
@@ -82,6 +79,14 @@ public class FilteredWaifu {
@JsonPropertyDescription("Relevancy of FilteredWaifu")
private Integer relevance;
+ /**
+ * If this character has a romaji name, we'll put it here.
+ *
+ */
+ @JsonProperty("romaji")
+ @JsonPropertyDescription("if this character has a romaji name, we'll put it here. ")
+ private String romaji;
+
/**
* If this character has a romaji name, we'll put it here.
*
@@ -186,6 +191,12 @@ public class FilteredWaifu {
@JsonProperty("relevance")
public void setRelevance(Integer relevance) { this.relevance = relevance; }
+ @JsonProperty("romaji")
+ public String getRomaji() { return romaji; }
+
+ @JsonProperty("romaji")
+ public void setRomaji(String romaji) { this.romaji = romaji; }
+
@JsonProperty("romaji_name")
public String getRomajiName() {
return romajiName;
@@ -275,12 +286,12 @@ public class FilteredWaifu {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
FilteredWaifu that = (FilteredWaifu) o;
- return Objects.equals(slug, that.slug) && Objects.equals(name, that.name) && Objects.equals(originalName, that.originalName) && Objects.equals(romajiName, that.romajiName) && Objects.equals(displayPicture, that.displayPicture) && Objects.equals(description, that.description) && Objects.equals(likes, that.likes) && Objects.equals(trash, that.trash) && Objects.equals(url, that.url) && Objects.equals(appearances, that.appearances) && Objects.equals(id, that.id);
+ return Objects.equals(slug, that.slug) && Objects.equals(name, that.name) && Objects.equals(originalName, that.originalName) && Objects.equals(relevance, that.relevance) && Objects.equals(romaji, that.romaji) && Objects.equals(romajiName, that.romajiName) && Objects.equals(displayPicture, that.displayPicture) && Objects.equals(description, that.description) && Objects.equals(likes, that.likes) && Objects.equals(trash, that.trash) && Objects.equals(type, that.type) && Objects.equals(url, that.url) && Objects.equals(appearances, that.appearances) && Objects.equals(id, that.id);
}
@Override
public int hashCode() {
- return Objects.hash(slug, name, originalName, romajiName, displayPicture, description, likes, trash, url, appearances, id);
+ return Objects.hash(slug, name, originalName, relevance, romaji, romajiName, displayPicture, description, likes, trash, type, url, appearances, id);
}
@Override
@@ -289,11 +300,14 @@ public class FilteredWaifu {
"slug='" + slug + '\'' +
", name='" + name + '\'' +
", originalName='" + originalName + '\'' +
+ ", relevance=" + relevance +
+ ", romaji='" + romaji + '\'' +
", romajiName='" + romajiName + '\'' +
", displayPicture='" + displayPicture + '\'' +
", description='" + description + '\'' +
", likes=" + likes +
", trash=" + trash +
+ ", type='" + type + '\'' +
", url='" + url + '\'' +
", appearances=" + appearances +
", id=" + id +
diff --git a/src/main/java/org/goudham/me/api/entity/waifu/Waifu.java b/src/main/java/me/goudham/domain/waifu/Waifu.java
similarity index 91%
rename from src/main/java/org/goudham/me/api/entity/waifu/Waifu.java
rename to src/main/java/me/goudham/domain/waifu/Waifu.java
index e80b849..12711a4 100644
--- a/src/main/java/org/goudham/me/api/entity/waifu/Waifu.java
+++ b/src/main/java/me/goudham/domain/waifu/Waifu.java
@@ -1,14 +1,14 @@
-package org.goudham.me.api.entity.waifu;
+package me.goudham.domain.waifu;
+import com.fasterxml.jackson.annotation.*;
+import me.goudham.domain.series.Series;
+import me.goudham.domain.user.Creator;
+
+import javax.annotation.processing.Generated;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.processing.Generated;
-
-import com.fasterxml.jackson.annotation.*;
-import org.goudham.me.api.entity.series.Series;
-import org.goudham.me.api.entity.user.Creator;
/**
@@ -81,7 +81,6 @@ import org.goudham.me.api.entity.user.Creator;
"appearances",
"series"
})
-@Generated("jsonschema2pojo")
@JsonIgnoreProperties(ignoreUnknown = true)
public class Waifu {
/**
@@ -612,12 +611,12 @@ public class Waifu {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Waifu waifu = (Waifu) o;
- return Objects.equals(id, waifu.id) && Objects.equals(slug, waifu.slug) && Objects.equals(creator, waifu.creator) && Objects.equals(name, waifu.name) && Objects.equals(originalName, waifu.originalName) && Objects.equals(displayPicture, waifu.displayPicture) && Objects.equals(description, waifu.description) && Objects.equals(weight, waifu.weight) && Objects.equals(height, waifu.height) && Objects.equals(bust, waifu.bust) && Objects.equals(hip, waifu.hip) && Objects.equals(waist, waifu.waist) && bloodType == waifu.bloodType && Objects.equals(origin, waifu.origin) && Objects.equals(age, waifu.age) && Objects.equals(birthdayMonth, waifu.birthdayMonth) && Objects.equals(birthdayDay, waifu.birthdayDay) && Objects.equals(birthdayYear, waifu.birthdayYear) && Objects.equals(likes, waifu.likes) && Objects.equals(trash, waifu.trash) && Objects.equals(url, waifu.url) && Objects.equals(husbando, waifu.husbando) && Objects.equals(nsfw, waifu.nsfw) && Objects.equals(popularityRank, waifu.popularityRank) && Objects.equals(likeRank, waifu.likeRank) && Objects.equals(trashRank, waifu.trashRank) && Objects.equals(appearances, waifu.appearances) && Objects.equals(series, waifu.series);
+ return Objects.equals(id, waifu.id) && Objects.equals(slug, waifu.slug) && Objects.equals(creator, waifu.creator) && Objects.equals(name, waifu.name) && Objects.equals(originalName, waifu.originalName) && Objects.equals(romajiName, waifu.romajiName) && Objects.equals(displayPicture, waifu.displayPicture) && Objects.equals(description, waifu.description) && Objects.equals(weight, waifu.weight) && Objects.equals(height, waifu.height) && Objects.equals(bust, waifu.bust) && Objects.equals(hip, waifu.hip) && Objects.equals(waist, waifu.waist) && bloodType == waifu.bloodType && Objects.equals(origin, waifu.origin) && Objects.equals(age, waifu.age) && Objects.equals(birthdayMonth, waifu.birthdayMonth) && Objects.equals(birthdayDay, waifu.birthdayDay) && Objects.equals(birthdayYear, waifu.birthdayYear) && Objects.equals(likes, waifu.likes) && Objects.equals(trash, waifu.trash) && Objects.equals(url, waifu.url) && Objects.equals(husbando, waifu.husbando) && Objects.equals(nsfw, waifu.nsfw) && Objects.equals(popularityRank, waifu.popularityRank) && Objects.equals(likeRank, waifu.likeRank) && Objects.equals(trashRank, waifu.trashRank) && Objects.equals(appearances, waifu.appearances) && Objects.equals(series, waifu.series);
}
@Override
public int hashCode() {
- return Objects.hash(id, slug, creator, name, originalName, displayPicture, description, weight, height, bust, hip, waist, bloodType, origin, age, birthdayMonth, birthdayDay, birthdayYear, likes, trash, url, husbando, nsfw, popularityRank, likeRank, trashRank, appearances, series);
+ return Objects.hash(id, slug, creator, name, originalName, romajiName, displayPicture, description, weight, height, bust, hip, waist, bloodType, origin, age, birthdayMonth, birthdayDay, birthdayYear, likes, trash, url, husbando, nsfw, popularityRank, likeRank, trashRank, appearances, series);
}
@Override
@@ -625,9 +624,10 @@ public class Waifu {
return "Waifu{" +
"id=" + id +
", slug='" + slug + '\'' +
- ", creatorId=" + creator +
+ ", creator=" + creator +
", name='" + name + '\'' +
", originalName='" + originalName + '\'' +
+ ", romajiName='" + romajiName + '\'' +
", displayPicture='" + displayPicture + '\'' +
", description='" + description + '\'' +
", weight=" + weight +
diff --git a/src/main/java/org/goudham/me/api/entity/waifu/WaifuImage.java b/src/main/java/me/goudham/domain/waifu/WaifuImage.java
similarity index 68%
rename from src/main/java/org/goudham/me/api/entity/waifu/WaifuImage.java
rename to src/main/java/me/goudham/domain/waifu/WaifuImage.java
index 06ef5d7..c0eca02 100644
--- a/src/main/java/org/goudham/me/api/entity/waifu/WaifuImage.java
+++ b/src/main/java/me/goudham/domain/waifu/WaifuImage.java
@@ -1,11 +1,10 @@
-package org.goudham.me.api.entity.waifu;
+package me.goudham.domain.waifu;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyDescription;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import javax.annotation.processing.Generated;
import java.util.Objects;
/**
@@ -16,7 +15,8 @@ import java.util.Objects;
*
* - {@link Integer id}
* - {@link String thumbnail}
- * - {@link String path}
+ * - {@link String image}
+ * - {@link Boolean nsfw}
*
*
*/
@@ -24,9 +24,9 @@ import java.util.Objects;
@JsonPropertyOrder({
"id",
"thumbnail",
- "path"
+ "image",
+ "nsfw"
})
-@Generated("jsonschema2pojo")
public class WaifuImage {
/**
@@ -49,9 +49,17 @@ public class WaifuImage {
* Final URL of the original resolution image
*
*/
- @JsonProperty("path")
+ @JsonProperty("image")
@JsonPropertyDescription("Final URL of the original resolution image")
- private String path;
+ private String image;
+
+ /**
+ * If image is NSFW or not
+ *
+ */
+ @JsonProperty("nsfw")
+ @JsonPropertyDescription("If image is NSFW or not")
+ private String nsfw;
@JsonProperty("id")
public Integer getId() {
@@ -73,27 +81,33 @@ public class WaifuImage {
this.thumbnail = thumbnail;
}
- @JsonProperty("path")
- public String getPath() {
- return path;
+ @JsonProperty("image")
+ public String getImage() {
+ return image;
}
- @JsonProperty("path")
- public void setPath(String path) {
- this.path = path;
+ @JsonProperty("image")
+ public void setImage(String image) {
+ this.image = image;
}
+ @JsonProperty("nsfw")
+ public String getNsfw() { return nsfw; }
+
+ @JsonProperty("nsfw")
+ public void setNsfw(String nsfw) { this.nsfw = nsfw; }
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
WaifuImage that = (WaifuImage) o;
- return Objects.equals(id, that.id) && Objects.equals(thumbnail, that.thumbnail) && Objects.equals(path, that.path);
+ return Objects.equals(id, that.id) && Objects.equals(thumbnail, that.thumbnail) && Objects.equals(image, that.image) && Objects.equals(nsfw, that.nsfw);
}
@Override
public int hashCode() {
- return Objects.hash(id, thumbnail, path);
+ return Objects.hash(id, thumbnail, image, nsfw);
}
@Override
@@ -101,7 +115,8 @@ public class WaifuImage {
return "WaifuImage{" +
"id=" + id +
", thumbnail='" + thumbnail + '\'' +
- ", path='" + path + '\'' +
+ ", image='" + image + '\'' +
+ ", nsfw='" + nsfw + '\'' +
'}';
}
}
diff --git a/src/main/java/org/goudham/me/exception/APIMapperException.java b/src/main/java/me/goudham/exception/APIMapperException.java
similarity index 62%
rename from src/main/java/org/goudham/me/exception/APIMapperException.java
rename to src/main/java/me/goudham/exception/APIMapperException.java
index 79bad38..9e5dd04 100644
--- a/src/main/java/org/goudham/me/exception/APIMapperException.java
+++ b/src/main/java/me/goudham/exception/APIMapperException.java
@@ -1,10 +1,10 @@
-package org.goudham.me.exception;
+package me.goudham.exception;
-import org.goudham.me.APIWrapper;
-import org.goudham.me.Response;
+import me.goudham.APIWrapper;
+import me.goudham.Response;
/**
- * Thrown when {@link APIWrapper} fails to deserialize json into Java POJO's ({@link Response#getEntity()})
+ * Thrown when {@link APIWrapper} fails to deserialize json into Java POJO's ({@link Response#getModel()})
*
*/
public class APIMapperException extends Throwable {
diff --git a/src/main/java/org/goudham/me/exception/APIResponseException.java b/src/main/java/me/goudham/exception/APIResponseException.java
similarity index 78%
rename from src/main/java/org/goudham/me/exception/APIResponseException.java
rename to src/main/java/me/goudham/exception/APIResponseException.java
index 53259d2..f1a3439 100644
--- a/src/main/java/org/goudham/me/exception/APIResponseException.java
+++ b/src/main/java/me/goudham/exception/APIResponseException.java
@@ -1,6 +1,6 @@
-package org.goudham.me.exception;
+package me.goudham.exception;
-import org.goudham.me.APIWrapper;
+import me.goudham.APIWrapper;
/**
* Thrown when {@link APIWrapper} fails to return API information
diff --git a/src/main/java/me/goudham/util/Season.java b/src/main/java/me/goudham/util/Season.java
new file mode 100644
index 0000000..e44a2b8
--- /dev/null
+++ b/src/main/java/me/goudham/util/Season.java
@@ -0,0 +1,22 @@
+package me.goudham.util;
+
+/**
+ * Listing all 4 {@link Season}'s
+ *
+ */
+public enum Season {
+ SPRING("spring"),
+ SUMMER("summer"),
+ FALL("fall"),
+ WINTER("winter");
+
+ private final String season;
+
+ Season(String season) {
+ this.season = season;
+ }
+
+ public String getSeason() {
+ return season;
+ }
+}
diff --git a/src/main/java/org/goudham/me/APIWrapper.java b/src/main/java/org/goudham/me/APIWrapper.java
deleted file mode 100644
index 8838ffe..0000000
--- a/src/main/java/org/goudham/me/APIWrapper.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.goudham.me;
-
-import org.goudham.me.api.entity.series.FilteredSeries;
-import org.goudham.me.api.entity.series.Series;
-import org.goudham.me.api.entity.waifu.Waifu;
-import org.goudham.me.exception.APIMapperException;
-import org.goudham.me.exception.APIResponseException;
-
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.time.Duration;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-
-
-/**
- * Returns API information to {@link MyWaifuClient}
- */
-public class APIWrapper {
- private final String version = "1.0";
- private static final String host = "https://mywaifulist.moe/api/v1/";
- private final String apiKey;
-
- private final APIMapper apiMapper;
-
- /**
- * Instantiates an instance of {@link APIWrapper} to retrieve API Information.
- * An instance of {@link APIMapper} is created to be able to {@link APIMapper#deserialize(Result, Class)} JSON to
- * Java objects
- *
- * @param apiKey API Key to authorise API request
- *
- */
- APIWrapper(String apiKey) {
- this.apiKey = apiKey;
- apiMapper = new APIMapper();
- }
-
-
- /**
- * Handles sending a request to the API asynchronously using {@link HttpRequest}
- * and the underlying {@link HttpClient}
- *
- * @param httpClient The {@link HttpClient} to use for sending {@link HttpRequest}'s
- * @param param The end of the endpoint appended onto the host
- * @return {@link Result}
- * @throws APIResponseException If the {@link CompletableFuture Response}
- * cannot be decoded or the thread was interrupted while waiting to receive the data
- *
- */
- private Result sendRequest(HttpClient httpClient, String param) throws APIResponseException {
- HttpRequest request = HttpRequest.newBuilder()
- .uri(URI.create(host + param))
- .version(httpClient.version())
- .timeout(Duration.ofSeconds(20))
- .headers("Content-Type", "application/json", "apikey", apiKey)
- .GET()
- .build();
-
- CompletableFuture> response = httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString());
-
- int responseCode;
- String responseBody;
- try {
- responseCode = response.thenApply(HttpResponse::statusCode).get();
- responseBody = response.thenApply(HttpResponse::body).get();
- } catch (InterruptedException | ExecutionException exp) {
- throw new APIResponseException(exp.getMessage(), exp);
- }
-
- return new Result(responseCode, responseBody);
- }
-
- Response getWaifu(HttpClient httpClient, String param) throws APIResponseException, APIMapperException {
- Result waifuResult = sendRequest(httpClient, "waifu/" + param);
- return apiMapper.deserialize(waifuResult, Waifu.class);
- }
-
- Response getSeries(HttpClient httpClient, String param) throws APIResponseException, APIMapperException {
- Result seriesResult = sendRequest(httpClient, "series/" + param);
- return apiMapper.deserialize(seriesResult, Series.class);
- }
-
- Response> getAiringAnime(HttpClient httpClient) throws APIResponseException, APIMapperException {
- Result seriesResult = sendRequest(httpClient, "airing");
- return apiMapper.deserializeToList(seriesResult, FilteredSeries.class);
- }
-}
diff --git a/src/main/java/org/goudham/me/MyWaifuClient.java b/src/main/java/org/goudham/me/MyWaifuClient.java
deleted file mode 100644
index ce5ce2d..0000000
--- a/src/main/java/org/goudham/me/MyWaifuClient.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.goudham.me;
-
-import org.goudham.me.api.entity.series.FilteredSeries;
-import org.goudham.me.api.entity.series.Series;
-import org.goudham.me.api.entity.waifu.Waifu;
-import org.goudham.me.exception.APIMapperException;
-import org.goudham.me.exception.APIResponseException;
-import org.jetbrains.annotations.NotNull;
-
-import javax.net.ssl.SSLParameters;
-import java.net.Authenticator;
-import java.net.CookieHandler;
-import java.net.ProxySelector;
-import java.net.http.HttpClient;
-import java.time.Duration;
-import java.util.List;
-import java.util.concurrent.Executor;
-
-/**
- * A MyWaifuClient, the underlying client used for making requests is {@link HttpClient}
- *
- *
- * Main entry point for retrieving information from MyWaifuList.
- * {@link APIWrapper} is utilised to make the API requests
- */
-public class MyWaifuClient {
- private final APIWrapper APIWrapper;
- private HttpClient httpClient;
-
- /**
- * Creates an instance of {@link MyWaifuClient}
- *
- * See MyWaifuList for obtaining an API Key
- * @param apiKey API Key to authorise API request
- */
- MyWaifuClient(@NotNull String apiKey) {
- APIWrapper = new APIWrapper(apiKey);
- }
-
- /**
- * Creates an instance of {@link MyWaifuClient} with default {@link HttpClient} settings
- *
- * @param apiKey API Key to authorise API request
- * @return {@link MyWaifuClient}
- */
- public static MyWaifuClient createDefault(@NotNull String apiKey) {
- MyWaifuClient myWaifuClient = new MyWaifuClient(apiKey);
- myWaifuClient.setHttpClient(HttpClient.newBuilder()
- .version(HttpClient.Version.HTTP_2)
- .followRedirects(HttpClient.Redirect.NORMAL)
- .connectTimeout(Duration.ofSeconds(20))
- .build());
-
- return myWaifuClient;
- }
-
- public Response getWaifu(String slug) throws APIResponseException, APIMapperException {
- return APIWrapper.getWaifu(httpClient, slug);
- }
-
- public Response getWaifu(Integer id) throws APIResponseException, APIMapperException {
- return APIWrapper.getWaifu(httpClient, String.valueOf(id));
- }
-
- public Response getSeries(Integer id) throws APIMapperException, APIResponseException {
- return APIWrapper.getSeries(httpClient, String.valueOf(id));
- }
-
- public Response> getAiringAnime() throws APIMapperException, APIResponseException {
- return APIWrapper.getAiringAnime(httpClient);
- }
-
- /**
- * Sets an instance of HttpClient
- *
- * @param httpClient HttpClient for executing API requests
- */
- void setHttpClient(HttpClient httpClient) {
- this.httpClient = httpClient;
- }
-
- /**
- * Builder for MyWaifuClient
- */
- public static class Builder {
- private final String apiKey;
- private final APIWrapper APIWrapper;
- private HttpClient.Builder httpClientBuilder;
-
- public Builder(String apiKey) {
- this.apiKey = apiKey;
- APIWrapper = new APIWrapper(apiKey);
- }
-
- public Builder withCookieHandler(CookieHandler cookieHandler) {
- httpClientBuilder.cookieHandler(cookieHandler);
- return this;
- }
-
- public Builder withConnectTimeout(Duration duration) {
- httpClientBuilder.connectTimeout(duration);
- return this;
- }
-
- public Builder withSslParameters(SSLParameters sslParameters) {
- httpClientBuilder.sslParameters(sslParameters);
- return this;
- }
-
- public Builder withExecutor(Executor executor) {
- httpClientBuilder.executor(executor);
- return this;
- }
-
- public Builder withFollowRedirects(HttpClient.Redirect policy) {
- httpClientBuilder.followRedirects(policy);
- return this;
- }
-
- public Builder withVersion(HttpClient.Version version) {
- httpClientBuilder.version(version);
- return this;
- }
-
- public Builder withPriority(int priority) {
- httpClientBuilder.priority(priority);
- return this;
- }
-
- public Builder withProxy(ProxySelector proxySelector) {
- httpClientBuilder.proxy(proxySelector);
- return this;
- }
-
- public Builder withAuthenticator(Authenticator authenticator) {
- httpClientBuilder.authenticator(authenticator);
- return this;
- }
-
- public MyWaifuClient build() {
- MyWaifuClient myWaifuClient = new MyWaifuClient(apiKey);
- myWaifuClient.setHttpClient(httpClientBuilder.build());
- return myWaifuClient;
- }
- }
-}
diff --git a/src/main/java/org/goudham/me/Response.java b/src/main/java/org/goudham/me/Response.java
deleted file mode 100644
index 61c9079..0000000
--- a/src/main/java/org/goudham/me/Response.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.goudham.me;
-
-import org.goudham.me.api.entity.series.Series;
-import org.goudham.me.api.entity.waifu.Waifu;
-
-/**
- * This is returned to the User when called by methods in {@link MyWaifuClient}.
- * E.g {@link MyWaifuClient#getWaifu(Integer)}
- *
- * Given a successful response, {@link #entity} will be populated with the requested entity.
- *
- * No matter successful or unsuccessful response, {@link #responseCode} and {@link #responseBody}
- * will be populated to ensure the user has all the information for debugging or extra information within
- * the {@link #responseBody}
- *
- * @param The type of entity to be returned. E.g {@link Waifu} or {@link Series}
- *
- */
-public class Response {
- private T entity;
- private final Integer responseCode;
- private final String responseBody;
-
- Response(Integer responseCode, String responseBody, T entity) {
- this.responseCode = responseCode;
- this.responseBody = responseBody;
- this.entity = entity;
- }
-
- Response(Integer responseCode, String responseBody) {
- this.responseCode = responseCode;
- this.responseBody = responseBody;
- }
-
- public T getEntity() {
- return entity;
- }
-
- public Integer getResponseCode() {
- return responseCode;
- }
-
- public String getResponseBody() {
- return responseBody;
- }
-}
diff --git a/src/main/java/org/goudham/me/api/entity/PaginationData.java b/src/main/java/org/goudham/me/api/entity/PaginationData.java
deleted file mode 100644
index 6c08c9d..0000000
--- a/src/main/java/org/goudham/me/api/entity/PaginationData.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.goudham.me.api.entity;
-
-import javax.annotation.processing.Generated;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-
-/**
- * {@link PaginationData}
- * Contains standard Pagination data from the API
- *
- * Fields included are:
- *
- * - {@link Integer currentPage}
- * - {@link Integer lastPage}
- * - {@link Integer perPage}
- * - {@link Integer total}
- *
- *
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
- "current_page",
- "last_page",
- "per_page",
- "total"
-})
-@Generated("jsonschema2pojo")
-public class PaginationData {
- /**
- * Current requested page
- *
- */
- @JsonProperty("current_page")
- @JsonPropertyDescription("Current requested page")
- private Integer currentPage;
-
- /**
- * Last available page
- *
- */
- @JsonProperty("last_page")
- @JsonPropertyDescription("Last available page")
- private Integer lastPage;
-
- /**
- * Total number of items per page
- *
- */
- @JsonProperty("per_page")
- @JsonPropertyDescription("Total number of items per page")
- private Integer perPage;
-
- /**
- * Total number of items
- *
- */
- @JsonProperty("total")
- @JsonPropertyDescription("Total number of items")
- private Integer total;
-
- @JsonProperty("current_page")
- public Integer getCurrentPage() {
- return currentPage;
- }
-
- @JsonProperty("current_page")
- public void setCurrentPage(Integer currentPage) {
- this.currentPage = currentPage;
- }
-
- @JsonProperty("last_page")
- public Integer getLastPage() {
- return lastPage;
- }
-
- @JsonProperty("last_page")
- public void setLastPage(Integer lastPage) {
- this.lastPage = lastPage;
- }
-
- @JsonProperty("per_page")
- public Integer getPerPage() {
- return perPage;
- }
-
- @JsonProperty("per_page")
- public void setPerPage(Integer perPage) {
- this.perPage = perPage;
- }
-
- @JsonProperty("total")
- public Integer getTotal() {
- return total;
- }
-
- @JsonProperty("total")
- public void setTotal(Integer total) {
- this.total = total;
- }
-
-}
diff --git a/src/test/java/org/goudham/me/AppTest.java b/src/test/java/org/goudham/me/AppTest.java
deleted file mode 100644
index 9840d16..0000000
--- a/src/test/java/org/goudham/me/AppTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.goudham.me;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest
-{
- /**
- * Rigorous Test :-)
- */
- @Test
- public void shouldAnswerWithTrue()
- {
- assertTrue( true );
- }
-}
-
-
