Skip to content

Commit e066a5a

Browse files
committed
[BREAKING] Update ISUPPORT MODES to accurately be int-optional
1 parent 6936e6f commit e066a5a

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/main/java/org/kitteh/irc/client/library/command/ChannelModeCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ public synchronized void execute() {
121121
}
122122
int parameterModesPerLine = -1;
123123
Optional<ISupportParameter.Modes> modes = this.getClient().getServerInfo().getISupportParameter("MODES", ISupportParameter.Modes.class);
124-
if (modes.isPresent()) {
125-
parameterModesPerLine = modes.get().getInteger();
124+
if (modes.isPresent() && modes.get().getInteger().isPresent()) {
125+
parameterModesPerLine = modes.get().getInteger().getAsInt();
126126
}
127127
if (parameterModesPerLine < 1) {
128128
parameterModesPerLine = ChannelModeCommand.PARAMETER_MODES_PER_LINE;

src/main/java/org/kitteh/irc/client/library/defaults/element/isupport/DefaultISupportModes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
/**
3232
* Default implementation of {@link ISupportParameter.Modes}.
3333
*/
34-
public class DefaultISupportModes extends DefaultISupportParameterInteger implements ISupportParameter.Modes {
34+
public class DefaultISupportModes extends DefaultISupportParameterOptionalInteger implements ISupportParameter.Modes {
3535
/**
3636
* Constructs the object.
3737
*

src/main/java/org/kitteh/irc/client/library/element/ISupportParameter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ interface KickLen extends IntegerParameter {
364364
/**
365365
* Represents the number of modes with parameters allowed per line.
366366
*/
367-
interface Modes extends IntegerParameter {
367+
interface Modes extends OptionalIntegerParameter {
368368
/**
369369
* Parameter name.
370370
*/

src/test/java/org/kitteh/irc/client/library/command/ChannelModeCommandTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.mockito.Mockito;
1717

1818
import java.util.Optional;
19+
import java.util.OptionalInt;
1920

2021
/**
2122
* @see ChannelModeCommand
@@ -37,7 +38,7 @@ public void before() {
3738
Mockito.when(serverInfo.isValidChannel(Mockito.any())).thenReturn(true);
3839
ISupportParameter.Modes modes = Mockito.mock(ISupportParameter.Modes.class);
3940
Mockito.when(serverInfo.getISupportParameter("MODES", ISupportParameter.Modes.class)).thenReturn(Optional.of(modes));
40-
Mockito.when(modes.getInteger()).thenReturn(3);
41+
Mockito.when(modes.getInteger()).thenReturn(OptionalInt.of(3));
4142
}
4243

4344
@Test

0 commit comments

Comments
 (0)