Skip to content
Snippets Groups Projects
Commit 2758985c authored by Felix Reichenbach's avatar Felix Reichenbach
Browse files

OZG-7609 apply code review changes

parent 2cd97ee5
No related branches found
No related tags found
1 merge request!12OZG-7609 load configurations from config server
Show whitespace changes
Inline Side-by-side
src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java
+ 4
− 5
View file @ 2758985c
......@@ -72,7 +72,7 @@ public class JSLTransformationService implements TransformationService {
return JSLTransformation.builder()
.vorgangMapper(vorgangMapper)
.objectMapper(objectMapper)
.identifier(transformToDotExpression(identifier))
.identifier(transformToAbstractNode(identifier))
.script(createExpression(transformToMap(getFieldMappings(mapping))))
.build();
}
......@@ -93,7 +93,7 @@ public class JSLTransformationService implements TransformationService {
}
Optional<PairExpression> toPairExpression(Map.Entry<String, String> mapping) {
return transformToDotExpression(mapping.getValue()).map(path -> buildPairExpression(mapping.getKey(), path));
return transformToAbstractNode(mapping.getValue()).map(path -> buildPairExpression(mapping.getKey(), path));
}
ObjectExpression buildObjectExpression(PairExpression... fields) {
......@@ -104,7 +104,7 @@ public class JSLTransformationService implements TransformationService {
return new PairExpression(new LiteralExpression(new TextNode(key), null), expression, null);
}
Optional<AbstractNode> transformToDotExpression(String path) {
Optional<AbstractNode> transformToAbstractNode(String path) {
if (path == null) {
return Optional.empty();
} else {
......@@ -125,8 +125,7 @@ public class JSLTransformationService implements TransformationService {
private AbstractNode getNodeForListElement(AbstractNode current, Matcher arrayMatcher) {
var index = Integer.parseInt(arrayMatcher.group(2));
var name = arrayMatcher.group(1);
current = slicer(current, name, index);
return current;
return slicer(current, name, index);
}
private ArraySlicer slicer(AbstractNode parent, String field, int index) {
......
src/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationServiceTest.java
+ 14
− 14
View file @ 2758985c
......@@ -84,7 +84,7 @@ class JSLTransformationServiceTest {
void mock() {
doReturn(mapping).when(service).transformToMap(any());
doReturn(expression).when(service).createExpression(any());
doReturn(identifierExpression).when(service).transformToDotExpression(any());
doReturn(identifierExpression).when(service).transformToAbstractNode(any());
}
@Test
......@@ -126,7 +126,7 @@ class JSLTransformationServiceTest {
void mock() {
doReturn(mapping).when(service).transformToMap(any());
doReturn(expression).when(service).createExpression(any());
doReturn(identifierExpression).when(service).transformToDotExpression(any());
doReturn(identifierExpression).when(service).transformToAbstractNode(any());
}
@Test
......@@ -277,7 +277,7 @@ class JSLTransformationServiceTest {
@Test
void shouldMapProperty() {
var expression = service.transformToDotExpression("vorgangName");
var expression = service.transformToAbstractNode("vorgangName");
var mapped = expression.get().apply(Scope.getRoot(2), getVorgangTree());
assertThat(mapped).hasToString("\"%s\"".formatted(OzgCloudVorgangTestFactory.VORGANG_NAME));
......@@ -286,7 +286,7 @@ class JSLTransformationServiceTest {
@Test
void shouldMapNestedProperty() {
var expression = service.transformToDotExpression("header.aktenzeichen");
var expression = service.transformToAbstractNode("header.aktenzeichen");
var mapped = expression.get().apply(Scope.getRoot(2), getVorgangTree());
assertThat(mapped).hasToString("\"%s\"".formatted(OzgCloudVorgangHeaderTestFactory.AKTENZEICHEN));
......@@ -295,7 +295,7 @@ class JSLTransformationServiceTest {
@Test
void shouldMapListElement() {
var expression = service.transformToDotExpression("eingangs[0]");
var expression = service.transformToAbstractNode("eingangs[0]");
var mapped = expression.get().apply(Scope.getRoot(2), getVorgangTree());
......@@ -305,7 +305,7 @@ class JSLTransformationServiceTest {
@Test
void shouldMapListElementProperty() {
var expression = service.transformToDotExpression("eingangs[0].header.formEngineName");
var expression = service.transformToAbstractNode("eingangs[0].header.formEngineName");
var mapped = expression.get().apply(Scope.getRoot(2), getVorgangTree());
......@@ -336,7 +336,7 @@ class JSLTransformationServiceTest {
@BeforeEach
void mock() {
doReturn(Optional.of(dotExpression)).when(service).transformToDotExpression(any());
doReturn(Optional.of(dotExpression)).when(service).transformToAbstractNode(any());
doReturn(pairExpression).when(service).buildPairExpression(any(), any());
}
......@@ -361,7 +361,7 @@ class JSLTransformationServiceTest {
@BeforeEach
void mock() {
doReturn(Optional.empty()).when(service).transformToDotExpression(any());
doReturn(Optional.empty()).when(service).transformToAbstractNode(any());
}
@Test
......@@ -379,18 +379,18 @@ class JSLTransformationServiceTest {
}
@Nested
class TestTransformToDotExpression {
class TestTransformToAbstractNode {
@Test
void shouldReturnEmptyOnNullPath() {
var dotExpression = service.transformToDotExpression(null);
var dotExpression = service.transformToAbstractNode(null);
assertThat(dotExpression).isEmpty();
}
@Test
void shouldMapProperty() {
var expression = service.transformToDotExpression("vorgangName");
var expression = service.transformToAbstractNode("vorgangName");
var mapped = expression.get().apply(Scope.getRoot(2), getVorgangTree());
assertThat(mapped).hasToString("\"%s\"".formatted(OzgCloudVorgangTestFactory.VORGANG_NAME));
......@@ -399,7 +399,7 @@ class JSLTransformationServiceTest {
@Test
void shouldMapNestedProperty() {
var expression = service.transformToDotExpression("header.aktenzeichen");
var expression = service.transformToAbstractNode("header.aktenzeichen");
var mapped = expression.get().apply(Scope.getRoot(2), getVorgangTree());
assertThat(mapped).hasToString("\"%s\"".formatted(OzgCloudVorgangHeaderTestFactory.AKTENZEICHEN));
......@@ -408,7 +408,7 @@ class JSLTransformationServiceTest {
@Test
void shouldMapListElement() {
var expression = service.transformToDotExpression("eingangs[0]");
var expression = service.transformToAbstractNode("eingangs[0]");
var mapped = expression.get().apply(Scope.getRoot(2), getVorgangTree());
......@@ -418,7 +418,7 @@ class JSLTransformationServiceTest {
@Test
void shouldMapListElementProperty() {
var expression = service.transformToDotExpression("eingangs[0].header.formEngineName");
var expression = service.transformToAbstractNode("eingangs[0].header.formEngineName");
var mapped = expression.get().apply(Scope.getRoot(2), getVorgangTree());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit