Skip to content

Commit

Permalink
refactor!: remove unused edited forced previous etc values (#280)
Browse files Browse the repository at this point in the history
  • Loading branch information
@RemiVerriez
RemiVerriez authored Feb 17, 2025
1 parent f292aa6 commit d553994
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 113 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>lunatic-model</artifactId>
<packaging>jar</packaging>

<version>3.16.0</version>
<version>4.0.0</version>
<name>Lunatic Model</name>
<description>Classes and converters for the Lunatic model</description>
<url>https://inseefr.github.io/Lunatic-Model/</url>
Expand Down
56 changes: 0 additions & 56 deletions src/main/java/fr/insee/lunatic/conversion/variable/CollectedVariableValuesDeserializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
public class CollectedVariableValuesDeserializer extends StdDeserializer<CollectedVariableValues> {

private static final String COLLECTED_KEY = "COLLECTED";
private static final String FORCED_KEY = "FORCED";
private static final String EDITED_KEY = "EDITED";
private static final String PREVIOUS_KEY = "PREVIOUS";
private static final String INPUTTED_KEY = "INPUTTED";

public CollectedVariableValuesDeserializer() {
this(null);
Expand Down Expand Up @@ -69,10 +65,6 @@ static boolean isTwoDimensionsArray(JsonNode jsonNode) {
private CollectedVariableValues.Scalar deserializeScalarValues(JsonNode valuesNode) throws JsonParseException {
CollectedVariableValues.Scalar collectedVariableValues = new CollectedVariableValues.Scalar();
collectedVariableValues.setCollected(deserializeJsonValue(valuesNode.get(COLLECTED_KEY)));
collectedVariableValues.setCollected(deserializeJsonValue(valuesNode.get(FORCED_KEY)));
collectedVariableValues.setCollected(deserializeJsonValue(valuesNode.get(EDITED_KEY)));
collectedVariableValues.setCollected(deserializeJsonValue(valuesNode.get(PREVIOUS_KEY)));
collectedVariableValues.setCollected(deserializeJsonValue(valuesNode.get(INPUTTED_KEY)));
return collectedVariableValues;
}

Expand All @@ -81,18 +73,6 @@ private CollectedVariableValues.Array deserializeArrayValues(JsonNode valuesNode
for (JsonNode jsonNode : valuesNode.get(COLLECTED_KEY)) {
collectedVariableValues.getCollected().add(deserializeJsonValue(jsonNode));
}
for (JsonNode jsonNode : valuesNode.get(FORCED_KEY)) {
collectedVariableValues.getForced().add(deserializeJsonValue(jsonNode));
}
for (JsonNode jsonNode : valuesNode.get(EDITED_KEY)) {
collectedVariableValues.getEdited().add(deserializeJsonValue(jsonNode));
}
for (JsonNode jsonNode : valuesNode.get(PREVIOUS_KEY)) {
collectedVariableValues.getPrevious().add(deserializeJsonValue(jsonNode));
}
for (JsonNode jsonNode : valuesNode.get(INPUTTED_KEY)) {
collectedVariableValues.getInputted().add(deserializeJsonValue(jsonNode));
}
return collectedVariableValues;
}

Expand All @@ -108,42 +88,6 @@ private CollectedVariableValues.DoubleArray deserializeDoubleArrayValues(JsonNod
collectedVariableValues.getCollected().add(valuesList);
}

collectedVariableValues.getForced().clear();
for (JsonNode jsonArray : valuesNode.get(FORCED_KEY)) {
List<ValueType> valuesList = new ArrayList<>();
for (JsonNode jsonNode : jsonArray) {
valuesList.add(deserializeJsonValue(jsonNode));
}
collectedVariableValues.getForced().add(valuesList);
}

collectedVariableValues.getEdited().clear();
for (JsonNode jsonArray : valuesNode.get(EDITED_KEY)) {
List<ValueType> valuesList = new ArrayList<>();
for (JsonNode jsonNode : jsonArray) {
valuesList.add(deserializeJsonValue(jsonNode));
}
collectedVariableValues.getEdited().add(valuesList);
}

collectedVariableValues.getPrevious().clear();
for (JsonNode jsonArray : valuesNode.get(PREVIOUS_KEY)) {
List<ValueType> valuesList = new ArrayList<>();
for (JsonNode jsonNode : jsonArray) {
valuesList.add(deserializeJsonValue(jsonNode));
}
collectedVariableValues.getPrevious().add(valuesList);
}

collectedVariableValues.getInputted().clear();
for (JsonNode jsonArray : valuesNode.get(INPUTTED_KEY)) {
List<ValueType> valuesList = new ArrayList<>();
for (JsonNode jsonNode : jsonArray) {
valuesList.add(deserializeJsonValue(jsonNode));
}
collectedVariableValues.getInputted().add(valuesList);
}

return collectedVariableValues;
}

Expand Down
37 changes: 2 additions & 35 deletions src/main/java/fr/insee/lunatic/model/flat/variable/CollectedVariableValues.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,8 @@
import java.util.ArrayList;
import java.util.List;

@JsonPropertyOrder({
"previous",
"collected",
"forced",
"edited",
"inputted"
})
@JsonPropertyOrder({"collected"})

@JsonDeserialize(using = CollectedVariableValuesDeserializer.class)
public abstract class CollectedVariableValues {

Expand All @@ -26,53 +21,25 @@ private CollectedVariableValues() {}
@Getter
@Setter
public static class Scalar extends CollectedVariableValues {
@JsonInclude @JsonProperty(value = "PREVIOUS")
protected ValueType previous;
@JsonInclude @JsonProperty(value = "COLLECTED")
protected ValueType collected;
@JsonInclude @JsonProperty(value = "FORCED")
protected ValueType forced;
@JsonInclude @JsonProperty(value = "EDITED")
protected ValueType edited;
@JsonInclude @JsonProperty(value = "INPUTTED")
protected ValueType inputted;
}

@Getter
@Setter
public static class Array extends CollectedVariableValues {
@JsonProperty(value = "PREVIOUS")
protected List<ValueType> previous = new ArrayList<>();
@JsonProperty(value = "COLLECTED")
protected List<ValueType> collected = new ArrayList<>();
@JsonProperty(value = "FORCED")
protected List<ValueType> forced = new ArrayList<>();
@JsonProperty(value = "EDITED")
protected List<ValueType> edited = new ArrayList<>();
@JsonProperty(value = "INPUTTED")
protected List<ValueType> inputted = new ArrayList<>();
}

@Getter
@Setter
public static class DoubleArray extends CollectedVariableValues {
@JsonProperty(value = "PREVIOUS")
protected List<List<ValueType>> previous;
@JsonProperty(value = "COLLECTED")
protected List<List<ValueType>> collected;
@JsonProperty(value = "FORCED")
protected List<List<ValueType>> forced;
@JsonProperty(value = "EDITED")
protected List<List<ValueType>> edited;
@JsonProperty(value = "INPUTTED")
protected List<List<ValueType>> inputted;

public DoubleArray() {
previous = newBidimentionalList();
collected = newBidimentionalList();
forced = newBidimentionalList();
edited = newBidimentionalList();
inputted = newBidimentionalList();
}

private static List<List<ValueType>> newBidimentionalList() {
Expand Down
24 changes: 3 additions & 21 deletions src/test/java/fr/insee/lunatic/conversion/variable/CollectedVariableSerializationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,7 @@ class CollectedVariableSerializationTest {
{
"variableType": "COLLECTED",
"name": "SIMPLE_VAR",
"values": {
"PREVIOUS": null,
"COLLECTED": null,
"FORCED": null,
"EDITED": null,
"INPUTTED": null
}
"values": {"COLLECTED": null}
}
]
}""";
Expand All @@ -43,13 +37,7 @@ class CollectedVariableSerializationTest {
{
"variableType": "COLLECTED",
"name": "LOOP_VAR",
"values": {
"PREVIOUS": [],
"COLLECTED": [],
"FORCED": [],
"EDITED": [],
"INPUTTED": []
}
"values": {"COLLECTED": []}
}
]
}""";
Expand All @@ -61,13 +49,7 @@ class CollectedVariableSerializationTest {
{
"variableType": "COLLECTED",
"name": "PAIRWISE_VAR",
"values": {
"PREVIOUS": [[]],
"COLLECTED": [[]],
"FORCED": [[]],
"EDITED": [[]],
"INPUTTED": [[]]
}
"values": {"COLLECTED": [[]]}
}
]
}""";
Expand Down

0 comments on commit d553994

Please sign in to comment.