Skip to content

Commit 21ecc17

Browse files
authored
fix lombok builders (#123)
1 parent 2cae0e8 commit 21ecc17

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

src/main/java/org/rocstreaming/roctoolkit/RocContextConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @see RocContext
1111
*/
1212
@Getter
13-
@Builder(builderClassName = "ConfigBuilder", toBuilder = true, access = AccessLevel.PROTECTED)
13+
@Builder(builderClassName = "Builder", toBuilder = true)
1414
@ToString
1515
@EqualsAndHashCode
1616
public class RocContextConfig {
@@ -34,11 +34,11 @@ public class RocContextConfig {
3434
*/
3535
private int maxFrameSize;
3636

37-
public static ConfigBuilder builder() {
37+
public static RocContextConfig.Builder builder() {
3838
return new ValidationBuilder();
3939
}
4040

41-
private static class ValidationBuilder extends ConfigBuilder {
41+
private static class ValidationBuilder extends RocContextConfig.Builder {
4242
@Override
4343
public RocContextConfig build() {
4444
Check.notNegative(super.maxPacketSize, "maxPacketSize");

src/main/java/org/rocstreaming/roctoolkit/RocReceiverConfig.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @see RocReceiver
1111
*/
1212
@Getter
13-
@Builder(builderClassName = "ConfigBuilder", toBuilder = true, access = AccessLevel.PROTECTED)
13+
@Builder(builderClassName = "Builder", toBuilder = true)
1414
@ToString
1515
@EqualsAndHashCode
1616
public class RocReceiverConfig {
@@ -124,16 +124,14 @@ public class RocReceiverConfig {
124124
* Breakage detection window, in nanoseconds.
125125
* If zero or unset, default value is used.
126126
* Should not be negative.
127-
*
128-
* @see ConfigBuilder#brokenPlaybackTimeout
129127
*/
130128
private long breakageDetectionWindow;
131129

132-
public static ConfigBuilder builder() {
130+
public static RocReceiverConfig.Builder builder() {
133131
return new ValidationBuilder();
134132
}
135133

136-
private static class ValidationBuilder extends ConfigBuilder {
134+
private static class ValidationBuilder extends RocReceiverConfig.Builder {
137135
@Override
138136
public RocReceiverConfig build() {
139137
Check.notNegative(super.frameSampleRate, "frameSampleRate");

src/main/java/org/rocstreaming/roctoolkit/RocSenderConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @see RocSender
1111
*/
1212
@Getter
13-
@Builder(builderClassName = "ConfigBuilder", toBuilder = true, access = AccessLevel.PROTECTED)
13+
@Builder(builderClassName = "Builder", toBuilder = true)
1414
@ToString
1515
@EqualsAndHashCode
1616
public class RocSenderConfig {
@@ -121,11 +121,11 @@ public class RocSenderConfig {
121121
*/
122122
private int fecBlockRepairPackets;
123123

124-
public static ConfigBuilder builder() {
124+
public static RocSenderConfig.Builder builder() {
125125
return new ValidationBuilder();
126126
}
127127

128-
private static class ValidationBuilder extends ConfigBuilder {
128+
private static class ValidationBuilder extends RocSenderConfig.Builder {
129129
@Override
130130
public RocSenderConfig build() {
131131
Check.notNegative(super.frameSampleRate, "frameSampleRate");

src/test/java/org/rocstreaming/roctoolkit/RocContextConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private static Stream<Arguments> testInvalidConfigArguments() {
2020

2121
@ParameterizedTest
2222
@MethodSource("testInvalidConfigArguments")
23-
public void testInvalidConfig(String error, RocContextConfig.ConfigBuilder builder) {
23+
public void testInvalidConfig(String error, RocContextConfig.Builder builder) {
2424
Exception e = assertThrows(IllegalArgumentException.class, builder::build);
2525
assertEquals(error, e.getMessage());
2626
}

src/test/java/org/rocstreaming/roctoolkit/RocReceiverConfigTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class RocReceiverConfigTest {
1212

13-
private static RocReceiverConfig.ConfigBuilder validBuilder() {
13+
private static RocReceiverConfig.Builder validBuilder() {
1414
return RocReceiverConfig.builder()
1515
.frameSampleRate(44100)
1616
.frameChannels(ChannelSet.STEREO)
@@ -31,7 +31,7 @@ private static Stream<Arguments> testInvalidConfigArguments() {
3131

3232
@ParameterizedTest()
3333
@MethodSource("testInvalidConfigArguments")
34-
public void testInvalidConfig(String error, RocReceiverConfig.ConfigBuilder builder) {
34+
public void testInvalidConfig(String error, RocReceiverConfig.Builder builder) {
3535
Exception e = assertThrows(IllegalArgumentException.class, builder::build);
3636
assertEquals(error, e.getMessage());
3737
}

src/test/java/org/rocstreaming/roctoolkit/RocSenderConfigTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class RocSenderConfigTest {
1313

1414

15-
private static RocSenderConfig.ConfigBuilder validBuilder() {
15+
private static RocSenderConfig.Builder validBuilder() {
1616
return RocSenderConfig.builder()
1717
.frameSampleRate(44100)
1818
.frameChannels(ChannelSet.STEREO)
@@ -33,7 +33,7 @@ private static Stream<Arguments> testInvalidConfigArguments() {
3333

3434
@ParameterizedTest()
3535
@MethodSource("testInvalidConfigArguments")
36-
public void testInvalidConfig(String error, RocSenderConfig.ConfigBuilder builder) {
36+
public void testInvalidConfig(String error, RocSenderConfig.Builder builder) {
3737
Exception e = assertThrows(IllegalArgumentException.class, builder::build);
3838
assertEquals(error, e.getMessage());
3939
}

0 commit comments

Comments
 (0)