Skip to content

Commit

Permalink
Only parse used data to reduce errors when API changes (#782)
Browse files Browse the repository at this point in the history
* Only parse actually used data

* Fix merge and up to date

* Fix test
  • Loading branch information
Rakambda committed Jun 9, 2024
1 parent 05070be commit 89f79d2
Show file tree
Hide file tree
Showing 148 changed files with 197 additions and 3,857 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,13 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import fr.rakambda.channelpointsminer.miner.util.json.InstantSerializer;
import fr.rakambda.channelpointsminer.miner.util.json.URLSerializer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Singular;
import lombok.ToString;
import java.net.URL;
import java.time.Instant;
import java.util.Collection;

@JsonIgnoreProperties(ignoreUnknown = true)
Expand All @@ -28,25 +23,13 @@
public class Embed{
@JsonProperty("author")
private Author author;
@JsonProperty("title")
private String title;
@JsonProperty("url")
@JsonSerialize(using = URLSerializer.class)
private URL url;
@JsonProperty("description")
private String description;
@JsonProperty("color")
private Integer color;
@JsonProperty("fields")
@Singular
private Collection<Field> fields;
@JsonProperty("thumbnail")
private Image thumbnail;
@JsonProperty("image")
private Image image;
@JsonProperty("footer")
private Footer footer;
@JsonProperty("timestamp")
@JsonSerialize(using = InstantSerializer.class)
private Instant timestamp;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import fr.rakambda.channelpointsminer.miner.util.json.URLSerializer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import java.net.URL;

@JsonIgnoreProperties(ignoreUnknown = true)
@JsonInclude(JsonInclude.Include.NON_NULL)
Expand All @@ -24,7 +21,4 @@
public class Footer{
@JsonProperty("text")
private String text;
@JsonProperty("icon_url")
@JsonSerialize(using = URLSerializer.class)
private URL iconUrl;
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import fr.rakambda.channelpointsminer.miner.util.json.URLSerializer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.net.URL;
import java.util.Collection;

@JsonIgnoreProperties(ignoreUnknown = true)
Expand All @@ -27,9 +24,6 @@ public class Webhook{
@JsonProperty("username")
@Setter
private String username;
@JsonProperty("avatar_url")
@JsonSerialize(using = URLSerializer.class)
private URL avatarUrl;
@JsonProperty("content")
private String content;
@JsonProperty("embeds")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,4 @@ public class ChannelPointsContextData{
@JsonProperty("community")
@NotNull
private User community;
@JsonProperty("currentUser")
@NotNull
private User currentUser;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.ChatRoomBanStatus;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.User;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

@Getter
Expand All @@ -22,7 +20,4 @@ public class ChatRoomBanStatusData{
@JsonProperty("chatRoomBanStatus")
@Nullable
private ChatRoomBanStatus chatRoomBanStatus;
@JsonProperty("targetUser")
@NotNull
private User targetUser;
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
package fr.rakambda.channelpointsminer.miner.api.gql.gql.data.claimcommunitypoints;

import com.fasterxml.jackson.annotation.JsonProperty;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.ClaimCommunityPointsPayload;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.jetbrains.annotations.NotNull;

@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
@EqualsAndHashCode
@ToString
public class ClaimCommunityPointsData{
@JsonProperty("claimCommunityPoints")
@NotNull
private ClaimCommunityPointsPayload claimCommunityPoints;
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
package fr.rakambda.channelpointsminer.miner.api.gql.gql.data.dropspageclaimdroprewards;

import com.fasterxml.jackson.annotation.JsonProperty;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.ClaimDropRewardsPayload;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.jetbrains.annotations.NotNull;

@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
@EqualsAndHashCode
@ToString
public class DropsPageClaimDropRewardsData{
@JsonProperty("claimDropRewards")
@NotNull
private ClaimDropRewardsPayload claimDropRewards;
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
package fr.rakambda.channelpointsminer.miner.api.gql.gql.data.joinraid;

import com.fasterxml.jackson.annotation.JsonProperty;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.JoinRaidPayload;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.jetbrains.annotations.NotNull;

@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
@EqualsAndHashCode
@ToString
public class JoinRaidData{
@JsonProperty("joinRaid")
@NotNull
private JoinRaidPayload joinRaid;
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package fr.rakambda.channelpointsminer.miner.api.gql.gql.data.reportmenuitem;

import com.fasterxml.jackson.annotation.JsonProperty;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.RequestInfo;
import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.User;
import lombok.AllArgsConstructor;
import lombok.Builder;
Expand All @@ -18,9 +17,6 @@
@EqualsAndHashCode
@ToString
public class ReportMenuItemData{
@JsonProperty("requestInfo")
@NotNull
private RequestInfo requestInfo;
@JsonProperty("user")
@NotNull
private User user;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

@JsonTypeName("BroadcastSettings")
Expand All @@ -19,12 +18,6 @@
@EqualsAndHashCode(callSuper = true)
@ToString
public class BroadcastSettings extends GQLType{
@JsonProperty("id")
@NotNull
private String id;
@JsonProperty("title")
@NotNull
private String title;
@JsonProperty("game")
@Nullable
private Game game;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import fr.rakambda.channelpointsminer.miner.util.json.URLDeserializer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
Expand All @@ -12,7 +10,6 @@
import lombok.ToString;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;

Expand All @@ -24,22 +21,9 @@
@EqualsAndHashCode(callSuper = true)
@ToString
public class Channel extends GQLType{
@JsonProperty("id")
@NotNull
private String id;
@JsonProperty("name")
@Nullable
private String name;
@JsonProperty("url")
@JsonDeserialize(using = URLDeserializer.class)
@Nullable
private URL url;
@JsonProperty("self")
@Nullable
private ChannelSelfEdge self;
@JsonProperty("communityPointsSettings")
@Nullable
private CommunityPointsChannelSettings communityPointsSettings;
@JsonProperty("viewerDropCampaigns")
@NotNull
@Builder.Default
Expand Down
Original file line number Diff line number Diff line change
@@ -1,44 +1,17 @@
package fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import fr.rakambda.channelpointsminer.miner.util.json.ISO8601ZonedDateTimeDeserializer;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.time.ZonedDateTime;

@JsonTypeName("ChatRoomBanStatus")
@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
@EqualsAndHashCode(callSuper = true)
@ToString
public class ChatRoomBanStatus extends GQLType{
@JsonProperty("bannedUser")
@NotNull
private User bannedUser;
@JsonProperty("createdAt")
@JsonDeserialize(using = ISO8601ZonedDateTimeDeserializer.class)
@NotNull
private ZonedDateTime createdAt;
@JsonProperty("expiresAt")
@JsonDeserialize(using = ISO8601ZonedDateTimeDeserializer.class)
@Nullable
private ZonedDateTime expiresAt;
@JsonProperty("isPermanent")
private boolean permanent;
@JsonProperty("moderator")
@Nullable
private User moderator;
@JsonProperty("reason")
@Nullable
private String reason;
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
@EqualsAndHashCode(callSuper = true)
@ToString
public class ClaimCommunityMomentPayload extends GQLType{
@JsonProperty("moment")
@Nullable
private CommunityMoment moment;
@JsonProperty("error")
@JsonDeserialize(using = UnknownDeserializer.class)
@Nullable
Expand Down

This file was deleted.

Loading

0 comments on commit 89f79d2

Please sign in to comment.