Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Fix su classe Pair non utilizzabile in Java8

Browse Source
This commit is contained in:
Giuseppe Scorrano
2024-02-29 11:59:01 +01:00
parent aab7560ecb
commit 574f747618
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ems-core/src/main/java/it/integry/ems/sync/AsyncHistoryManager.java
View File

@@ -19,7 +19,6 @@ import it.integry.ems_model.entity.StbTransactionLog;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityLocalDate;
import javafx.util.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,8 +27,10 @@ import org.springframework.stereotype.Component;
import java.sql.Connection;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@@ -146,7 +147,7 @@ public class AsyncHistoryManager {
// exportHistoryItem.getToProcessQueue().add(JSON.toJSONString(data));
try {
exportHistoryGroup.getToProcessQueue().add(new Pair<>(exportHistoryItem.getPublication().getEntityName(), jsonObjectMapper.writeValueAsString(data)));
exportHistoryGroup.getToProcessQueue().add(new AbstractMap.SimpleEntry<>(exportHistoryItem.getPublication().getEntityName(), jsonObjectMapper.writeValueAsString(data)));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
@@ -193,7 +194,7 @@ public class AsyncHistoryManager {
while (!currentGroup.getToProcessQueue().isEmpty()) {
try (SQLServerPreparedStatement insertBulkPs = (SQLServerPreparedStatement) multiDBTransactionManager.prepareStatement(insertSQL)) {
Pair<String, String> entityJson;
Map.Entry<String, String> entityJson;
while ((entityJson = currentGroup.getToProcessQueue().poll()) != null) {
insertBulkPs.setLong(1, currentGroup.getGroupId());
insertBulkPs.setObject(2, UtilityLocalDate.getNowTime());

16
ems-core/src/main/java/it/integry/ems/sync/AsyncManager.java
View File

@@ -15,7 +15,6 @@ import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityLocalDate;
import it.integry.ems_model.utility.UtilityString;
import javafx.util.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.josql.Query;
@@ -25,10 +24,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.context.ContextLoader;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.stream.Collectors;
@@ -49,7 +45,7 @@ public class AsyncManager {
private final static HashMap<String, List<StbPublicationsDetail>> cachedSetup = new HashMap<>();
private final static ConcurrentLinkedQueue<Pair<String, StbTransactionLog>> toBeSavedQueue = new ConcurrentLinkedQueue<>();
private final static ConcurrentLinkedQueue<Map.Entry<String, StbTransactionLog>> toBeSavedQueue = new ConcurrentLinkedQueue<>();
@PostContextConstruct
public void init() {
@@ -151,7 +147,7 @@ public class AsyncManager {
.setGroupId(transactionGroupId);
stbTransactionLog.setOperation(OperationType.INSERT);
toBeSavedQueue.add(new Pair<>(dbName, stbTransactionLog));
toBeSavedQueue.add(new AbstractMap.SimpleEntry<>(dbName, stbTransactionLog));
return transactionGroupId;
}
@@ -185,7 +181,7 @@ public class AsyncManager {
if(cachedSetup.entrySet().stream().anyMatch(x -> x.getValue() != null && x.getValue().stream().anyMatch(y -> !y.isReadyToTransmit())))
return;
List<String> dbNamesToConnect = toBeSavedQueue.stream().map(Pair::getKey).distinct().collect(Collectors.toList());
List<String> dbNamesToConnect = toBeSavedQueue.stream().map(Map.Entry::getKey).distinct().collect(Collectors.toList());
final List<AvailableConnectionsModel> databaseConnections = settingsModel.getAvailableConnections().stream()
.filter(x -> dbNamesToConnect.stream().anyMatch(y -> x.getDbName().equalsIgnoreCase(y)))
@@ -194,9 +190,9 @@ public class AsyncManager {
String insertSQL = "INSERT INTO " + StbTransactionLog.ENTITY + " (publication_group_id, created_at, user_name, entities, entities_json, group_id)" +
" VALUES (?, ?, ?, ?, ?, ?)";
Pair<String, StbTransactionLog> itemToSave = null;
Map.Entry<String, StbTransactionLog> itemToSave = null;
while ((itemToSave = toBeSavedQueue.poll()) != null) {
final Pair<String, StbTransactionLog> finalItemToSave = itemToSave;
final Map.Entry<String, StbTransactionLog> finalItemToSave = itemToSave;
final StbTransactionLog stbTransactionLog = finalItemToSave.getValue();
AvailableConnectionsModel connectionModel = databaseConnections.stream()

6
ems-core/src/main/java/it/integry/ems/sync/dto/ExportHistoryGroupDTO.java
View File

@@ -1,11 +1,11 @@
package it.integry.ems.sync.dto;
import it.integry.ems.datasource.DataSource;
import javafx.util.Pair;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -21,7 +21,7 @@ public class ExportHistoryGroupDTO {
private long syncronizedItemCount;
private List<ExportHistoryItemDTO> items = new ArrayList<>();
private final Queue<Pair<String, String>> toProcessQueue = new ConcurrentLinkedQueue<>();
private final Queue<Map.Entry<String, String>> toProcessQueue = new ConcurrentLinkedQueue<>();
public long getGroupId() {
@@ -43,7 +43,7 @@ public class ExportHistoryGroupDTO {
}
public Queue<Pair<String, String>> getToProcessQueue() {
public Queue<Map.Entry<String, String>> getToProcessQueue() {
return toProcessQueue;
}