Merge pull request #4 from sgoudham/release

Merge changes from Release to Main cause I'm an idiot
pull/5/head
Hamothy 3 years ago committed by GitHub
commit 75e35656b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

4
Jenkinsfile vendored

@ -36,10 +36,6 @@ pipeline {
pom = readMavenPom file: "pom.xml";
filesByGlob = findFiles(glob: "target/*.${pom.packaging}");
echo "${filesByGlob[0].name} ${filesByGlob[0].path} ${filesByGlob[0].directory} ${filesByGlob[0].length} ${filesByGlob[0].lastModified}"
echo "${filesByGlob[1].name} ${filesByGlob[1].path} ${filesByGlob[1].directory} ${filesByGlob[1].length} ${filesByGlob[1].lastModified}"
echo "${filesByGlob[2].name} ${filesByGlob[2].path} ${filesByGlob[2].directory} ${filesByGlob[2].length} ${filesByGlob[2].lastModified}"
javadocsArtifact = filesByGlob[0].path;
jarWithSourcesArtifact = filesByGlob[1].path;
jarArtifact = filesByGlob[2].path;

@ -26,7 +26,7 @@ public class MyWaifuClient {
* <p>See <a href="https://mywaifulist.docs.stoplight.io/">MyWaifuList</a> for obtaining an API Key</p>
* @param apiKey API Key to authorise API request
*/
public MyWaifuClient(@NotNull String apiKey) {
MyWaifuClient(@NotNull String apiKey) {
myWaifuWrapper = new MyWaifuWrapper(apiKey);
}
@ -47,6 +47,14 @@ public class MyWaifuClient {
return myWaifuClient;
}
public void getWaifu(String slug) {
myWaifuWrapper.getWaifu(httpClient, slug);
}
public void getWaifu(Integer id) {
myWaifuWrapper.getWaifu(httpClient, String.valueOf(id));
}
/**
* Sets an instance of HttpClient
*

@ -1,13 +1,25 @@
package org.goudham.me;
import com.fasterxml.jackson.databind.ObjectMapper;
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.concurrent.CompletableFuture;
/**
* Returns API information to {@link MyWaifuClient}
*/
class MyWaifuWrapper {
private final String version = "1.0";
private final String host = "https://mywaifulist.moe/api/v1/";
private static final String host = "https://mywaifulist.moe/api/v1/";
private final String apiKey;
private final ObjectMapper objectMapper = new ObjectMapper();
/**
* Instantiates an instance of {@link MyWaifuWrapper} to retrieve API Information
* @param apiKey API Key to authorise API request
@ -15,4 +27,45 @@ class MyWaifuWrapper {
MyWaifuWrapper(String apiKey) {
this.apiKey = apiKey;
}
private void sendRequest(HttpClient httpClient, String param) {
HttpRequest request = HttpRequest.newBuilder()
.uri(URI.create(host + param))
.version(httpClient.version())
.timeout(Duration.ofSeconds(30))
.header("Content-Type", "application/json")
.header("apikey", apiKey)
.GET()
.build();
CompletableFuture<HttpResponse<String>> response = httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString());
System.out.println(response);
// String resultBody = "";
// int resultStatusCode = 0;
// try {
// resultBody = response.thenApply(HttpResponse::body).get();
// resultStatusCode = response.thenApply(HttpResponse::statusCode).get();
//
// } catch (InterruptedException | ExecutionException e) {
// e.printStackTrace();
// }
//
// System.out.println(resultStatusCode);
// System.out.println(resultBody);
//
// try {
// JsonNode parent = objectMapper.readTree(resultBody);
// String waifuData = parent.get("data").toString();
// Waifu waifu = objectMapper.readValue(waifuData, Waifu.class);
// System.out.println(waifu);
// } catch (JsonProcessingException e) {
// e.printStackTrace();
// }
}
void getWaifu(HttpClient httpClient, String param) {
sendRequest(httpClient, "waifu/" + param);
}
}

@ -2,10 +2,7 @@ package org.goudham.me.api.entity.series;
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 com.fasterxml.jackson.annotation.*;
import org.goudham.me.api.entity.Studio;
import org.goudham.me.api.entity.waifu.Waifu;
@ -20,12 +17,13 @@ import java.util.Objects;
* <li>{@link String name}</li>
* <li>{@link String originalName}</li>
* <li>{@link String romajiName}</li>
* <li>{@link String description}</li>
* <li>{@link String slug}</li>
* <li>{@link String releaseDate}</li>
* <li>{@link String airingStart}</li>
* <li>{@link String airingEnd}</li>
* <li>{@link Integer episodeCount}</li>
* <li>{@link String image}</li>
* <li>{@link String displayPicture}</li>
* <li>{@link String url}</li>
* <li>{@link Studio}</li>
* <li>{@link Integer id}</li>
@ -43,7 +41,7 @@ import java.util.Objects;
"airing_start",
"airing_end",
"episode_count",
"image",
"display_picture",
"url",
"studio",
"id"
@ -95,6 +93,7 @@ public class Series {
*
*/
@JsonProperty("release_date")
@JsonAlias("release")
@JsonPropertyDescription("Original works release date (")
private String releaseDate;
@ -126,9 +125,10 @@ public class Series {
* URL of the display picture
*
*/
@JsonProperty("image")
@JsonProperty("display_picture")
@JsonAlias("image")
@JsonPropertyDescription("URL of the display picture")
private String image;
private String displayPicture;
/**
* URL of the {@link Series}
@ -243,13 +243,13 @@ public class Series {
}
@JsonProperty("image")
public String getImage() {
return image;
public String getDisplayPicture() {
return displayPicture;
}
@JsonProperty("image")
public void setImage(String image) {
this.image = image;
public void setDisplayPicture(String displayPicture) {
this.displayPicture = displayPicture;
}
@JsonProperty("url")
@ -287,12 +287,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(image, series.image) && 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(id, series.id);
}
@Override
public int hashCode() {
return Objects.hash(name, originalName, romajiName, description, slug, releaseDate, airingStart, airingEnd, episodeCount, image, url, studio, id);
return Objects.hash(name, originalName, romajiName, description, slug, releaseDate, airingStart, airingEnd, episodeCount, displayPicture, url, studio, id);
}
@Override
@ -307,7 +307,7 @@ public class Series {
", airingStart='" + airingStart + '\'' +
", airingEnd='" + airingEnd + '\'' +
", episodeCount=" + episodeCount +
", image='" + image + '\'' +
", image='" + displayPicture + '\'' +
", url='" + url + '\'' +
", studio=" + studio +
", id=" + id +

@ -0,0 +1,88 @@
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;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import java.util.Objects;
/**
* {@link Creator}
* <p>User that submitted the {@link Waifu}</p>
*
* <p> Fields included are: </p>
* <ul>
* <li>{@link String id}</li>
* <li>{@link String name}</li>
* </ul>
*
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
"id",
"name"
})
@Generated("jsonschema2pojo")
public class Creator {
/**
* {@link Creator} ID
*
*/
@JsonProperty("id")
@JsonPropertyDescription("")
private Integer id;
/**
* {@link Creator} Name
*/
@JsonProperty("name")
@JsonPropertyDescription("")
private String name;
@JsonProperty("id")
public Integer getId() {
return id;
}
@JsonProperty("id")
public void setId(Integer id) {
this.id = id;
}
@JsonProperty("name")
public String getName() {
return name;
}
@JsonProperty("name")
public void setName(String name) {
this.name = name;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Creator creator = (Creator) o;
return Objects.equals(id, creator.id) && Objects.equals(name, creator.name);
}
@Override
public int hashCode() {
return Objects.hash(id, name);
}
@Override
public String toString() {
return "Creator{" +
"id=" + id +
", name='" + name + '\'' +
'}';
}
}

@ -6,13 +6,9 @@ import java.util.Map;
import java.util.Objects;
import javax.annotation.processing.Generated;
import com.fasterxml.jackson.annotation.JsonCreator;
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 com.fasterxml.jackson.annotation.JsonValue;
import com.fasterxml.jackson.annotation.*;
import org.goudham.me.api.entity.series.Series;
import org.goudham.me.api.entity.user.Creator;
/**
@ -23,9 +19,10 @@ import org.goudham.me.api.entity.series.Series;
* <ul>
* <li>{@link Integer id}</li>
* <li>{@link String slug}</li>
* <li>{@link Integer creatorId}</li>
* <li>{@link Creator creatorId}</li>
* <li>{@link String name}</li>
* <li>{@link String originalName}</li>
* <li>{@link String romaji_name}</li>
* <li>{@link String displayPicture}</li>
* <li>{@link String description}</li>
* <li>{@link Double weight}</li>
@ -47,7 +44,7 @@ import org.goudham.me.api.entity.series.Series;
* <li>{@link Integer popularityRank}</li>
* <li>{@link Integer likeRank}</li>
* <li>{@link Integer trashRank}</li>
* <li>{@link List} of {@link Appearance}'s</li>
* <li>{@link List} of {@link Series}'s</li>
* <li>{@link Series series}</li>
* </ul>
*
@ -56,9 +53,10 @@ import org.goudham.me.api.entity.series.Series;
@JsonPropertyOrder({
"id",
"slug",
"creator_id",
"creator",
"name",
"original_name",
"romaji_name",
"display_picture",
"description",
"weight",
@ -84,6 +82,7 @@ import org.goudham.me.api.entity.series.Series;
"series"
})
@Generated("jsonschema2pojo")
@JsonIgnoreProperties(ignoreUnknown = true)
public class Waifu {
/**
* {@link Waifu} ID
@ -105,9 +104,9 @@ public class Waifu {
* ID of the user who created this {@link Waifu}
*
*/
@JsonProperty("creator_id")
@JsonPropertyDescription("ID of the user who created this Waifu")
private Integer creatorId;
@JsonProperty("creator")
@JsonPropertyDescription("User who created this Waifu")
private Creator creator;
/**
* Full name, in English.
@ -125,6 +124,14 @@ public class Waifu {
@JsonPropertyDescription("Name in the original language (\u65e5\u672c\u8a9e)")
private String originalName;
/**
* If this character has a romaji name, we'll put it here.
*
*/
@JsonProperty("romaji_name")
@JsonPropertyDescription("if this character has a romaji name, we'll put it here. ")
private String romajiName;
/**
* URL of the display picture
*
@ -299,7 +306,7 @@ public class Waifu {
*/
@JsonProperty("appearances")
@JsonPropertyDescription("An array of series or works that this character appears in")
private List<Appearance> appearances = null;
private List<Series> appearances;
/**
* {@link Series}
@ -330,14 +337,14 @@ public class Waifu {
this.slug = slug;
}
@JsonProperty("creator_id")
public Integer getCreatorId() {
return creatorId;
@JsonProperty("creator")
public Creator getCreator() {
return creator;
}
@JsonProperty("creator_id")
public void setCreatorId(Integer creatorId) {
this.creatorId = creatorId;
@JsonProperty("creator")
public void setCreator(Creator creator) {
this.creator = creator;
}
@JsonProperty("name")
@ -360,6 +367,16 @@ public class Waifu {
this.originalName = originalName;
}
@JsonProperty("romaji_name")
public String getRomajiName() {
return romajiName;
}
@JsonProperty("romaji_name")
public void setRomajiName(String romajiName) {
this.romajiName = romajiName;
}
@JsonProperty("display_picture")
public String getDisplayPicture() {
return displayPicture;
@ -571,12 +588,12 @@ public class Waifu {
}
@JsonProperty("appearances")
public List<Appearance> getAppearances() {
public List<Series> getAppearances() {
return appearances;
}
@JsonProperty("appearances")
public void setAppearances(List<Appearance> appearances) {
public void setAppearances(List<Series> appearances) {
this.appearances = appearances;
}
@ -595,12 +612,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(creatorId, waifu.creatorId) && 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(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, creatorId, 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, displayPicture, description, weight, height, bust, hip, waist, bloodType, origin, age, birthdayMonth, birthdayDay, birthdayYear, likes, trash, url, husbando, nsfw, popularityRank, likeRank, trashRank, appearances, series);
}
@Override
@ -608,7 +625,7 @@ public class Waifu {
return "Waifu{" +
"id=" + id +
", slug='" + slug + '\'' +
", creatorId=" + creatorId +
", creatorId=" + creator +
", name='" + name + '\'' +
", originalName='" + originalName + '\'' +
", displayPicture='" + displayPicture + '\'' +

Loading…
Cancel
Save