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

refactor: remove obsolete EventSubCondition#toMap #256

Merged
merged 1 commit into from
Jan 19, 2021
Merged

refactor: remove obsolete EventSubCondition#toMap #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 0 additions & 8 deletions ...on/src/main/java/com/github/twitch4j/eventsub/condition/ApplicationEventSubCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
import lombok.experimental.SuperBuilder;
import lombok.extern.jackson.Jacksonized;

import java.util.Collections;
import java.util.Map;

@Data
@Setter(AccessLevel.PRIVATE)
@SuperBuilder
Expand All @@ -28,9 +25,4 @@ public class ApplicationEventSubCondition extends EventSubCondition {
*/
private String clientId;

@Override
public Map<String, Object> toMap() {
return Collections.singletonMap("client_id", this.clientId);
}

}
8 changes: 0 additions & 8 deletions ...common/src/main/java/com/github/twitch4j/eventsub/condition/ChannelEventSubCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
import lombok.experimental.SuperBuilder;
import lombok.extern.jackson.Jacksonized;

import java.util.Collections;
import java.util.Map;

@Data
@Setter(AccessLevel.PRIVATE)
@SuperBuilder
Expand All @@ -27,9 +24,4 @@ public class ChannelEventSubCondition extends EventSubCondition {
*/
private String broadcasterUserId;

@Override
public Map<String, Object> toMap() {
return Collections.singletonMap("broadcaster_user_id", this.broadcasterUserId);
}

}
13 changes: 0 additions & 13 deletions ...n/src/main/java/com/github/twitch4j/eventsub/condition/CustomRewardEventSubCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
import lombok.experimental.SuperBuilder;
import lombok.extern.jackson.Jacksonized;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

@Data
@Setter(AccessLevel.PRIVATE)
@SuperBuilder
Expand All @@ -30,13 +26,4 @@ public class CustomRewardEventSubCondition extends ChannelEventSubCondition {
*/
private String rewardId;

@Override
public Map<String, Object> toMap() {
Map<String, Object> map = new HashMap<>();
map.put("broadcaster_user_id", getBroadcasterUserId());
if (rewardId != null)
map.put("reward_id", this.rewardId);
return Collections.unmodifiableMap(map);
}

}
8 changes: 1 addition & 7 deletions eventsub-common/src/main/java/com/github/twitch4j/eventsub/condition/EventSubCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,5 @@

import lombok.experimental.SuperBuilder;

import java.util.Map;

@SuperBuilder
public abstract class EventSubCondition {

public abstract Map<String, Object> toMap();

}
public abstract class EventSubCondition {}
8 changes: 0 additions & 8 deletions ...ub-common/src/main/java/com/github/twitch4j/eventsub/condition/UserEventSubCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
import lombok.experimental.SuperBuilder;
import lombok.extern.jackson.Jacksonized;

import java.util.Collections;
import java.util.Map;

@Data
@Setter(AccessLevel.PRIVATE)
@SuperBuilder
Expand All @@ -27,9 +24,4 @@ public class UserEventSubCondition extends EventSubCondition {
*/
private String userId;

@Override
public Map<String, Object> toMap() {
return Collections.singletonMap("user_id", this.userId);
}

}
18 changes: 12 additions & 6 deletions ...ommon/src/test/java/com/github/twitch4j/eventsub/util/EventSubConditionConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

@Tag("unittest")
Expand All @@ -27,15 +30,15 @@ public class EventSubConditionConverterTest {
public void convertAppCondition() {
UserAuthorizationRevokeType type = SubscriptionTypes.USER_AUTHORIZATION_REVOKE;
UserAuthorizationRevokeCondition condition = type.getConditionBuilder().clientId(CryptoUtils.generateNonce(30)).build();
test(type, condition);
test(type, condition, Collections.singletonMap("client_id", condition.getClientId()));
}

@Test
@DisplayName("Convert map to channel condition")
public void convertChannelCondition() {
ChannelBanType type = SubscriptionTypes.CHANNEL_BAN;
ChannelBanCondition condition = type.getConditionBuilder().broadcasterUserId("42069").build();
test(type, condition);
test(type, condition, Collections.singletonMap("broadcaster_user_id", condition.getBroadcasterUserId()));
}

@Test
Expand All @@ -46,19 +49,22 @@ public void convertRedemptionCondition() {
.broadcasterUserId("42069")
.rewardId(UUID.randomUUID().toString())
.build();
test(type, condition);
Map<String, Object> map = new HashMap<>();
map.put("broadcaster_user_id", condition.getBroadcasterUserId());
map.put("reward_id", condition.getRewardId());
test(type, condition, map);
}

@Test
@DisplayName("Convert map to user condition")
public void convertUserCondition() {
UserUpdateType type = SubscriptionTypes.USER_UPDATE;
UserUpdateCondition condition = type.getConditionBuilder().userId("1337").build();
test(type, condition);
test(type, condition, Collections.singletonMap("user_id", condition.getUserId()));
}

private static void test(SubscriptionType<?, ?, ?> type, EventSubCondition condition) {
Assertions.assertEquals(condition, EventSubConditionConverter.getCondition(type, condition.toMap()));
private static void test(SubscriptionType<?, ?, ?> type, EventSubCondition condition, Map<String, Object> map) {
Assertions.assertEquals(condition, EventSubConditionConverter.getCondition(type, map));
}

}