chore: Remove redundants yield and chain assertions

ludovicianul · ludovicianul · commit 6507b16fab46 · 2026-03-05T20:32:47.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+dochia
 *.tape
 *.iml
 .idea
diff --git a/src/main/java/dev/dochia/cli/core/generator/format/impl/LicensePlateGenerator.java b/src/main/java/dev/dochia/cli/core/generator/format/impl/LicensePlateGenerator.java
@@ -21,24 +21,16 @@ public class LicensePlateGenerator implements ValidDataFormatGenerator, InvalidD
     public Object generate(Schema<?> schema) {
         // Generate license plate in various formats
         int format = CommonUtils.random().nextInt(4);
-        
+
         return switch (format) {
-            case 0 -> {
-                // US format: ABC-1234
-                yield generateLetters(3) + "-" + generateNumbers(4);
-            }
-            case 1 -> {
-                // US format: 1ABC234
-                yield generateNumbers(1) + generateLetters(3) + generateNumbers(3);
-            }
-            case 2 -> {
-                // EU format: AB-123-CD
-                yield generateLetters(2) + "-" + generateNumbers(3) + "-" + generateLetters(2);
-            }
-            default -> {
-                // Simple format: ABC1234
-                yield generateLetters(3) + generateNumbers(4);
-            }
+            case 0 -> // US format: ABC-1234
+                    generateLetters(3) + "-" + generateNumbers(4);
+            case 1 -> // US format: 1ABC234
+                    generateNumbers(1) + generateLetters(3) + generateNumbers(3);
+            case 2 -> // EU format: AB-123-CD
+                    generateLetters(2) + "-" + generateNumbers(3) + "-" + generateLetters(2);
+            default -> // Simple format: ABC1234
+                    generateLetters(3) + generateNumbers(4);
         };
     }
 
diff --git a/src/main/java/dev/dochia/cli/core/generator/format/impl/MedicalRecordNumberGenerator.java b/src/main/java/dev/dochia/cli/core/generator/format/impl/MedicalRecordNumberGenerator.java
@@ -21,16 +21,12 @@ public class MedicalRecordNumberGenerator implements ValidDataFormatGenerator, I
     public Object generate(Schema<?> schema) {
         // Generate MRN in common healthcare formats
         int format = CommonUtils.random().nextInt(3);
-        
+
         return switch (format) {
-            case 0 -> {
-                // Format: MRN-1234567
-                yield "MRN-" + String.format("%07d", CommonUtils.random().nextInt(10000000));
-            }
-            case 1 -> {
-                // Format: 12345678 (8 digits)
-                yield String.format("%08d", CommonUtils.random().nextInt(100000000));
-            }
+            case 0 -> // Format: MRN-1234567
+                    "MRN-" + String.format("%07d", CommonUtils.random().nextInt(10000000));
+            case 1 -> // Format: 12345678 (8 digits)
+                    String.format("%08d", CommonUtils.random().nextInt(100000000));
             default -> {
                 // Format: A12345678 (letter + 8 digits)
                 String letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
diff --git a/src/main/java/dev/dochia/cli/core/generator/format/impl/OrderNumberGenerator.java b/src/main/java/dev/dochia/cli/core/generator/format/impl/OrderNumberGenerator.java
@@ -21,16 +21,14 @@ public class OrderNumberGenerator implements ValidDataFormatGenerator, InvalidDa
     public Object generate(Schema<?> schema) {
         // Generate order number in e-commerce format
         int format = CommonUtils.random().nextInt(3);
-        
+
         return switch (format) {
             case 0 -> "ORD-" + System.currentTimeMillis(); // ORD-1234567890123
-            case 1 -> {
-                // Amazon-style: 123-1234567-1234567
-                yield String.format("%03d-%07d-%07d",
-                        CommonUtils.random().nextInt(1000),
-                        CommonUtils.random().nextInt(10000000),
-                        CommonUtils.random().nextInt(10000000));
-            }
+            case 1 -> // Amazon-style: 123-1234567-1234567
+                    String.format("%03d-%07d-%07d",
+                            CommonUtils.random().nextInt(1000),
+                            CommonUtils.random().nextInt(10000000),
+                            CommonUtils.random().nextInt(10000000));
             default -> {
                 // Alphanumeric: AB12CD34EF56
                 String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
diff --git a/src/main/java/dev/dochia/cli/core/generator/format/impl/PolicyNumberGenerator.java b/src/main/java/dev/dochia/cli/core/generator/format/impl/PolicyNumberGenerator.java
@@ -21,12 +21,10 @@ public class PolicyNumberGenerator implements ValidDataFormatGenerator, InvalidD
     public Object generate(Schema<?> schema) {
         // Generate insurance policy number in various formats
         int format = CommonUtils.random().nextInt(3);
-        
+
         return switch (format) {
-            case 0 -> {
-                // Format: POL-12345678
-                yield "POL-" + String.format("%08d", CommonUtils.random().nextInt(100000000));
-            }
+            case 0 -> // Format: POL-12345678
+                    "POL-" + String.format("%08d", CommonUtils.random().nextInt(100000000));
             case 1 -> {
                 // Format: AB-1234-5678-90
                 String letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -37,10 +35,8 @@ public Object generate(Schema<?> schema) {
                                 CommonUtils.random().nextInt(10000),
                                 CommonUtils.random().nextInt(100));
             }
-            default -> {
-                // Format: 123456789012 (12 digits)
-                yield String.format("%012d", CommonUtils.random().nextLong(1000000000000L));
-            }
+            default -> // Format: 123456789012 (12 digits)
+                    String.format("%012d", CommonUtils.random().nextLong(1000000000000L));
         };
     }
 
diff --git a/src/main/java/dev/dochia/cli/core/generator/format/impl/SKUGenerator.java b/src/main/java/dev/dochia/cli/core/generator/format/impl/SKUGenerator.java
@@ -31,10 +31,8 @@ public Object generate(Schema<?> schema) {
                         CommonUtils.selectRandom(List.of(brands)) + "-" +
                         String.format("%05d", CommonUtils.random().nextInt(100000));
             }
-            case 1 -> {
-                // Simple numeric with prefix: SKU-123456
-                yield "SKU-" + String.format("%06d", CommonUtils.random().nextInt(1000000));
-            }
+            case 1 -> // Simple numeric with prefix: SKU-123456
+                    "SKU-" + String.format("%06d", CommonUtils.random().nextInt(1000000));
             default -> {
                 // Alphanumeric: AB12-CD34-EF56
                 String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
diff --git a/src/main/java/dev/dochia/cli/core/generator/format/impl/TrackingNumberGenerator.java b/src/main/java/dev/dochia/cli/core/generator/format/impl/TrackingNumberGenerator.java
@@ -22,25 +22,17 @@ public class TrackingNumberGenerator implements ValidDataFormatGenerator, Invali
     public Object generate(Schema<?> schema) {
         // Generate tracking number in various carrier formats
         int format = CommonUtils.random().nextInt(4);
-        
+
         return switch (format) {
-            case 0 -> {
-                // UPS format: 1Z999AA10123456784
-                yield "1Z" + generateAlphanumeric(6, true).toUpperCase(Locale.ROOT) + generateNumeric(10);
-            }
-            case 1 -> {
-                // FedEx format: 123456789012
-                yield generateNumeric(12);
-            }
-            case 2 -> {
-                // USPS format: 9400 1000 0000 0000 0000 00
-                yield "9400" + generateNumeric(4) + generateNumeric(4) + generateNumeric(4) + 
-                        generateNumeric(4) + generateNumeric(2);
-            }
-            default -> {
-                // DHL format: 1234567890
-                yield generateNumeric(10);
-            }
+            case 0 -> // UPS format: 1Z999AA10123456784
+                    "1Z" + generateAlphanumeric(6, true).toUpperCase(Locale.ROOT) + generateNumeric(10);
+            case 1 -> // FedEx format: 123456789012
+                    generateNumeric(12);
+            case 2 -> // USPS format: 9400 1000 0000 0000 0000 00
+                    "9400" + generateNumeric(4) + generateNumeric(4) + generateNumeric(4) +
+                            generateNumeric(4) + generateNumeric(2);
+            default -> // DHL format: 1234567890
+                    generateNumeric(10);
         };
     }
 
diff --git a/src/test/java/dev/dochia/cli/core/generator/format/impl/Base64GeneratorTest.java b/src/test/java/dev/dochia/cli/core/generator/format/impl/Base64GeneratorTest.java
@@ -43,7 +43,6 @@ void givenABase64FormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenThe
     @Test
     void givenABase64FormatGeneratorStrategy_whenGenerating_thenValidBase64IsReturned() {
         String generated = (String) base64Generator.generate(null);
-        Assertions.assertThat(generated).isNotNull();
-        Assertions.assertThat(generated).matches("^[A-Za-z0-9+/]+=*$");
+        Assertions.assertThat(generated).isNotNull().matches("^[A-Za-z0-9+/]+=*$");
     }
 }
diff --git a/src/test/java/dev/dochia/cli/core/generator/format/impl/HexColorGeneratorTest.java b/src/test/java/dev/dochia/cli/core/generator/format/impl/HexColorGeneratorTest.java
@@ -45,7 +45,6 @@ void givenAHexColorFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenT
     @Test
     void givenAHexColorFormatGeneratorStrategy_whenGenerating_thenValidHexColorIsReturned() {
         String generated = (String) hexColorGenerator.generate(null);
-        Assertions.assertThat(generated).isNotNull();
-        Assertions.assertThat(generated).matches("^#[0-9A-F]{6}$");
+        Assertions.assertThat(generated).isNotNull().matches("^#[0-9A-F]{6}$");
     }
 }
diff --git a/src/test/java/dev/dochia/cli/core/generator/format/impl/LatLongGeneratorTest.java b/src/test/java/dev/dochia/cli/core/generator/format/impl/LatLongGeneratorTest.java
@@ -47,7 +47,6 @@ void givenALatLongFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenTh
     @Test
     void givenALatLongFormatGeneratorStrategy_whenGenerating_thenValidCoordinateIsReturned() {
         String generated = (String) latLongGenerator.generate(null);
-        Assertions.assertThat(generated).isNotNull();
-        Assertions.assertThat(generated).containsPattern("-?\\d+\\.\\d+");
+        Assertions.assertThat(generated).isNotNull().containsPattern("-?\\d+\\.\\d+");
     }
 }
diff --git a/src/test/java/dev/dochia/cli/core/generator/format/impl/MACAddressGeneratorTest.java b/src/test/java/dev/dochia/cli/core/generator/format/impl/MACAddressGeneratorTest.java
@@ -44,7 +44,6 @@ void givenAMACAddressFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_the
     @Test
     void givenAMACAddressFormatGeneratorStrategy_whenGenerating_thenValidMACAddressIsReturned() {
         String generated = (String) macAddressGenerator.generate(null);
-        Assertions.assertThat(generated).isNotNull();
-        Assertions.assertThat(generated).matches("^([0-9A-F]{2}:){5}[0-9A-F]{2}$");
+        Assertions.assertThat(generated).isNotNull().matches("^([0-9A-F]{2}:){5}[0-9A-F]{2}$");
     }
 }
diff --git a/src/test/java/dev/dochia/cli/core/generator/format/impl/MimeTypeGeneratorTest.java b/src/test/java/dev/dochia/cli/core/generator/format/impl/MimeTypeGeneratorTest.java
@@ -44,7 +44,6 @@ void givenAMimeTypeFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenT
     @Test
     void givenAMimeTypeFormatGeneratorStrategy_whenGenerating_thenValidMimeTypeIsReturned() {
         String generated = (String) mimeTypeGenerator.generate(null);
-        Assertions.assertThat(generated).isNotNull();
-        Assertions.assertThat(generated).contains("/");
+        Assertions.assertThat(generated).isNotNull().contains("/");
     }
 }
diff --git a/src/test/java/dev/dochia/cli/core/generator/format/impl/SemVerGeneratorTest.java b/src/test/java/dev/dochia/cli/core/generator/format/impl/SemVerGeneratorTest.java
@@ -44,7 +44,6 @@ void givenASemVerFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenThe
     @Test
     void givenASemVerFormatGeneratorStrategy_whenGenerating_thenValidSemVerIsReturned() {
         String generated = (String) semVerGenerator.generate(null);
-        Assertions.assertThat(generated).isNotNull();
-        Assertions.assertThat(generated).containsPattern("\\d+\\.\\d+\\.\\d+");
+        Assertions.assertThat(generated).isNotNull().containsPattern("\\d+\\.\\d+\\.\\d+");
     }
 }
diff --git a/src/test/java/dev/dochia/cli/core/generator/format/impl/TaxIdGeneratorTest.java b/src/test/java/dev/dochia/cli/core/generator/format/impl/TaxIdGeneratorTest.java
@@ -44,7 +44,6 @@ void givenATaxIdFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenTheV
     @Test
     void givenATaxIdFormatGeneratorStrategy_whenGenerating_thenValidTaxIdIsReturned() {
         String generated = (String) taxIdGenerator.generate(null);
-        Assertions.assertThat(generated).isNotNull();
-        Assertions.assertThat(generated).matches("\\d{2}-\\d{7}");
+        Assertions.assertThat(generated).isNotNull().matches("\\d{2}-\\d{7}");
     }
 }
diff --git a/src/test/java/dev/dochia/cli/core/generator/format/impl/VATNumberGeneratorTest.java b/src/test/java/dev/dochia/cli/core/generator/format/impl/VATNumberGeneratorTest.java
@@ -43,7 +43,6 @@ void givenAVATNumberFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_then
     @Test
     void givenAVATNumberFormatGeneratorStrategy_whenGenerating_thenValidVATNumberIsReturned() {
         String generated = (String) vatNumberGenerator.generate(null);
-        Assertions.assertThat(generated).isNotNull();
-        Assertions.assertThat(generated).matches("[A-Z]{2}\\d{8,10}");
+        Assertions.assertThat(generated).isNotNull().matches("[A-Z]{2}\\d{8,10}");
     }
 }
diff --git a/src/test/java/dev/dochia/cli/core/generator/format/impl/VINGeneratorTest.java b/src/test/java/dev/dochia/cli/core/generator/format/impl/VINGeneratorTest.java
@@ -44,7 +44,6 @@ void givenAVINFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenTheVal
     void givenAVINFormatGeneratorStrategy_whenGenerating_thenValidVINIsReturned() {
         String generated = (String) vinGenerator.generate(null);
         Assertions.assertThat(generated).isNotNull();
-        Assertions.assertThat(generated).hasSize(17);
-        Assertions.assertThat(generated).matches("[A-HJ-NPR-Z0-9]{17}");
+        Assertions.assertThat(generated).hasSize(17).matches("[A-HJ-NPR-Z0-9]{17}");
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+dochia`
`1`	`2`	`*.tape`
`2`	`3`	`*.iml`
`3`	`4`	`.idea`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ void givenABase64FormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenThe`
`43`	`43`	`@Test`
`44`	`44`	`void givenABase64FormatGeneratorStrategy_whenGenerating_thenValidBase64IsReturned() {`
`45`	`45`	`String generated = (String) base64Generator.generate(null);`
`46`		`- Assertions.assertThat(generated).isNotNull();`
`47`		`- Assertions.assertThat(generated).matches("^[A-Za-z0-9+/]+=*$");`
	`46`	`+ Assertions.assertThat(generated).isNotNull().matches("^[A-Za-z0-9+/]+=*$");`
`48`	`47`	`}`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ void givenAHexColorFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenT`
`45`	`45`	`@Test`
`46`	`46`	`void givenAHexColorFormatGeneratorStrategy_whenGenerating_thenValidHexColorIsReturned() {`
`47`	`47`	`String generated = (String) hexColorGenerator.generate(null);`
`48`		`- Assertions.assertThat(generated).isNotNull();`
`49`		`- Assertions.assertThat(generated).matches("^#[0-9A-F]{6}$");`
	`48`	`+ Assertions.assertThat(generated).isNotNull().matches("^#[0-9A-F]{6}$");`
`50`	`49`	`}`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ void givenALatLongFormatGeneratorStrategy_whenGettingTheTotallyWrongValue_thenTh`
`47`	`47`	`@Test`
`48`	`48`	`void givenALatLongFormatGeneratorStrategy_whenGenerating_thenValidCoordinateIsReturned() {`
`49`	`49`	`String generated = (String) latLongGenerator.generate(null);`
`50`		`- Assertions.assertThat(generated).isNotNull();`
`51`		`- Assertions.assertThat(generated).containsPattern("-?\\d+\\.\\d+");`
	`50`	`+ Assertions.assertThat(generated).isNotNull().containsPattern("-?\\d+\\.\\d+");`
`52`	`51`	`}`
`53`	`52`	`}`