diff --git a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java index 99d766c1b..c5acd2031 100644 --- a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java +++ b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java @@ -1,9 +1,7 @@ package ru.spcex.platform.imdg.iml.hazelcast.adapter; -import com.hazelcast.query.PagingPredicate; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -14,6 +12,7 @@ import com.hazelcast.core.ILock; import com.hazelcast.core.IMap; import com.hazelcast.core.IdGenerator; import com.hazelcast.projection.Projections; +import com.hazelcast.query.PagingPredicate; import com.hazelcast.query.Predicate; import com.hazelcast.query.Predicates; import com.hazelcast.query.SqlPredicate; @@ -81,7 +80,7 @@ public class ImdgHazelcast implements Imdg { if (paramT.getId() == null) { paramT.setId(idGenerator.newId()); } - map.put(paramT.getId(), paramT); + map.set(paramT.getId(), paramT); return paramT.getId(); } @@ -106,28 +105,20 @@ public class ImdgHazelcast implements Imdg { @Override public void putAll(Map m) { - map.putAll(m); + for (Map.Entry entry : m.entrySet()) { + map.set(entry.getKey(), entry.getValue()); + } } + @Deprecated @Override public void putAll(Map m, int batchSize) { - if (batchSize <= 0) throw new IllegalArgumentException("illegal batch size " + batchSize); - Map batch = new HashMap<>(batchSize); - for (Map.Entry entry : m.entrySet()) { - batch.put(entry.getKey(), entry.getValue()); - if (batch.size() >= batchSize) { - map.putAll(batch); - batch.clear(); - } - } - if (!batch.isEmpty()) { - map.putAll(batch); - } + putAll(m); } @Override public void update(T paramT) { - map.put(paramT.getId(), paramT); + map.set(paramT.getId(), paramT); } @Override diff --git a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgTransactionalHazelcast.java b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgTransactionalHazelcast.java index 0c89da722..b370ee500 100644 --- a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgTransactionalHazelcast.java +++ b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgTransactionalHazelcast.java @@ -1,5 +1,11 @@ package ru.spcex.platform.imdg.iml.hazelcast.adapter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.ILock; import com.hazelcast.core.IdGenerator; @@ -17,8 +23,6 @@ import ru.spcex.platform.imdg.iml.hazelcast.adapter.predicate.ImdgPredicateBuild import ru.spcex.platform.imdg.iml.hazelcast.adapter.predicate.ImdgPredicateHazelcast; import ru.spcex.platform.utils.log.ExceptionUtils; -import java.util.*; - public class ImdgTransactionalHazelcast implements Imdg { private final Logger log = LoggerFactory.getLogger(getClass()); private IdGenerator idGenerator; @@ -39,7 +43,7 @@ public class ImdgTransactionalHazelcast implements Im if (paramT.getId() == null) { paramT.setId(idGenerator.newId()); } - map.put(paramT.getId(), paramT); + map.set(paramT.getId(), paramT); return paramT.getId(); } @@ -64,7 +68,7 @@ public class ImdgTransactionalHazelcast implements Im @Override public void update(T paramT) { - map.put(paramT.getId(), paramT); + map.set(paramT.getId(), paramT); } @Override