Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only parse used data to reduce errors when API changes #782

Merged
merged 5 commits into from
Jun 9, 2024
Merged

Only parse used data to reduce errors when API changes #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a6baab
Only parse actually used data
Rakambda May 21, 2024
23a97ff
Merge branch 'develop' into feat/gh-781
Rakambda May 22, 2024
4838480
Merge remote-tracking branch 'origin/develop' into feat/gh-781
Rakambda Jun 9, 2024
49fb217
Fix merge and up to date
Rakambda Jun 9, 2024
d890138
Fix test
Rakambda Jun 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/discord/data/Embed.java
View file
Open in desktop
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;
}
6 changes: 0 additions & 6 deletions miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/discord/data/Footer.java
View file
Open in desktop
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;
}
28 changes: 0 additions & 28 deletions miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/discord/data/Image.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/discord/data/Webhook.java
View file
Open in desktop
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
3 changes: 0 additions & 3 deletions ...nnelpointsminer/miner/api/gql/gql/data/channelpointscontext/ChannelPointsContextData.java
View file
Open in desktop
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;
}
5 changes: 0 additions & 5 deletions ...da/channelpointsminer/miner/api/gql/gql/data/chatroombanstatus/ChatRoomBanStatusData.java
View file
Open in desktop
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;
}
8 changes: 0 additions & 8 deletions ...nnelpointsminer/miner/api/gql/gql/data/claimcommunitypoints/ClaimCommunityPointsData.java
View file
Open in desktop
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;
}
8 changes: 0 additions & 8 deletions ...miner/miner/api/gql/gql/data/dropspageclaimdroprewards/DropsPageClaimDropRewardsData.java
View file
Open in desktop
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;
}
8 changes: 0 additions & 8 deletions ...ain/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/joinraid/JoinRaidData.java
View file
Open in desktop
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;
}
4 changes: 0 additions & 4 deletions ...rakambda/channelpointsminer/miner/api/gql/gql/data/reportmenuitem/ReportMenuItemData.java
View file
Open in desktop
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
7 changes: 0 additions & 7 deletions ...n/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/BroadcastSettings.java
View file
Open in desktop
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
16 changes: 0 additions & 16 deletions miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/Channel.java
View file
Open in desktop
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
27 changes: 0 additions & 27 deletions ...n/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/ChatRoomBanStatus.java
View file
Open in desktop
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;
}
3 changes: 0 additions & 3 deletions ...rakambda/channelpointsminer/miner/api/gql/gql/data/types/ClaimCommunityMomentPayload.java
View file
Open in desktop
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
24 changes: 0 additions & 24 deletions ...r/rakambda/channelpointsminer/miner/api/gql/gql/data/types/ClaimCommunityPointsError.java
View file
Open in desktop

This file was deleted.

Loading
Loading