From adf99bcf2b6eaa52dbfda458160f5c1da1c83898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Enrique=20Garc=C3=ADa=20Maci=C3=B1eiras?= Date: Mon, 20 Nov 2023 09:25:20 +0100 Subject: [PATCH] #384 Codacy issues --- .../kloadgen/processor/SchemaProcessor.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/sngular/kloadgen/processor/SchemaProcessor.java b/src/main/java/com/sngular/kloadgen/processor/SchemaProcessor.java index fecdd6e3..f5409ed1 100644 --- a/src/main/java/com/sngular/kloadgen/processor/SchemaProcessor.java +++ b/src/main/java/com/sngular/kloadgen/processor/SchemaProcessor.java @@ -153,10 +153,7 @@ private Object processNestedComplexTypes(final SchemaProcessorPOJO pojo, final S } return returnObject; } - /* private void makeNonEmptyFieldValueMappingRequiered(final FieldValueMapping fieldValueMapping){ - if () - } -*/ + private void makeFieldValueMappingRequiredAndNotNullable(final FieldValueMapping fieldValueMapping) { makeFieldValueMappingRequired(fieldValueMapping); final List temporalFieldValueList = fieldValueMapping.getFieldValuesList(); @@ -172,13 +169,13 @@ private ArrayDeque calculateFieldsToProcess() { ArrayDeque fieldToProcess; final ArrayDeque initialFieldExpMappingsQueue = new ArrayDeque<>(fieldExprMappings); - fieldToProcess = new ArrayDeque<>(ListUtils.select(fieldExprMappings, fieldValueMapping -> shouldProcessField(fieldValueMapping, initialFieldExpMappingsQueue))); + fieldToProcess = new ArrayDeque<>(ListUtils.select(fieldExprMappings, fieldValueMapping -> shouldProcessField(fieldValueMapping, initialFieldExpMappingsQueue))); - if (fieldToProcess.isEmpty()) - fieldToProcess = new ArrayDeque<>(ListUtils.select(fieldExprMappings, this::shouldProcessFieldIfIsNonRequiered)); - - if(fieldToProcess.isEmpty()) { - while (initialFieldExpMappingsQueue.size()>1){ + if (fieldToProcess.isEmpty()) { + fieldToProcess = new ArrayDeque<>(ListUtils.select(fieldExprMappings, this::shouldProcessFieldIfIsNonRequired)); + } + if (fieldToProcess.isEmpty()) { + while (initialFieldExpMappingsQueue.size() > 1) { initialFieldExpMappingsQueue.removeFirst(); } fieldToProcess = new ArrayDeque<>(initialFieldExpMappingsQueue); @@ -186,13 +183,13 @@ private ArrayDeque calculateFieldsToProcess() { return fieldToProcess; } - private boolean shouldProcessFieldIfIsNonRequiered(final FieldValueMapping fieldValueMapping/*, final ArrayDeque initialFieldExpMappingsQueue*/){ + private boolean shouldProcessFieldIfIsNonRequired(final FieldValueMapping fieldValueMapping/*, final ArrayDeque initialFieldExpMappingsQueue*/) { boolean shouldProcess = false; //final String[] fields = fieldValueMapping.getFieldName().split("\\."); if (fieldValueMapping.getFieldValuesList().isEmpty()) { fieldValueMapping.getFieldValuesList().remove("null"); } else { - shouldProcess=true; + shouldProcess = true; } return shouldProcess; }