|
14 | 14 | import java.util.ArrayList; |
15 | 15 | import java.util.Arrays; |
16 | 16 | import java.util.List; |
| 17 | +import java.util.stream.Stream; |
17 | 18 | import javax.annotation.Nonnull; |
18 | 19 | import lombok.AccessLevel; |
19 | 20 | import lombok.Getter; |
@@ -77,15 +78,10 @@ public static class Builder { |
77 | 78 | @Nonnull |
78 | 79 | public DpiMasking withEntities( |
79 | 80 | @Nonnull final DPIEntities entity, @Nonnull final DPIEntities... entities) { |
80 | | - val entitiesList = new ArrayList<DPIEntities>(); |
81 | | - entitiesList.add(entity); |
82 | | - entitiesList.addAll(Arrays.asList(entities)); |
83 | | - |
84 | 81 | val entitiesDTO = |
85 | | - new ArrayList<>( |
86 | | - entitiesList.stream() |
87 | | - .map(it -> (DPIEntityConfig) DPIStandardEntity.create().type(it)) |
88 | | - .toList()); |
| 82 | + Stream.concat(Stream.of(entity), Arrays.stream(entities)) |
| 83 | + .map(it -> (DPIEntityConfig) DPIStandardEntity.create().type(it)) |
| 84 | + .toList(); |
89 | 85 | return new DpiMasking(maskingMethod, entitiesDTO, false, List.of()); |
90 | 86 | } |
91 | 87 |
|
@@ -119,7 +115,15 @@ public DpiMasking withRegex(@Nonnull final String regex, @Nonnull final String r |
119 | 115 | */ |
120 | 116 | @Nonnull |
121 | 117 | public DpiMasking withRegex(@Nonnull final String regex, @Nonnull final String replacement) { |
122 | | - return new DpiMasking(maskingMethod, entitiesDTO, maskGroundingInput, allowList); |
| 118 | + val newEntities = new ArrayList<>(entitiesDTO); |
| 119 | + newEntities.add( |
| 120 | + DPICustomEntity.create() |
| 121 | + .regex(regex) |
| 122 | + .replacementStrategy( |
| 123 | + DPIMethodConstant.create() |
| 124 | + .method(DPIMethodConstant.MethodEnum.CONSTANT) |
| 125 | + .value(replacement))); |
| 126 | + return new DpiMasking(maskingMethod, newEntities, maskGroundingInput, allowList); |
123 | 127 | } |
124 | 128 |
|
125 | 129 | /** |
|
0 commit comments