fix lombok builders (#123)

roc-streaming · Jun 10, 2023 · 21ecc17 · 21ecc17
1 parent 2cae0e8
commit 21ecc17
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/src/main/java/org/rocstreaming/roctoolkit/RocContextConfig.java b/src/main/java/org/rocstreaming/roctoolkit/RocContextConfig.java
@@ -10,7 +10,7 @@
  * @see RocContext
  */
 @Getter
-@Builder(builderClassName = "ConfigBuilder", toBuilder = true, access = AccessLevel.PROTECTED)
+@Builder(builderClassName = "Builder", toBuilder = true)
 @ToString
 @EqualsAndHashCode
 public class RocContextConfig {
@@ -34,11 +34,11 @@ public class RocContextConfig {
      */
     private int maxFrameSize;
 
-    public static ConfigBuilder builder() {
+    public static RocContextConfig.Builder builder() {
         return new ValidationBuilder();
     }
 
-    private static class ValidationBuilder extends ConfigBuilder {
+    private static class ValidationBuilder extends RocContextConfig.Builder {
         @Override
         public RocContextConfig build() {
             Check.notNegative(super.maxPacketSize, "maxPacketSize");

diff --git a/src/main/java/org/rocstreaming/roctoolkit/RocReceiverConfig.java b/src/main/java/org/rocstreaming/roctoolkit/RocReceiverConfig.java
@@ -10,7 +10,7 @@
  * @see RocReceiver
  */
 @Getter
-@Builder(builderClassName = "ConfigBuilder", toBuilder = true, access = AccessLevel.PROTECTED)
+@Builder(builderClassName = "Builder", toBuilder = true)
 @ToString
 @EqualsAndHashCode
 public class RocReceiverConfig {
@@ -124,16 +124,14 @@ public class RocReceiverConfig {
      * Breakage detection window, in nanoseconds.
      * If zero or unset, default value is used.
      * Should not be negative.
-     *
-     * @see ConfigBuilder#brokenPlaybackTimeout
      */
     private long breakageDetectionWindow;
 
-    public static ConfigBuilder builder() {
+    public static RocReceiverConfig.Builder builder() {
         return new ValidationBuilder();
     }
 
-    private static class ValidationBuilder extends ConfigBuilder {
+    private static class ValidationBuilder extends RocReceiverConfig.Builder {
         @Override
         public RocReceiverConfig build() {
             Check.notNegative(super.frameSampleRate, "frameSampleRate");

diff --git a/src/main/java/org/rocstreaming/roctoolkit/RocSenderConfig.java b/src/main/java/org/rocstreaming/roctoolkit/RocSenderConfig.java
@@ -10,7 +10,7 @@
  * @see RocSender
  */
 @Getter
-@Builder(builderClassName = "ConfigBuilder", toBuilder = true, access = AccessLevel.PROTECTED)
+@Builder(builderClassName = "Builder", toBuilder = true)
 @ToString
 @EqualsAndHashCode
 public class RocSenderConfig {
@@ -121,11 +121,11 @@ public class RocSenderConfig {
      */
     private int fecBlockRepairPackets;
 
-    public static ConfigBuilder builder() {
+    public static RocSenderConfig.Builder builder() {
         return new ValidationBuilder();
     }
 
-    private static class ValidationBuilder extends ConfigBuilder {
+    private static class ValidationBuilder extends RocSenderConfig.Builder {
         @Override
         public RocSenderConfig build() {
             Check.notNegative(super.frameSampleRate, "frameSampleRate");

diff --git a/src/test/java/org/rocstreaming/roctoolkit/RocContextConfigTest.java b/src/test/java/org/rocstreaming/roctoolkit/RocContextConfigTest.java
@@ -20,7 +20,7 @@ private static Stream<Arguments> testInvalidConfigArguments() {
 
     @ParameterizedTest
     @MethodSource("testInvalidConfigArguments")
-    public void testInvalidConfig(String error, RocContextConfig.ConfigBuilder builder) {
+    public void testInvalidConfig(String error, RocContextConfig.Builder builder) {
         Exception e = assertThrows(IllegalArgumentException.class, builder::build);
         assertEquals(error, e.getMessage());
     }

diff --git a/src/test/java/org/rocstreaming/roctoolkit/RocReceiverConfigTest.java b/src/test/java/org/rocstreaming/roctoolkit/RocReceiverConfigTest.java
@@ -10,7 +10,7 @@
 
 class RocReceiverConfigTest {
 
-    private static RocReceiverConfig.ConfigBuilder validBuilder() {
+    private static RocReceiverConfig.Builder validBuilder() {
         return RocReceiverConfig.builder()
                 .frameSampleRate(44100)
                 .frameChannels(ChannelSet.STEREO)
@@ -31,7 +31,7 @@ private static Stream<Arguments> testInvalidConfigArguments() {
 
     @ParameterizedTest()
     @MethodSource("testInvalidConfigArguments")
-    public void testInvalidConfig(String error, RocReceiverConfig.ConfigBuilder builder) {
+    public void testInvalidConfig(String error, RocReceiverConfig.Builder builder) {
         Exception e = assertThrows(IllegalArgumentException.class, builder::build);
         assertEquals(error, e.getMessage());
     }

diff --git a/src/test/java/org/rocstreaming/roctoolkit/RocSenderConfigTest.java b/src/test/java/org/rocstreaming/roctoolkit/RocSenderConfigTest.java
@@ -12,7 +12,7 @@
 class RocSenderConfigTest {
 
 
-    private static RocSenderConfig.ConfigBuilder validBuilder() {
+    private static RocSenderConfig.Builder validBuilder() {
         return RocSenderConfig.builder()
                 .frameSampleRate(44100)
                 .frameChannels(ChannelSet.STEREO)
@@ -33,7 +33,7 @@ private static Stream<Arguments> testInvalidConfigArguments() {
 
     @ParameterizedTest()
     @MethodSource("testInvalidConfigArguments")
-    public void testInvalidConfig(String error, RocSenderConfig.ConfigBuilder builder) {
+    public void testInvalidConfig(String error, RocSenderConfig.Builder builder) {
         Exception e = assertThrows(IllegalArgumentException.class, builder::build);
         assertEquals(error, e.getMessage());
     }