Merge pull request #13 from Gikkman/dev-0.5

Dev 0.4.1

Author: Gikkman

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.gikk</groupId>
   <artifactId>twirc</artifactId>
-  <version>0.4</version>
+  <version>0.4.1</version>
   <packaging>jar</packaging>
 
   <name>twirc</name>

src/main/java/com/gikk/twirk/Twirk.java

@@ -11,7 +11,6 @@
 import com.gikk.twirk.types.notice.NoticeBuilder;
 import com.gikk.twirk.types.roomstate.Roomstate;
 import com.gikk.twirk.types.roomstate.RoomstateBuilder;
-import com.gikk.twirk.types.subscriberEvent.SubscriberEventBuilder;
 import com.gikk.twirk.types.twitchMessage.TwitchMessage;
 import com.gikk.twirk.types.twitchMessage.TwitchMessageBuilder;
 import com.gikk.twirk.types.usernotice.Usernotice;
@@ -89,7 +88,6 @@ public final class Twirk {
 	private final TwitchMessageBuilder 	twitchMessageBuilder;
 	private final TwitchUserBuilder 	twitchUserBuilder;
 	private final UserstateBuilder 		userstateBuilder;
-	private final SubscriberEventBuilder subscriberBuilder;
 	private final UsernoticeBuilder		usernoticeBuilder;;
 	private final Socket socket;
 
@@ -110,7 +108,6 @@ public final class Twirk {
 		this.twitchUserBuilder= builder.getTwitchUserBuilder();
 		this.userstateBuilder = builder.getUserstateBuilder();
 		this.twitchMessageBuilder = builder.getTwitchMessageBuilder();
-		this.subscriberBuilder= builder.getSubscriberEventBuilder();
 		this.usernoticeBuilder= builder.getUsernoticeBuilder();
 
         this.socket = builder.getSocket();

src/main/java/com/gikk/twirk/TwirkBuilder.java

@@ -5,7 +5,6 @@
 import com.gikk.twirk.types.mode.ModeBuilder;
 import com.gikk.twirk.types.notice.NoticeBuilder;
 import com.gikk.twirk.types.roomstate.RoomstateBuilder;
-import com.gikk.twirk.types.subscriberEvent.SubscriberEventBuilder;
 import com.gikk.twirk.types.twitchMessage.TwitchMessageBuilder;
 import com.gikk.twirk.types.usernotice.UsernoticeBuilder;
 import com.gikk.twirk.types.users.TwitchUserBuilder;
@@ -48,7 +47,6 @@ public class TwirkBuilder {
 	private TwitchMessageBuilder twitchMessageBuilder;
 	private TwitchUserBuilder 	twitchUserBuilder;
 	private UserstateBuilder 	userstateBuilder;
-	private SubscriberEventBuilder subEventBuilder;
 	private UsernoticeBuilder	usernoticeBuilder;
     private Socket              socket;
 
@@ -205,17 +203,6 @@ public TwirkBuilder setUserstateBuilder(UserstateBuilder userstateBuilder) {
 		return this;
 	}
 
-	/**Sets the {@link SubscriberEventBuilder}. Useful if you want to use your custom implementations of a {@link SubscriberEventBuilder}. If
-	 * no {@link SubscriberEventBuilder} is assigned, the created {@link Twirk} object will use the default implementation.
-	 *
-	 * @param subEventBuilder The {@link SubscriberEventBuilder} you want the {@link Twirk} object to use
-	 * @return this
-	 */
-	public TwirkBuilder setSubscriberEventBuilder(SubscriberEventBuilder subEventBuilder) {
-		this.subEventBuilder = subEventBuilder;
-		return this;
-	}
-
     /**Sets the {@link Socket}. Useful if you want to use your custom implementations of a {@link Socket}. If
 	 * no {@link Socket} is assigned, the created {@link Twirk} object will chose a suitable {@link Socket} implementation.
 	 *
@@ -291,14 +278,6 @@ public UserstateBuilder getUserstateBuilder() {
 		return userstateBuilder != null ? userstateBuilder : UserstateBuilder.getDefault();
 	}
 
-	/**Retrieves the assigned {@link SubscriberEventBuilder}, or the default one, if none is assigned.
-	 *
-	 * @return This builders current {@link SubscriberEventBuilder}
-	 */
-	public SubscriberEventBuilder getSubscriberEventBuilder() {
-		return subEventBuilder != null ? subEventBuilder : SubscriberEventBuilder.getDefault();
-	}
-
 	/**Retrieves the assigned {@link UsernoticeBuilder}, or the default one, if none is assigned.
 	 *
 	 * @return This builders current {@link UsernoticeBuilder}

src/main/java/com/gikk/twirk/types/subscriberEvent/DefaultSubscriberEventBuilder.java

@@ -8,7 +8,7 @@
 import static org.junit.Assert.*;
 
 public class TestMessage {
-    final static String USER_MESSAGE_NO_EMOTE = "@badges=;color=;display-name=Gikkman;emotes=;mod=0;room-id=31974228;subscriber=0;turbo=0;user-id=27658385;user-type= :gikkman!gikkman@gikkman.tmi.twitch.tv PRIVMSG #gikkman :userMessage";
+    final static String USER_MESSAGE_NO_EMOTE = "@badges=;color=;display-name=Gikkman;emotes=;mod=0;room-id=31974228;subscriber=0;turbo=0;user-id=27658385;user-type= :gikkman!gikkman@gikkman.tmi.twitch.tv PRIVMSG #gikkman :userMessage 조선말";
     final static String USER_MESSAGE_WITH_EMOTE = "@badges=;color=#FF69B4;display-name=Gikklol;emotes=86:10-19;mod=0;room-id=31974228;subscriber=0;turbo=0;user-id=27658385;user-type= :gikklol!gikklol@gikklol.tmi.twitch.tv PRIVMSG #gikkman :beefin it BibleThump";
 
     public static void testPrivMsg(Consumer<String> twirkInput, TestBiConsumer<TwitchUser, TwitchMessage> test ) throws Exception{
@@ -22,7 +22,7 @@ public static void testPrivMsg(Consumer<String> twirkInput, TestBiConsumer<Twitc
 	}
 
     private static boolean testUserMessageNoEmote(TwitchUser user, TwitchMessage msg){
-        runPrivMsgTest(msg, "userMessage", false, ":gikkman!gikkman@gikkman.tmi.twitch.tv");
+        runPrivMsgTest(msg, "userMessage 조선말", false, ":gikkman!gikkman@gikkman.tmi.twitch.tv");
         System.out.println("--- --- Regular Message No Emotes OK");
         return true;
     }