diff --git a/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/DatasetServiceImpl.java b/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/DatasetServiceImpl.java index 4f92f41f8..0e4ad2b88 100644 --- a/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/DatasetServiceImpl.java +++ b/horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/DatasetServiceImpl.java @@ -520,7 +520,7 @@ void calculateLabelValues(int testId, int datasetId, Integer[] queryLabelIds) { FingerprintDAO.deleteById(datasetId); Util.evaluateWithCombinationFunction(toCompute, (row) -> (String) row[2], - (row) -> (row[3] instanceof ArrayNode ? flatten((ArrayNode) row[3]) : (JsonNode) row[3]), + (row) -> (JsonNode) row[3], (row, result) -> createLabelValue(datasetId, (int) row[0], Util.convertToJson(result)), (row) -> createLabelValue(datasetId, (int) row[0], (JsonNode) row[3]), (row, e, jsCode) -> logMessage(datasetId, PersistentLogDAO.ERROR, @@ -583,18 +583,6 @@ public void deleteDataset(int datasetId) { em.createNativeQuery("DELETE FROM dataset WHERE id = ?1").setParameter(1, datasetId).executeUpdate(); } - private ArrayNode flatten(ArrayNode bucket) { - JsonNode data = bucket.get(0); - if (data == null) - return bucket; - - if (data instanceof ArrayNode) { - bucket.removeAll(); - data.forEach(bucket::add); - } - return bucket; - } - @WithRoles(extras = Roles.HORREUM_SYSTEM) @Transactional(Transactional.TxType.REQUIRES_NEW) protected void findFailingExtractor(int datasetId) { diff --git a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/BaseServiceTest.java b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/BaseServiceTest.java index c6edb8dcb..98aa8a2c7 100644 --- a/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/BaseServiceTest.java +++ b/horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/BaseServiceTest.java @@ -574,6 +574,14 @@ protected int[] updateLabels(Schema schema, Label... labels) { protected int postLabel(Schema schema, String name, String function, Consumer