diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java index b3d3e82bdd578..f7fa1f034bff0 100644 --- a/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java @@ -27,11 +27,14 @@ import java.io.StringWriter; import java.io.Writer; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import java.util.UUID; import java.util.function.Function; import javax.annotation.processing.FilerException; @@ -44,6 +47,7 @@ import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; import javax.lang.model.type.ArrayType; +import javax.lang.model.type.DeclaredType; import javax.lang.model.type.PrimitiveType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; @@ -56,6 +60,7 @@ import static org.apache.ignite.internal.MessageSerializerGenerator.TAB; import static org.apache.ignite.internal.MessageSerializerGenerator.enumType; import static org.apache.ignite.internal.MessageSerializerGenerator.identicalFileIsAlreadyGenerated; +import static org.apache.ignite.internal.idto.IgniteDataTransferObjectProcessor.DTO_CLASS; /** * Generates serializer class for given {@code IgniteDataTransferObject} extension. @@ -66,13 +71,21 @@ public class IDTOSerializerGenerator { /** Serializer interface. */ public static final String DTO_SERDES_INTERFACE = "org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer"; - /** Class javadoc */ + /** Class javadoc. */ static final String CLS_JAVADOC = "/** " + NL + " * This class is generated automatically." + NL + " *" + NL + " * @see org.apache.ignite.internal.dto.IgniteDataTransferObject" + NL + " */"; + /** */ + private static final IgniteBiTuple OBJECT_SERDES = + F.t("out.writeObject(obj.${f});", "obj.${f} = (${c})in.readObject();"); + + /** */ + private static final IgniteBiTuple STR_STR_MAP = + F.t("U.writeStringMap(out, obj.${f});", "obj.${f} = U.readStringMap(in);"); + /** Type name to write/read code for the type. */ private static final Map> TYPE_SERDES = new HashMap<>(); @@ -85,22 +98,34 @@ public class IDTOSerializerGenerator { TYPE_SERDES.put(float.class.getName(), F.t("out.writeFloat(obj.${f});", "obj.${f} = in.readFloat();")); TYPE_SERDES.put(double.class.getName(), F.t("out.writeDouble(obj.${f});", "obj.${f} = in.readDouble();")); - IgniteBiTuple objSerdes = F.t("out.writeObject(obj.${f});", "obj.${f} = (${c})in.readObject();"); - - TYPE_SERDES.put(Boolean.class.getName(), objSerdes); - TYPE_SERDES.put(Byte.class.getName(), objSerdes); - TYPE_SERDES.put(Short.class.getName(), objSerdes); - TYPE_SERDES.put(Integer.class.getName(), objSerdes); - TYPE_SERDES.put(Long.class.getName(), objSerdes); - TYPE_SERDES.put(Float.class.getName(), objSerdes); - TYPE_SERDES.put(Double.class.getName(), objSerdes); + TYPE_SERDES.put(Boolean.class.getName(), OBJECT_SERDES); + TYPE_SERDES.put(Byte.class.getName(), OBJECT_SERDES); + TYPE_SERDES.put(Short.class.getName(), OBJECT_SERDES); + TYPE_SERDES.put(Integer.class.getName(), OBJECT_SERDES); + TYPE_SERDES.put(Long.class.getName(), OBJECT_SERDES); + TYPE_SERDES.put(Float.class.getName(), OBJECT_SERDES); + TYPE_SERDES.put(Double.class.getName(), OBJECT_SERDES); + TYPE_SERDES.put(Throwable.class.getName(), OBJECT_SERDES); + TYPE_SERDES.put(Exception.class.getName(), OBJECT_SERDES); + TYPE_SERDES.put(Object.class.getName(), OBJECT_SERDES); TYPE_SERDES.put(String.class.getName(), F.t("U.writeString(out, obj.${f});", "obj.${f} = U.readString(in);")); TYPE_SERDES.put(UUID.class.getName(), F.t("U.writeUuid(out, obj.${f});", "obj.${f} = U.readUuid(in);")); TYPE_SERDES.put("org.apache.ignite.lang.IgniteUuid", F.t("U.writeIgniteUuid(out, obj.${f});", "obj.${f} = U.readIgniteUuid(in);")); - TYPE_SERDES.put("org.apache.ignite.internal.processors.cache.version.GridCacheVersion", objSerdes); - + TYPE_SERDES.put("org.apache.ignite.internal.processors.cache.version.GridCacheVersion", OBJECT_SERDES); + TYPE_SERDES.put("org.apache.ignite.lang.IgniteProductVersion", OBJECT_SERDES); + TYPE_SERDES.put("org.apache.ignite.internal.binary.BinaryMetadata", OBJECT_SERDES); + TYPE_SERDES.put("org.apache.ignite.internal.management.cache.PartitionKey", OBJECT_SERDES); + TYPE_SERDES.put("org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion", OBJECT_SERDES); + TYPE_SERDES.put("org.apache.ignite.cache.CacheMode", + F.t("out.writeByte(CacheMode.toCode(obj.${f}));", "obj.${f} = CacheMode.fromCode(in.readByte());")); + + TYPE_SERDES.put(TreeMap.class.getName(), F.t("U.writeMap(out, obj.${f});", "obj.${f} = U.readTreeMap(in);")); + TYPE_SERDES.put(LinkedHashMap.class.getName(), F.t("U.writeMap(out, obj.${f});", "obj.${f} = U.readLinkedMap(in);")); TYPE_SERDES.put(Map.class.getName(), F.t("U.writeMap(out, obj.${f});", "obj.${f} = U.readMap(in);")); + TYPE_SERDES.put(Collection.class.getName(), F.t("U.writeCollection(out, obj.${f});", "obj.${f} = U.readCollection(in);")); + TYPE_SERDES.put(List.class.getName(), F.t("U.writeCollection(out, obj.${f});", "obj.${f} = U.readList(in);")); + TYPE_SERDES.put(Set.class.getName(), F.t("U.writeCollection(out, obj.${f});", "obj.${f} = U.readSet(in);")); } /** Write/Read code for enum. */ @@ -295,21 +320,50 @@ private List fieldsSerdes( List flds, Function, String> lineProvider ) { + TypeMirror dtoCls = env.getElementUtils().getTypeElement(DTO_CLASS).asType(); + List code = new ArrayList<>(); for (VariableElement fld : flds) { TypeMirror type = fld.asType(); TypeMirror comp = null; - IgniteBiTuple serDes; + IgniteBiTuple serDes = null; - if (type.getKind() == TypeKind.ARRAY) { + if (env.getTypeUtils().isAssignable(type, dtoCls)) + serDes = OBJECT_SERDES; + else if (type.getKind() == TypeKind.TYPEVAR) + serDes = F.t("out.writeObject(obj.${f});", "obj.${f} = in.readObject();"); + else if (type.getKind() == TypeKind.ARRAY) { comp = ((ArrayType)type).getComponentType(); - serDes = enumType(env, comp) ? OBJ_ARRAY_SERDES : ARRAY_TYPE_SERDES.get(className(comp)); + serDes = ARRAY_TYPE_SERDES.get(className(comp)); + + if (serDes == null && enumType(env, comp)) + serDes = OBJ_ARRAY_SERDES; + } + else { + if (className(type).equals(Map.class.getName())) { + TypeMirror strCls = env.getElementUtils().getTypeElement(String.class.getName()).asType(); + + DeclaredType dt = (DeclaredType)type; + + List ta = dt.getTypeArguments(); + + if (ta.size() == 2 + && env.getTypeUtils().isAssignable(ta.get(0), strCls) + && env.getTypeUtils().isAssignable(ta.get(1), strCls)) { + serDes = STR_STR_MAP; + } + } + + if (serDes == null) { + serDes = TYPE_SERDES.get(className(type)); + + if (serDes == null && enumType(env, type)) + serDes = ENUM_SERDES; + } } - else - serDes = enumType(env, type) ? ENUM_SERDES : TYPE_SERDES.get(className(type)); if (serDes != null) { String pattern = lineProvider.apply(serDes); @@ -351,6 +405,12 @@ private List fields(TypeElement type) { /** @return FQN of {@code comp}. */ private static String className(TypeMirror comp) { String n = comp.toString(); + + int spaceIdx = n.indexOf(' '); + + if (spaceIdx != -1) + n = n.substring(spaceIdx + 1); + int genIdx = n.indexOf('<'); return genIdx == -1 ? n : n.substring(0, genIdx); @@ -372,7 +432,7 @@ private String simpleClassName(TypeMirror type) { String fqn = className(type); - if (!fqn.startsWith("java.lang")) + if (!fqn.startsWith("java.lang") && type.getKind() != TypeKind.TYPEVAR) imports.add(fqn); return simpleName(fqn); diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java index df9f23c561f1e..6756770d64bea 100644 --- a/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java @@ -33,7 +33,6 @@ import javax.annotation.processing.SupportedAnnotationTypes; import javax.annotation.processing.SupportedSourceVersion; import javax.lang.model.SourceVersion; -import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; @@ -62,16 +61,8 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { /** Package for serializers. */ private static final String FACTORY_PKG_NAME = "org.apache.ignite.internal.codegen.idto"; - /** Base class that every dto must extend. */ - private static final String DTO_CLASS = "org.apache.ignite.internal.dto.IgniteDataTransferObject"; - - /** - * Annotation used in management commands. - * For now, we restrict set of generated serdes to all management commands argument classes. - * Because, they strictly follows Ignite codestyle convention. - * Providing support of all other inheritor of {@code IgniteDataTransferObject} is matter of following improvements. - */ - private static final String ARG_ANNOTATION = "org.apache.ignite.internal.management.api.Argument"; + /** Base class that every dto must extends. */ + static final String DTO_CLASS = "org.apache.ignite.internal.dto.IgniteDataTransferObject"; /** Factory class name. */ public static final String FACTORY_CLASS = "IDTOSerializerFactory"; @@ -79,6 +70,23 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { /** Generated classes. */ private final Map genSerDes = new HashMap<>(); + /** Currently unsupported classes. */ + private static final Set UNSUPPORTED = Set.of( + "org.apache.ignite.internal.management.baseline.BaselineNode", + "org.apache.ignite.internal.processors.cache.CacheMetricsSnapshot", + "org.apache.ignite.internal.commandline.cache.check_indexes_inline_size.CheckIndexInlineSizesResult", + "org.apache.ignite.internal.management.cache.ContentionJobResult", + "org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageHistoryItem", + "org.apache.ignite.internal.management.tx.TxInfo", + "org.apache.ignite.internal.management.encryption.ReencryptionSuspendTask.ReencryptionSuspendResumeJobResult", + "org.apache.ignite.internal.management.encryption.ReencryptionStatusTask.ReencryptionStatusResult", + "org.apache.ignite.internal.management.encryption.EncryptionKeyIdsTask.EncryptionKeyIdsResult", + "org.apache.ignite.internal.management.cache.IndexForceRebuildTaskRes", + "org.apache.ignite.internal.management.cache.IndexRebuildStatusInfoContainer", + "org.apache.ignite.internal.visor.VisorTaskResult", + "org.apache.ignite.internal.visor.VisorTaskArgument" + ); + /** * Processes all classes extending the {@code IgniteDataTransferObject} and generates corresponding serializer code. */ @@ -107,28 +115,27 @@ private void generateSingle(Element el) { return; TypeMirror dtoCls = processingEnv.getElementUtils().getTypeElement(DTO_CLASS).asType(); - TypeMirror argAnnotation = processingEnv.getElementUtils().getTypeElement(ARG_ANNOTATION).asType(); TypeElement clazz = (TypeElement)el; // Generate code for inner classes. clazz.getEnclosedElements().forEach(this::generateSingle); + if (UNSUPPORTED.contains(clazz.getQualifiedName().toString())) + return; + if (!processingEnv.getTypeUtils().isAssignable(clazz.asType(), dtoCls)) return; if (clazz.getModifiers().contains(Modifier.ABSTRACT)) return; - if (!clazz.getModifiers().contains(Modifier.PUBLIC)) + if (clazz.getModifiers().contains(Modifier.PRIVATE) && clazz.getModifiers().contains(Modifier.PROTECTED)) return; if (clazz.getNestingKind() != NestingKind.TOP_LEVEL && clazz.getNestingKind() != NestingKind.MEMBER) return; - if (!hasArgumentFields(clazz, argAnnotation)) - return; - try { IDTOSerializerGenerator gen = new IDTOSerializerGenerator(processingEnv, clazz); @@ -364,27 +371,4 @@ private void serializer(Writer writer) throws IOException { writer.write("}"); writer.write(NL); } - - /** - * @param type Type to analyze. - * @param argAnnotation Annotation to find. - * @return {@code True} if type has fields annotated with the {@code argAnnotation}, {@code false} otherwise. - */ - private boolean hasArgumentFields(TypeElement type, TypeMirror argAnnotation) { - while (type != null) { - for (Element el: type.getEnclosedElements()) { - if (el.getKind() != ElementKind.FIELD) - continue; - - for (AnnotationMirror am : el.getAnnotationMirrors()) { - if (am.getAnnotationType().equals(argAnnotation)) - return true; - } - } - - type = (TypeElement)processingEnv.getTypeUtils().asElement(type.getSuperclass()); - } - - return false; - } } diff --git a/modules/commons/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/commons/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java index 65917efd36ea3..22a4053afa03f 100644 --- a/modules/commons/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java +++ b/modules/commons/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java @@ -1863,7 +1863,7 @@ else if (!f.isAnnotationPresent(GridToStringExclude.class) && /** @return {@code True} if field should be added. */ private static boolean addField(Field f, Class type) { // Include only private non-static - return Modifier.isPrivate(f.getModifiers()) && !Modifier.isStatic(f.getModifiers()) && + return !Modifier.isStatic(f.getModifiers()) && // No direct objects & serializable. Object.class != type && Serializable.class != type && diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/DurableBackgroundCleanupIndexTreeTaskV2.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/DurableBackgroundCleanupIndexTreeTaskV2.java index f5f2b3771c439..7dec52b6fc2c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/DurableBackgroundCleanupIndexTreeTaskV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/DurableBackgroundCleanupIndexTreeTaskV2.java @@ -18,9 +18,6 @@ package org.apache.ignite.internal.cache.query.index.sorted; import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -76,25 +73,25 @@ public class DurableBackgroundCleanupIndexTreeTaskV2 extends IgniteDataTransferO @Nullable private transient volatile IgniteLogger log; /** Unique id. */ - private String uid; + String uid; /** Cache group name. */ - @Nullable private String grpName; + @Nullable String grpName; /** Cache name. */ - private String cacheName; + String cacheName; /** Index name. */ - private String idxName; + String idxName; /** Old name of underlying index tree name. */ - private String oldTreeName; + String oldTreeName; /** New name of underlying index tree name. */ - private String newTreeName; + String newTreeName; /** Number of segments. */ - private int segments; + int segments; /** Need to rename index root pages. */ private transient volatile boolean needToRen; @@ -153,28 +150,6 @@ public DurableBackgroundCleanupIndexTreeTaskV2() { // No-op. } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeLongString(out, uid); - U.writeLongString(out, grpName); - U.writeLongString(out, cacheName); - U.writeLongString(out, idxName); - U.writeLongString(out, oldTreeName); - U.writeLongString(out, newTreeName); - out.writeInt(segments); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - uid = U.readLongString(in); - grpName = U.readLongString(in); - cacheName = U.readLongString(in); - idxName = U.readLongString(in); - oldTreeName = U.readLongString(in); - newTreeName = U.readLongString(in); - segments = in.readInt(); - } - /** {@inheritDoc} */ @Override public String name() { return "drop-sql-index-" + cacheName + "-" + idxName + "-" + uid; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionGroup.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionGroup.java index 0f1686934cf3a..6f9d127b08370 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionGroup.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionGroup.java @@ -16,12 +16,8 @@ */ package org.apache.ignite.internal.commandline.cache.distribution; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** * DTO for CacheDistributionTask, contains information about group @@ -31,13 +27,13 @@ public class CacheDistributionGroup extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Group identifier. */ - private int grpId; + int grpId; /** Group name. */ - private String grpName; + String grpName; /** List of partitions. */ - private List partitions; + List partitions; /** Default constructor. */ public CacheDistributionGroup() { @@ -84,18 +80,4 @@ public void setPartitions( List partitions) { this.partitions = partitions; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeInt(grpId); - U.writeString(out, grpName); - U.writeCollection(out, partitions); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - grpId = in.readInt(); - grpName = U.readString(in); - partitions = U.readList(in); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionNode.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionNode.java index bae8f5f2f8a24..ba098415781d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionNode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionNode.java @@ -16,14 +16,10 @@ */ package org.apache.ignite.internal.commandline.cache.distribution; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import java.util.Map; import java.util.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** * DTO for CacheDistributionTask, contains information about node @@ -33,16 +29,16 @@ public class CacheDistributionNode extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Node identifier. */ - private UUID nodeId; + UUID nodeId; /** Network addresses. */ - private String addrs; + String addrs; /** User attribute in result. */ - private Map userAttrs; + Map userAttrs; /** Information about groups. */ - private List groups; + List groups; /** Default constructor. */ public CacheDistributionNode() { @@ -106,21 +102,4 @@ public List getGroups() { public void setGroups(List groups) { this.groups = groups; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, nodeId); - U.writeString(out, addrs); - U.writeMap(out, userAttrs); - U.writeCollection(out, groups); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodeId = U.readUuid(in); - addrs = U.readString(in); - userAttrs = U.readMap(in); - groups = U.readList(in); - } - } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionPartition.java index 44393207eee77..d58e034a73a76 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionPartition.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.commandline.cache.distribution; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState; -import org.apache.ignite.internal.util.typedef.internal.U; /** * DTO for CacheDistributionTask, contains information about partition @@ -32,19 +28,19 @@ public class CacheDistributionPartition extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Partition identifier. */ - private int partId; + int partId; /** Flag primary or backup partition. */ - private boolean primary; + boolean primary; /** Partition status. */ - private GridDhtPartitionState state; + GridDhtPartitionState state; /** Partition update counters. */ - private long updateCntr; + long updateCntr; /** Number of entries in partition. */ - private long size; + long size; /** Default constructor. */ public CacheDistributionPartition() { @@ -115,22 +111,4 @@ public long getSize() { public void setSize(long size) { this.size = size; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeInt(partId); - out.writeBoolean(primary); - U.writeEnum(out, state); - out.writeLong(updateCntr); - out.writeLong(size); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException { - partId = in.readInt(); - primary = in.readBoolean(); - state = GridDhtPartitionState.fromOrdinal(in.readByte()); - updateCntr = in.readLong(); - size = in.readLong(); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTaskResult.java index b39a435b02269..33b0456091553 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTaskResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.commandline.cache.distribution; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -41,10 +38,10 @@ public class CacheDistributionTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Job results. */ - private List nodeResList; + List nodeResList; /** Exceptions. */ - private Map exceptions; + Map exceptions; /** * @param nodeResList Cluster infos. @@ -76,18 +73,6 @@ public Map exceptions() { return exceptions; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, nodeResList); - U.writeMap(out, exceptions); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodeResList = U.readList(in); - exceptions = U.readMap(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheDistributionTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/reset_lost_partitions/CacheResetLostPartitionsTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/reset_lost_partitions/CacheResetLostPartitionsTaskResult.java index b9357cf31d6cb..8ffdfa3ec5b0c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/reset_lost_partitions/CacheResetLostPartitionsTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/reset_lost_partitions/CacheResetLostPartitionsTaskResult.java @@ -16,13 +16,9 @@ */ package org.apache.ignite.internal.commandline.cache.reset_lost_partitions; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Map; import java.util.function.Consumer; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Result of CacheResetLostPartitionsTask @@ -34,7 +30,7 @@ public class CacheResetLostPartitionsTaskResult extends IgniteDataTransferObject /** * Map group name to result execute message. */ - private Map msgMap; + Map msgMap; /** * @param groupName - Cache group name. @@ -67,14 +63,4 @@ public Map getMessageMap() { public void setMessageMap(Map messageMap) { this.msgMap = messageMap; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, msgMap); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - msgMap = U.readMap(in); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/ClusterChangeTagTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/ClusterChangeTagTaskResult.java index 1fe09bca0efb7..308c99bce6df5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/ClusterChangeTagTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/ClusterChangeTagTaskResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.jetbrains.annotations.Nullable; @@ -31,13 +28,13 @@ public class ClusterChangeTagTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private String tag; + String tag; /** */ - private Boolean success; + Boolean success; /** */ - private String errResp; + String errResp; /** Default constructor. */ public ClusterChangeTagTaskResult() { @@ -55,22 +52,6 @@ public ClusterChangeTagTaskResult(String tag, @Nullable Boolean success, @Nullab this.errResp = errResp; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(success); - out.writeObject(errResp); - - out.writeObject(tag); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - success = (Boolean)in.readObject(); - errResp = (String)in.readObject(); - - tag = (String)in.readObject(); - } - /** */ public String tag() { return tag; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyTaskResult.java index be59dbe8518f5..74449f8fabb98 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyTaskResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.ShutdownPolicy; import org.apache.ignite.internal.dto.IgniteDataTransferObject; @@ -31,7 +28,7 @@ public class ShutdownPolicyTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Shutdown policy on result. */ - private ShutdownPolicy shutdown; + ShutdownPolicy shutdown; /** * Get policy. @@ -50,15 +47,4 @@ public ShutdownPolicy getShutdown() { public void setShutdown(ShutdownPolicy shutdown) { this.shutdown = shutdown; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeInt(shutdown == null ? -1 : shutdown.index()); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - shutdown = ShutdownPolicy.fromOrdinal(in.readInt()); - - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTask.java b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTask.java index 31fae2c69636b..351f519242280 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTask.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.TreeMap; import java.util.UUID; import org.apache.ignite.IgniteException; @@ -58,7 +57,7 @@ public class SystemViewTask extends VisorMultiNodeTask results) throws IgniteException { SystemViewTaskResult res = null; - Map>> merged = new TreeMap<>(); + TreeMap>> merged = new TreeMap<>(); for (ComputeJobResult r : results) { if (r.getException() != null) @@ -175,7 +174,7 @@ else if ( rows.add(attrVals); } - return new SystemViewTaskResult(attrNames, attrTypes, singletonMap(ignite.localNode().id(), rows)); + return new SystemViewTaskResult(attrNames, attrTypes, new TreeMap<>(singletonMap(ignite.localNode().id(), rows))); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTaskResult.java index 58d7c4693dcae..85496549cb3d8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTaskResult.java @@ -17,15 +17,12 @@ package org.apache.ignite.internal.management; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.SystemViewTask.SimpleType; -import org.apache.ignite.internal.util.typedef.internal.U; /** Reperesents result of {@link SystemViewTask}. */ public class SystemViewTaskResult extends IgniteDataTransferObject { @@ -33,10 +30,10 @@ public class SystemViewTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Attribute values for each row of the system view per node ID. */ - private Map>> rows; + TreeMap>> rows; /** Names of the system view attributes. */ - private List attrs; + List attrs; /** Types of the system view attributes. */ List types; @@ -51,7 +48,7 @@ public SystemViewTaskResult() { * @param types Types of the system view attributes. * @param rows Attribute values for each row of the system view per node ID. */ - public SystemViewTaskResult(List attrs, List types, Map>> rows) { + public SystemViewTaskResult(List attrs, List types, TreeMap>> rows) { this.attrs = attrs; this.types = types; this.rows = rows; @@ -71,22 +68,4 @@ public Map>> rows() { public List types() { return types; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, attrs); - - U.writeCollection(out, types); - - U.writeMap(out, rows); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - attrs = U.readList(in); - - types = U.readList(in); - - rows = U.readTreeMap(in); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/api/NoArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/api/NoArg.java index 6a4f1c21b12aa..d7cc3ab0b0711 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/api/NoArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/api/NoArg.java @@ -17,23 +17,10 @@ package org.apache.ignite.internal.management.api; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; /** Utility class for commands without any specific arguments. */ public final class NoArg extends IgniteDataTransferObject { /** */ private static final long serialVersionUID = 0; - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - //No-op. - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - //No-op. - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustSettings.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustSettings.java index 22f953dceb104..ffe33e0e2e5e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustSettings.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustSettings.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.baseline; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; /** */ @@ -56,27 +53,4 @@ public Boolean getEnabled() { public Long getSoftTimeout() { return softTimeout; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeBoolean(enabled != null); - - if (enabled != null) - out.writeBoolean(enabled); - - out.writeBoolean(softTimeout != null); - - if (softTimeout != null) - out.writeLong(softTimeout); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) - throws IOException, ClassNotFoundException { - if (in.readBoolean()) - enabled = in.readBoolean(); - - if (in.readBoolean()) - softTimeout = in.readLong(); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineNode.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineNode.java index 18c65e5919bce..574e449e0b8b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineNode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineNode.java @@ -139,10 +139,10 @@ public static class ResolvedAddresses extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private String hostname; + String hostname; /** Textual representation of IP address. */ - private String addr; + String addr; /** * @param inetAddr Inet address. @@ -158,19 +158,6 @@ public static class ResolvedAddresses extends IgniteDataTransferObject { public ResolvedAddresses() { } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, hostname); - U.writeString(out, addr); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) - throws IOException, ClassNotFoundException { - hostname = U.readString(in); - addr = U.readString(in); - } - /** * @return Hostname. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineTaskResult.java index 70c35ede65c43..8e644e5aa843e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineTaskResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.baseline; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; @@ -37,7 +34,6 @@ import org.apache.ignite.internal.managers.discovery.IgniteClusterNode; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Result for {@link BaselineTask}. @@ -47,25 +43,25 @@ public class BaselineTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cluster state. */ - private ClusterState clusterState; + ClusterState clusterState; /** Current topology version. */ - private long topVer; + long topVer; /** Current baseline nodes. */ - private Map baseline; + TreeMap baseline; /** Current server nodes. */ - private Map servers; + TreeMap servers; /** Baseline autoadjustment settings. */ - private BaselineAutoAdjustSettings autoAdjustSettings; + BaselineAutoAdjustSettings autoAdjustSettings; /** Time to next baseline adjust. */ - private long remainingTimeToBaselineAdjust = -1; + long remainingTimeToBaselineAdjust = -1; /** Is baseline adjust in progress? */ - private boolean baselineAdjustInProgress = false; + boolean baselineAdjustInProgress = false; /** * Default constructor. @@ -78,11 +74,11 @@ public BaselineTaskResult() { * @param nodes Nodes to process. * @return Map of DTO objects. */ - private static Map toMap(Collection nodes) { + private static TreeMap toMap(Collection nodes) { if (F.isEmpty(nodes)) return null; - Map map = new TreeMap<>(); + TreeMap map = new TreeMap<>(); for (org.apache.ignite.cluster.BaselineNode node : nodes) { BaselineNode dto = new BaselineNode(node, Collections.emptyList()); @@ -97,13 +93,13 @@ private static Map toMap(Collectionhostname pairs. */ - private static Map toMapWithResolvedAddresses( + private static TreeMap toMapWithResolvedAddresses( Collection nodes ) { if (F.isEmpty(nodes)) return null; - Map map = new TreeMap<>(); + TreeMap map = new TreeMap<>(); for (org.apache.ignite.cluster.BaselineNode node : nodes) { Collection addrs = new ArrayList<>(); @@ -245,28 +241,6 @@ public boolean isBaselineAdjustInProgress() { return baselineAdjustInProgress; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeLong(topVer); - U.writeMap(out, baseline); - U.writeMap(out, servers); - out.writeObject(autoAdjustSettings); - out.writeLong(remainingTimeToBaselineAdjust); - out.writeBoolean(baselineAdjustInProgress); - U.writeEnum(out, clusterState); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - topVer = in.readLong(); - baseline = U.readTreeMap(in); - servers = U.readTreeMap(in); - autoAdjustSettings = (BaselineAutoAdjustSettings)in.readObject(); - remainingTimeToBaselineAdjust = in.readLong(); - baselineAdjustInProgress = in.readBoolean(); - clusterState = U.readEnum(in, ClusterState.class); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(BaselineTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheAffinityConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheAffinityConfiguration.java index 3f2af54a0a4d8..789d284abe3c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheAffinityConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheAffinityConfiguration.java @@ -17,16 +17,12 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.apache.ignite.cache.affinity.AffinityFunction; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.internal.util.IgniteUtils.findNonPublicMethod; @@ -40,19 +36,19 @@ public class CacheAffinityConfiguration extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cache affinity function. */ - private String function; + String function; /** Cache affinity mapper. */ - private String mapper; + String mapper; /** Number of backup nodes for one partition. */ - private int partitionedBackups; + int partitionedBackups; /** Total partition count. */ - private int partitions; + int partitions; /** Cache partitioned affinity exclude neighbors. */ - private Boolean exclNeighbors; + Boolean exclNeighbors; /** * Default constructor @@ -121,24 +117,6 @@ public int getPartitions() { return exclNeighbors; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, function); - U.writeString(out, mapper); - out.writeInt(partitionedBackups); - out.writeInt(partitions); - out.writeObject(exclNeighbors); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - function = U.readString(in); - mapper = U.readString(in); - partitionedBackups = in.readInt(); - partitions = in.readInt(); - exclNeighbors = (Boolean)in.readObject(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheAffinityConfiguration.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfiguration.java index b293591cab1dd..f71d9fb2802d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfiguration.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; @@ -30,9 +27,9 @@ import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; + import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass; import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactIterable; @@ -44,130 +41,130 @@ public class CacheConfiguration extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cache name. */ - private String name; + String name; /** Cache group name. */ - private String grpName; + String grpName; /** Cache mode. */ - private CacheMode mode; + CacheMode mode; /** Cache atomicity mode. */ - private CacheAtomicityMode atomicityMode; + CacheAtomicityMode atomicityMode; /** Eager ttl flag. */ - private boolean eagerTtl; + boolean eagerTtl; /** Write synchronization mode. */ - private CacheWriteSynchronizationMode writeSynchronizationMode; + CacheWriteSynchronizationMode writeSynchronizationMode; /** Invalidate. */ - private boolean invalidate; + boolean invalidate; /** Max concurrent async operations. */ - private int maxConcurrentAsyncOps; + int maxConcurrentAsyncOps; /** Cache interceptor. */ - private String interceptor; + String interceptor; /** Default lock acquisition timeout. */ - private long dfltLockTimeout; + long dfltLockTimeout; /** Cache affinity config. */ - private CacheAffinityConfiguration affinityCfg; + CacheAffinityConfiguration affinityCfg; /** Preload config. */ - private CacheRebalanceConfiguration rebalanceCfg; + CacheRebalanceConfiguration rebalanceCfg; /** Eviction config. */ - private CacheEvictionConfiguration evictCfg; + CacheEvictionConfiguration evictCfg; /** Near cache config. */ - private CacheNearConfiguration nearCfg; + CacheNearConfiguration nearCfg; /** Store config. */ - private CacheStoreConfiguration storeCfg; + CacheStoreConfiguration storeCfg; /** Collection of query entities. */ - private List qryEntities; + List qryEntities; /** Collection of type metadata. */ - private List jdbcTypes; + List jdbcTypes; /** Whether statistics collection is enabled. */ - private boolean statisticsEnabled; + boolean statisticsEnabled; /** Whether management is enabled. */ - private boolean mgmtEnabled; + boolean mgmtEnabled; /** Class name of cache loader factory. */ - private String ldrFactory; + String ldrFactory; /** Class name of cache writer factory. */ - private String writerFactory; + String writerFactory; /** Class name of expiry policy factory. */ - private String expiryPlcFactory; + String expiryPlcFactory; /** Query configuration. */ - private QueryConfiguration qryCfg; + QueryConfiguration qryCfg; /** System cache flag. */ - private boolean sys; + boolean sys; /** Keep binary in store flag. */ - private boolean storeKeepBinary; + boolean storeKeepBinary; /** On-heap cache enabled flag. */ - private boolean onheapCache; + boolean onheapCache; /** Partition loss policy. */ - private PartitionLossPolicy partLossPlc; + PartitionLossPolicy partLossPlc; /** Query parallelism. */ - private int qryParallelism; + int qryParallelism; /** Copy on read flag. */ - private boolean cpOnRead; + boolean cpOnRead; /** Eviction filter. */ - private String evictFilter; + String evictFilter; /** Listener configurations. */ - private String lsnrConfigurations; + String lsnrConfigurations; /** */ - private boolean loadPrevVal; + boolean loadPrevVal; /** Name of {@link DataRegionConfiguration} for this cache */ - private String dataRegName; + String dataRegName; /** Maximum inline size for sql indexes. */ - private int sqlIdxMaxInlineSize; + int sqlIdxMaxInlineSize; /** Node filter specifying nodes on which this cache should be deployed. */ - private String nodeFilter; + String nodeFilter; /** */ - private int qryDetailMetricsSz; + int qryDetailMetricsSz; /** Flag indicating whether data can be read from backup. */ - private boolean readFromBackup; + boolean readFromBackup; /** Name of class implementing GridCacheTmLookup. */ - private String tmLookupClsName; + String tmLookupClsName; /** Cache topology validator. */ - private String topValidator; + String topValidator; /** Dynamic deployment ID. */ - private IgniteUuid dynamicDeploymentId; + IgniteUuid dynamicDeploymentId; /** Disk page compression algorithm. */ - private DiskPageCompression diskPageCompression; + DiskPageCompression diskPageCompression; /** Algorithm specific disk page compression level. */ - private Integer diskPageCompressionLevel; + Integer diskPageCompressionLevel; /** * Default constructor. @@ -538,98 +535,6 @@ public Integer getDiskPageCompressionLevel() { return diskPageCompressionLevel; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, name); - U.writeString(out, grpName); - out.writeByte(CacheMode.toCode(mode)); - U.writeEnum(out, atomicityMode); - out.writeBoolean(eagerTtl); - U.writeEnum(out, writeSynchronizationMode); - out.writeBoolean(invalidate); - out.writeInt(maxConcurrentAsyncOps); - U.writeString(out, interceptor); - out.writeLong(dfltLockTimeout); - out.writeObject(affinityCfg); - out.writeObject(rebalanceCfg); - out.writeObject(evictCfg); - out.writeObject(nearCfg); - out.writeObject(storeCfg); - U.writeCollection(out, qryEntities); - U.writeCollection(out, jdbcTypes); - out.writeBoolean(statisticsEnabled); - out.writeBoolean(mgmtEnabled); - U.writeString(out, ldrFactory); - U.writeString(out, writerFactory); - U.writeString(out, expiryPlcFactory); - out.writeObject(qryCfg); - out.writeBoolean(sys); - out.writeBoolean(storeKeepBinary); - out.writeBoolean(onheapCache); - U.writeEnum(out, partLossPlc); - out.writeInt(qryParallelism); - out.writeBoolean(cpOnRead); - U.writeString(out, evictFilter); - U.writeString(out, lsnrConfigurations); - out.writeBoolean(loadPrevVal); - U.writeString(out, dataRegName); - out.writeInt(sqlIdxMaxInlineSize); - U.writeString(out, nodeFilter); - out.writeInt(qryDetailMetricsSz); - out.writeBoolean(readFromBackup); - U.writeString(out, tmLookupClsName); - U.writeString(out, topValidator); - U.writeIgniteUuid(out, dynamicDeploymentId); - U.writeEnum(out, diskPageCompression); - out.writeObject(diskPageCompressionLevel); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - name = U.readString(in); - grpName = U.readString(in); - mode = CacheMode.fromCode(in.readByte()); - atomicityMode = CacheAtomicityMode.fromOrdinal(in.readByte()); - eagerTtl = in.readBoolean(); - writeSynchronizationMode = CacheWriteSynchronizationMode.fromOrdinal(in.readByte()); - invalidate = in.readBoolean(); - maxConcurrentAsyncOps = in.readInt(); - interceptor = U.readString(in); - dfltLockTimeout = in.readLong(); - affinityCfg = (CacheAffinityConfiguration)in.readObject(); - rebalanceCfg = (CacheRebalanceConfiguration)in.readObject(); - evictCfg = (CacheEvictionConfiguration)in.readObject(); - nearCfg = (CacheNearConfiguration)in.readObject(); - storeCfg = (CacheStoreConfiguration)in.readObject(); - qryEntities = U.readList(in); - jdbcTypes = U.readList(in); - statisticsEnabled = in.readBoolean(); - mgmtEnabled = in.readBoolean(); - ldrFactory = U.readString(in); - writerFactory = U.readString(in); - expiryPlcFactory = U.readString(in); - qryCfg = (QueryConfiguration)in.readObject(); - sys = in.readBoolean(); - storeKeepBinary = in.readBoolean(); - onheapCache = in.readBoolean(); - partLossPlc = PartitionLossPolicy.fromOrdinal(in.readByte()); - qryParallelism = in.readInt(); - cpOnRead = in.readBoolean(); - evictFilter = U.readString(in); - lsnrConfigurations = U.readString(in); - loadPrevVal = in.readBoolean(); - dataRegName = U.readString(in); - sqlIdxMaxInlineSize = in.readInt(); - nodeFilter = U.readString(in); - qryDetailMetricsSz = in.readInt(); - readFromBackup = in.readBoolean(); - tmLookupClsName = U.readString(in); - topValidator = U.readString(in); - dynamicDeploymentId = U.readIgniteUuid(in); - diskPageCompression = DiskPageCompression.fromOrdinal(in.readByte()); - diskPageCompressionLevel = (Integer)in.readObject(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheConfiguration.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTaskArg.java index 0d0959376c193..ce967340b3aec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTaskArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheConfigurationCollectorTaskArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.regex.Pattern; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Argument for {@link CacheConfigurationCollectorTask}. @@ -34,10 +30,10 @@ public class CacheConfigurationCollectorTaskArg extends IgniteDataTransferObject private static final long serialVersionUID = 0L; /** Collection of cache names. */ - private Collection cacheNames; + Collection cacheNames; /** Cache name regexp. */ - private String regex; + String regex; /** * Default constructor. @@ -77,18 +73,6 @@ public String getRegex() { return regex; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, cacheNames); - U.writeString(out, regex); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cacheNames = U.readCollection(in); - regex = U.readString(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheConfigurationCollectorTaskArg.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheEvictionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheEvictionConfiguration.java index 03f4800f5905f..d468c949ded88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheEvictionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheEvictionConfiguration.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import javax.cache.configuration.Factory; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass; @@ -38,13 +34,13 @@ public class CacheEvictionConfiguration extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Eviction policy. */ - private String plc; + String plc; /** Cache eviction policy max size. */ - private Integer plcMaxSize; + Integer plcMaxSize; /** Eviction filter to specify which entries should not be evicted. */ - private String filter; + String filter; /** * Default constructor. @@ -86,20 +82,6 @@ public CacheEvictionConfiguration(CacheConfiguration ccfg) { return filter; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, plc); - out.writeObject(plcMaxSize); - U.writeString(out, filter); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - plc = U.readString(in); - plcMaxSize = (Integer)in.readObject(); - filter = U.readString(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheEvictionConfiguration.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheInfo.java index 0e252b1d8aefd..f0c72846029fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheInfo.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.LinkedHashMap; import java.util.Map; import org.apache.ignite.cache.CacheAtomicityMode; @@ -27,7 +24,6 @@ import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Cache info DTO. @@ -37,46 +33,46 @@ public class CacheInfo extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Sequence name. */ - private String seqName; + String seqName; /** Sequence value. */ - private long seqVal; + long seqVal; /** Cache name. */ - private String cacheName; + String cacheName; /** Cache id. */ - private int cacheId; + int cacheId; /** Group name. */ - private String grpName; + String grpName; /** Group id. */ - private int grpId; + int grpId; /** Caches count. */ - private int cachesCnt; + int cachesCnt; /** Partitions. */ - private int partitions; + int partitions; /** Mapped. */ - private int mapped; + int mapped; /** Topology version. */ public AffinityTopologyVersion topVer; /** Mode. */ - private CacheMode mode; + CacheMode mode; /** Atomicity mode. */ - private CacheAtomicityMode atomicityMode; + CacheAtomicityMode atomicityMode; /** Backups count. */ - private int backupsCnt; + int backupsCnt; /** Affinity class name. */ - private String affinityClsName; + String affinityClsName; /** */ public String getSeqName() { @@ -342,42 +338,6 @@ public Map toMap(ViewCacheCmd cmd) { return map; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, seqName); - out.writeLong(seqVal); - U.writeString(out, cacheName); - out.writeInt(cacheId); - U.writeString(out, grpName); - out.writeInt(grpId); - out.writeInt(partitions); - out.writeInt(mapped); - out.writeObject(topVer); - out.writeByte(CacheMode.toCode(mode)); - out.writeInt(backupsCnt); - U.writeString(out, affinityClsName); - out.writeInt(cachesCnt); - U.writeEnum(out, atomicityMode); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - seqName = U.readString(in); - seqVal = in.readLong(); - cacheName = U.readString(in); - cacheId = in.readInt(); - grpName = U.readString(in); - grpId = in.readInt(); - partitions = in.readInt(); - mapped = in.readInt(); - topVer = (AffinityTopologyVersion)in.readObject(); - mode = CacheMode.fromCode(in.readByte()); - backupsCnt = in.readInt(); - affinityClsName = U.readString(in); - cachesCnt = in.readInt(); - atomicityMode = CacheAtomicityMode.fromOrdinal(in.readByte()); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheInfo.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcType.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcType.java index f93a3480b5ae5..08242816e587d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcType.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcType.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.ArrayList; import java.util.List; import javax.cache.configuration.Factory; @@ -39,22 +36,22 @@ public class CacheJdbcType extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Schema name in database. */ - private String dbSchema; + String dbSchema; /** Table name in database. */ - private String dbTbl; + String dbTbl; /** Key class used to store key in cache. */ - private String keyType; + String keyType; /** Value class used to store value in cache. */ - private String valType; + String valType; /** Key fields. */ - private List keyFields; + List keyFields; /** Value fields. */ - private List valFields; + List valFields; /** * @param factory Store factory to extract JDBC types info. @@ -161,26 +158,6 @@ public List getValueFields() { return valFields; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, dbSchema); - U.writeString(out, dbTbl); - U.writeString(out, keyType); - U.writeString(out, valType); - U.writeCollection(out, keyFields); - U.writeCollection(out, valFields); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - dbSchema = U.readString(in); - dbTbl = U.readString(in); - keyType = U.readString(in); - valType = U.readString(in); - keyFields = U.readList(in); - valFields = U.readList(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheJdbcType.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcTypeField.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcTypeField.java index ed8a906ba1777..a383d59a4c669 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcTypeField.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheJdbcTypeField.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.cache.store.jdbc.JdbcTypeField; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Data transfer object for {@link JdbcTypeField}. @@ -33,16 +29,16 @@ public class CacheJdbcTypeField extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Column name in database. */ - private String dbName; + String dbName; /** Column JDBC type in database. */ - private int dbType; + int dbType; /** Field name in java object. */ - private String javaName; + String javaName; /** Corresponding java type. */ - private String javaType; + String javaType; /** * Empty constructor. @@ -94,22 +90,6 @@ public String getJavaType() { return javaType; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, dbName); - out.writeInt(dbType); - U.writeString(out, javaName); - U.writeString(out, javaType); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - dbName = U.readString(in); - dbType = in.readInt(); - javaName = U.readString(in); - javaType = U.readString(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheJdbcTypeField.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheNearConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheNearConfiguration.java index 0f267d5d2e9ce..879f6d5f8e210 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheNearConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheNearConfiguration.java @@ -17,16 +17,12 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import javax.cache.configuration.Factory; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.cache.GridCacheUtils; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass; @@ -40,16 +36,16 @@ public class CacheNearConfiguration extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Flag indicating if near cache enabled. */ - private boolean nearEnabled; + boolean nearEnabled; /** Near cache start size. */ - private int nearStartSize; + int nearStartSize; /** Near cache eviction policy. */ - private String nearEvictPlc; + String nearEvictPlc; /** Near cache eviction policy maximum size. */ - private Integer nearEvictMaxSize; + Integer nearEvictMaxSize; /** * Default constructor. @@ -105,22 +101,6 @@ public int getNearStartSize() { return nearEvictMaxSize; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeBoolean(nearEnabled); - out.writeInt(nearStartSize); - U.writeString(out, nearEvictPlc); - out.writeObject(nearEvictMaxSize); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nearEnabled = in.readBoolean(); - nearStartSize = in.readInt(); - nearEvictPlc = U.readString(in); - nearEvictMaxSize = (Integer)in.readObject(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheNearConfiguration.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheRebalanceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheRebalanceConfiguration.java index 26777aaba2450..d0503c4a5a0de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheRebalanceConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheRebalanceConfiguration.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.cache.CacheRebalanceMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Data transfer object for cache rebalance configuration properties. @@ -34,25 +30,25 @@ public class CacheRebalanceConfiguration extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cache rebalance mode. */ - private CacheRebalanceMode mode; + CacheRebalanceMode mode; /** Cache rebalance batch size. */ - private int batchSize; + int batchSize; /** Rebalance partitioned delay. */ - private long partitionedDelay; + long partitionedDelay; /** Time in milliseconds to wait between rebalance messages. */ - private long throttle; + long throttle; /** Rebalance timeout. */ - private long timeout; + long timeout; /** Rebalance batches prefetch count. */ - private long batchesPrefetchCnt; + long batchesPrefetchCnt; /** Cache rebalance order. */ - private int rebalanceOrder; + int rebalanceOrder; /** * Default constructor. @@ -124,28 +120,6 @@ public int getRebalanceOrder() { return rebalanceOrder; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeEnum(out, mode); - out.writeInt(batchSize); - out.writeLong(partitionedDelay); - out.writeLong(throttle); - out.writeLong(timeout); - out.writeLong(batchesPrefetchCnt); - out.writeInt(rebalanceOrder); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - mode = CacheRebalanceMode.fromOrdinal(in.readByte()); - batchSize = in.readInt(); - partitionedDelay = in.readLong(); - throttle = in.readLong(); - timeout = in.readLong(); - batchesPrefetchCnt = in.readLong(); - rebalanceOrder = in.readInt(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheRebalanceConfiguration.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStoreConfiguration.java index 0c663a3f2cfcb..cf6bd1b8c5937 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStoreConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheStoreConfiguration.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.cache.store.jdbc.CacheAbstractJdbcStore; import org.apache.ignite.configuration.CacheConfiguration; @@ -27,7 +24,6 @@ import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClass; @@ -40,40 +36,40 @@ public class CacheStoreConfiguration extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Whether cache has JDBC store. */ - private boolean jdbcStore; + boolean jdbcStore; /** Cache store class name. */ - private String store; + String store; /** Cache store factory class name. */ - private String storeFactory; + String storeFactory; /** Whether cache should operate in read-through mode. */ - private boolean readThrough; + boolean readThrough; /** Whether cache should operate in write-through mode. */ - private boolean writeThrough; + boolean writeThrough; /** Flag indicating whether write-behind behaviour should be used for the cache store. */ - private boolean writeBehindEnabled; + boolean writeBehindEnabled; /** Maximum batch size for write-behind cache store operations. */ - private int batchSz; + int batchSz; /** Frequency with which write-behind cache is flushed to the cache store in milliseconds. */ - private long flushFreq; + long flushFreq; /** Maximum object count in write-behind cache. */ - private int flushSz; + int flushSz; /** Number of threads that will perform cache flushing. */ - private int flushThreadCnt; + int flushThreadCnt; /** Keep binary in store flag. */ - private boolean storeKeepBinary; + boolean storeKeepBinary; /** Write coalescing flag for write-behind cache store */ - private boolean writeBehindCoalescing; + boolean writeBehindCoalescing; /** * Default constructor. @@ -203,38 +199,6 @@ public boolean getWriteBehindCoalescing() { return writeBehindCoalescing; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeBoolean(jdbcStore); - U.writeString(out, store); - U.writeString(out, storeFactory); - out.writeBoolean(readThrough); - out.writeBoolean(writeThrough); - out.writeBoolean(writeBehindEnabled); - out.writeInt(batchSz); - out.writeLong(flushFreq); - out.writeInt(flushSz); - out.writeInt(flushThreadCnt); - out.writeBoolean(storeKeepBinary); - out.writeBoolean(writeBehindCoalescing); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - jdbcStore = in.readBoolean(); - store = U.readString(in); - storeFactory = U.readString(in); - readThrough = in.readBoolean(); - writeThrough = in.readBoolean(); - writeBehindEnabled = in.readBoolean(); - batchSz = in.readInt(); - flushFreq = in.readLong(); - flushSz = in.readInt(); - flushThreadCnt = in.readInt(); - storeKeepBinary = in.readBoolean(); - writeBehindCoalescing = in.readBoolean(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheStoreConfiguration.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTaskResult.java index 6da1c85c68812..d7aa6b79c58fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ContentionTaskResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.List; import java.util.Map; @@ -27,7 +24,6 @@ import java.util.stream.Collectors; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * @@ -37,10 +33,10 @@ public class ContentionTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cluster infos. */ - private List clusterInfos; + List clusterInfos; /** Exceptions. */ - private Map exceptions; + Map exceptions; /** * @param clusterInfos Cluster infos. @@ -79,18 +75,6 @@ public Map exceptions() { return exceptions; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, clusterInfos); - U.writeMap(out, exceptions); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - clusterInfos = U.readList(in); - exceptions = U.readMap(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ContentionTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceJobResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceJobResult.java index 7903146436395..4b792ec677688 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceJobResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceJobResult.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Map; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.NotNull; /** @@ -36,7 +32,7 @@ public class FindAndDeleteGarbageInPersistenceJobResult extends IgniteDataTransf /** Results of indexes validation from node. */ @GridToStringInclude - private Map> result; + Map> result; /** * @param result Results with founded garbage (GroupId -> (CacheId, Count of keys)). @@ -65,16 +61,6 @@ public boolean hasGarbage() { return result != null && !result.isEmpty(); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, result); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - result = U.readMap(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(FindAndDeleteGarbageInPersistenceJobResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTaskResult.java index 1a866e4f96cab..626412e49372f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceTaskResult.java @@ -17,15 +17,11 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Map; import java.util.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Result of running {@link FindAndDeleteGarbageInPersistenceTask} which would contain result @@ -37,11 +33,11 @@ public class FindAndDeleteGarbageInPersistenceTaskResult extends IgniteDataTrans /** Results of indexes validation from node. */ @GridToStringInclude - private Map result; + Map result; /** Exceptions while indexes validation from node. */ @GridToStringInclude - private Map exceptions; + Map exceptions; /** * @@ -76,18 +72,6 @@ public Map exceptions() { return exceptions; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, result); - U.writeMap(out, exceptions); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - result = U.readMap(in); - exceptions = U.readMap(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(FindAndDeleteGarbageInPersistenceTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpResult.java index c7b49b7aea692..9d96fdd1d65b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyDumpResult.java @@ -16,15 +16,12 @@ */ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.cache.verify.PartitionHashRecord; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Encapsulates result of {@link VerifyBackupPartitionsDumpTask}. @@ -34,12 +31,12 @@ public class IdleVerifyDumpResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cluster hashes. */ - private Map> clusterHashes; + LinkedHashMap> clusterHashes; /** * @param clusterHashes Cluster hashes. */ - public IdleVerifyDumpResult(Map> clusterHashes) { + public IdleVerifyDumpResult(LinkedHashMap> clusterHashes) { this.clusterHashes = clusterHashes; } @@ -49,16 +46,6 @@ public IdleVerifyDumpResult(Map> cluster public IdleVerifyDumpResult() { } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, clusterHashes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - clusterHashes = U.readLinkedMap(in); - } - /** * @return Cluster hashes. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyResult.java index 14e9c6a2359f7..250f68f93b3fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IdleVerifyResult.java @@ -16,9 +16,6 @@ */ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -40,7 +37,6 @@ import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.internal.util.IgniteUtils.nl; @@ -54,31 +50,31 @@ public class IdleVerifyResult extends IgniteDataTransferObject { /** Counter conflicts. */ @GridToStringInclude - private Map> cntrConflicts; + Map> cntrConflicts; /** Hash conflicts. */ @GridToStringInclude - private Map> hashConflicts; + Map> hashConflicts; /** Moving partitions. */ @GridToStringInclude - private Map> movingPartitions; + Map> movingPartitions; /** Lost partitions. */ @GridToStringInclude - private Map> lostPartitions; + Map> lostPartitions; /** Transaction hashes conflicts. */ @GridToStringInclude - private @Nullable List> txHashConflicts; + @Nullable List> txHashConflicts; /** Partial committed transactions. */ @GridToStringInclude - private @Nullable Map> partiallyCommittedTxs; + @Nullable Map> partiallyCommittedTxs; /** Exceptions. */ @GridToStringInclude - private Map exceptions; + Map exceptions; /** * Default constructor for Externalizable. @@ -108,28 +104,6 @@ private IdleVerifyResult( this.exceptions = exceptions; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, cntrConflicts); - U.writeMap(out, hashConflicts); - U.writeMap(out, movingPartitions); - U.writeMap(out, exceptions); - U.writeMap(out, lostPartitions); - U.writeCollection(out, txHashConflicts); - U.writeMap(out, partiallyCommittedTxs); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cntrConflicts = U.readMap(in); - hashConflicts = U.readMap(in); - movingPartitions = U.readMap(in); - exceptions = U.readMap(in); - lostPartitions = U.readMap(in); - txHashConflicts = (List)U.readCollection(in); - partiallyCommittedTxs = U.readMap(in); - } - /** * @return Counter conflicts. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTaskRes.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTaskRes.java index 5ecfa7e46a1d1..98bb2e5da213e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTaskRes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexForceRebuildTaskRes.java @@ -32,13 +32,13 @@ public class IndexForceRebuildTaskRes extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Caches for which indexes rebuild was triggered. */ - private Set cachesWithStartedRebuild; + Set cachesWithStartedRebuild; /** Caches with indexes rebuild in progress. */ - private Set cachesWithRebuildInProgress; + Set cachesWithRebuildInProgress; /** Names of caches that were not found. */ - private Set notFoundCacheNames; + Set notFoundCacheNames; /** * Empty constructor required for Serializable. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexIntegrityCheckIssue.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexIntegrityCheckIssue.java index e32240269d21d..dcba44b42ae86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexIntegrityCheckIssue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexIntegrityCheckIssue.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * @@ -33,11 +29,11 @@ public class IndexIntegrityCheckIssue extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cache group name. */ - private String grpName; + String grpName; /** T. */ @GridToStringExclude - private Throwable t; + Throwable t; /** * @@ -55,18 +51,6 @@ public IndexIntegrityCheckIssue(String grpName, Throwable t) { this.t = t; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, this.grpName); - out.writeObject(t); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - this.grpName = U.readString(in); - this.t = (Throwable)in.readObject(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(IndexIntegrityCheckIssue.class, this) + ", " + t.getClass() + ": " + t.getMessage(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListInfoContainer.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListInfoContainer.java index f64cb29f8583a..518f7fb49adfb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListInfoContainer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexListInfoContainer.java @@ -17,16 +17,12 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.Comparator; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Container for index info. @@ -39,20 +35,20 @@ public class IndexListInfoContainer extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Group name. */ - private String grpName; + String grpName; /** Cache name. */ - private String cacheName; + String cacheName; /** Index name. */ - private String idxName; + String idxName; /** Columns names. */ @GridToStringInclude - private Collection colsNames; + Collection colsNames; /** Table name. */ - private String tblName; + String tblName; /** * Empty constructor required for Serializable. @@ -77,24 +73,6 @@ public IndexListInfoContainer( this.tblName = tblName; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, cacheName); - U.writeString(out, grpName); - U.writeString(out, idxName); - U.writeCollection(out, colsNames); - U.writeString(out, tblName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cacheName = U.readString(in); - grpName = U.readString(in); - idxName = U.readString(in); - colsNames = U.readCollection(in); - tblName = U.readString(in); - } - /** * @param tblName New table name. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusInfoContainer.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusInfoContainer.java index 43fe6e8eedf86..89bf674ed15a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusInfoContainer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexRebuildStatusInfoContainer.java @@ -38,16 +38,16 @@ public class IndexRebuildStatusInfoContainer extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Group name. */ - private String groupName; + String groupName; /** Cache name. */ - private String cacheName; + String cacheName; /** */ - private int indexBuildPartitionsLeftCount; + int indexBuildPartitionsLeftCount; /** Local partitions count. */ - private int totalPartitionsCount; + int totalPartitionsCount; /** * Empty constructor required for Serializable. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexValidationIssue.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexValidationIssue.java index 31d2ab283a5c8..9e5a6bb9739dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexValidationIssue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/IndexValidationIssue.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * @@ -33,17 +29,17 @@ public class IndexValidationIssue extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Key. */ - private String key; + String key; /** Cache name. */ - private String cacheName; + String cacheName; /** Index name. */ - private String idxName; + String idxName; /** T. */ @GridToStringExclude - private Throwable t; + Throwable t; /** * @@ -65,22 +61,6 @@ public IndexValidationIssue(String key, String cacheName, String idxName, Throwa this.t = t; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, key); - U.writeString(out, cacheName); - U.writeString(out, idxName); - out.writeObject(t); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - key = U.readString(in); - cacheName = U.readString(in); - idxName = U.readString(in); - t = (Throwable)in.readObject(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(IndexValidationIssue.class, this) + ", " + t.getClass() + ": " + t.getMessage(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryConfiguration.java index 646b5ba1b0699..683149fa7f31c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryConfiguration.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import static org.apache.ignite.internal.visor.util.VisorTaskUtils.compactClasses; @@ -36,19 +32,19 @@ public class QueryConfiguration extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private List sqlFuncClss; + List sqlFuncClss; /** */ - private long longQryWarnTimeout; + long longQryWarnTimeout; /** */ - private boolean sqlEscapeAll; + boolean sqlEscapeAll; /** */ - private List indexedTypes; + List indexedTypes; /** */ - private String sqlSchema; + String sqlSchema; /** * Default constructor. @@ -105,24 +101,6 @@ public String getSqlSchema() { return sqlSchema; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, sqlFuncClss); - out.writeLong(longQryWarnTimeout); - out.writeBoolean(sqlEscapeAll); - U.writeCollection(out, indexedTypes); - U.writeString(out, sqlSchema); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - sqlFuncClss = U.readList(in); - longQryWarnTimeout = in.readLong(); - sqlEscapeAll = in.readBoolean(); - indexedTypes = U.readList(in); - sqlSchema = U.readString(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(QueryConfiguration.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryEntity.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryEntity.java index 5b4e721e5ceec..2f293e1ee190f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryEntity.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryEntity.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -27,10 +24,8 @@ import java.util.List; import java.util.Map; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Data transfer object for {@link org.apache.ignite.cache.QueryEntity}. @@ -40,31 +35,31 @@ public class QueryEntity extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Key class used to store key in cache. */ - private String keyType; + String keyType; /** Value class used to store value in cache. */ - private String valType; + String valType; /** Fields to be queried, in addition to indexed fields. */ - private Map qryFlds; + Map qryFlds; /** Key fields. */ - private List keyFields; + List keyFields; /** Aliases. */ - private Map aliases; + Map aliases; /** Table name. */ - private String tblName; + String tblName; /** Key name. Can be used in field list to denote the key as a whole. */ - private String keyFieldName; + String keyFieldName; /** Value name. Can be used in field list to denote the entire value. */ - private String valFieldName; + String valFieldName; /** Fields to create group indexes for. */ - private List grps; + List grps; /** * @param qryEntities Collection of query entities. @@ -182,32 +177,6 @@ public List getGroups() { return grps; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, keyType); - U.writeString(out, valType); - U.writeCollection(out, keyFields); - IgniteUtils.writeStringMap(out, qryFlds); - U.writeMap(out, aliases); - U.writeCollection(out, grps); - U.writeString(out, tblName); - U.writeString(out, keyFieldName); - U.writeString(out, valFieldName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - keyType = U.readString(in); - valType = U.readString(in); - keyFields = U.readList(in); - qryFlds = IgniteUtils.readStringMap(in); - aliases = U.readMap(in); - grps = U.readList(in); - tblName = U.readString(in); - keyFieldName = U.readString(in); - valFieldName = U.readString(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(QueryEntity.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndex.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndex.java index e47fa8aaacee9..888fac5bc41fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndex.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndex.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.cache.QueryIndexType; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Data transfer object for {@link org.apache.ignite.cache.QueryIndex}. @@ -34,13 +30,13 @@ public class QueryIndex extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Name of index. */ - private String name; + String name; /** Type of index. */ - private QueryIndexType type; + QueryIndexType type; /** Fields to create group indexes for. */ - private List fields; + List fields; /** * Create data transfer object for given cache type metadata. @@ -83,20 +79,6 @@ public List getFields() { return fields; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, name); - U.writeEnum(out, type); - U.writeCollection(out, fields); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - name = U.readString(in); - type = QueryIndexType.fromOrdinal(in.readByte()); - fields = U.readList(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(QueryIndex.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndexField.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndexField.java index 34be7fda88b39..deaf18bf9a093 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndexField.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/QueryIndexField.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -27,7 +24,6 @@ import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Data transfer object for {@link QueryEntity}. @@ -37,10 +33,10 @@ public class QueryIndexField extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Index field name. */ - private String name; + String name; /** Index field sort order. */ - private boolean sort; + boolean sort; /** * Create data transfer object for given cache type metadata. @@ -87,18 +83,6 @@ public boolean getSortOrder() { return sort; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, name); - out.writeBoolean(sort); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - name = U.readString(in); - sort = in.readBoolean(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(QueryIndexField.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildJobRes.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildJobRes.java index a15107d54e951..de89a3ca6db23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildJobRes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildJobRes.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Map; import java.util.Set; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Result of the ScheduleIndexRebuildJob. @@ -33,16 +29,16 @@ public class ScheduleIndexRebuildJobRes extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Map cache names -> indexes scheduled for the rebuild. */ - private Map> cacheToIndexes; + Map> cacheToIndexes; /** Names of cache indexes that were not found (cache -> set of indexes). */ - private Map> notFoundIndexes; + Map> notFoundIndexes; /** Names of caches that were not found. */ - private Set notFoundCacheNames; + Set notFoundCacheNames; /** Names of cache groups that were not found. */ - private Set notFoundGroupNames; + Set notFoundGroupNames; /** * Empty constructor required for Serializable. @@ -71,22 +67,6 @@ public ScheduleIndexRebuildJobRes( this.notFoundGroupNames = notFoundGroupNames; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, cacheToIndexes); - U.writeMap(out, notFoundIndexes); - U.writeCollection(out, notFoundCacheNames); - U.writeCollection(out, notFoundGroupNames); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cacheToIndexes = U.readMap(in); - notFoundIndexes = U.readMap(in); - notFoundCacheNames = U.readSet(in); - notFoundGroupNames = U.readSet(in); - } - /** * @return Map cache names -> indexes scheduled for the rebuild. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTaskRes.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTaskRes.java index 7a9edab79a867..de4ce18233435 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTaskRes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ScheduleIndexRebuildTaskRes.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Map; import java.util.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Result of the ScheduleIndexRebuildTask. @@ -33,7 +29,7 @@ public class ScheduleIndexRebuildTaskRes extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Map node id -> rebuild command result. */ - private Map results; + Map results; /** * Empty constructor required for Serializable. @@ -51,16 +47,6 @@ public ScheduleIndexRebuildTaskRes(Map results this.results = results; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, results); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - results = U.readMap(in); - } - /** * @return Map node id -> rebuild command result. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeIssue.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeIssue.java index 9d998b31c4923..4021a1f76ea95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeIssue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeIssue.java @@ -17,17 +17,11 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.internal.util.IgniteUtils.readLongString; -import static org.apache.ignite.internal.util.IgniteUtils.writeLongString; - /** * Issue when checking size of cache and index. */ @@ -36,14 +30,14 @@ public class ValidateIndexesCheckSizeIssue extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Index name. */ - private String idxName; + String idxName; /** Index size. */ - private long idxSize; + long idxSize; /** Error. */ @GridToStringExclude - private Throwable t; + Throwable t; /** * Default constructor. @@ -65,20 +59,6 @@ public ValidateIndexesCheckSizeIssue(@Nullable String idxName, long idxSize, @Nu this.t = t; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - writeLongString(out, idxName); - out.writeLong(idxSize); - out.writeObject(t); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - idxName = readLongString(in); - idxSize = in.readLong(); - t = (Throwable)in.readObject(); - } - /** * Return index size. * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeResult.java index 0bd9ce3f59f9f..d157116a3777d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesCheckSizeResult.java @@ -17,17 +17,12 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.internal.S; import static java.util.Collections.emptyList; -import static org.apache.ignite.internal.util.IgniteUtils.readCollection; -import static org.apache.ignite.internal.util.IgniteUtils.writeCollection; /** * Result of checking size cache and index. @@ -37,11 +32,11 @@ public class ValidateIndexesCheckSizeResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cache size. */ - private long cacheSize; + long cacheSize; /** Issues. */ @GridToStringExclude - private Collection issues; + Collection issues; /** * Default constructor. @@ -79,18 +74,6 @@ public long cacheSize() { return cacheSize; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeLong(cacheSize); - writeCollection(out, issues); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cacheSize = in.readLong(); - issues = readCollection(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ValidateIndexesCheckSizeResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesJobResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesJobResult.java index c109d9ee59059..57e8513513c94 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesJobResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesJobResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.Map; import org.apache.ignite.internal.dto.IgniteDataTransferObject; @@ -29,10 +26,6 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; -import static org.apache.ignite.internal.util.IgniteUtils.readCollection; -import static org.apache.ignite.internal.util.IgniteUtils.readMap; -import static org.apache.ignite.internal.util.IgniteUtils.writeCollection; -import static org.apache.ignite.internal.util.IgniteUtils.writeMap; /** * @@ -43,19 +36,19 @@ public class ValidateIndexesJobResult extends IgniteDataTransferObject { /** Results of indexes validation from node. */ @GridToStringInclude - private Map partRes; + Map partRes; /** Results of reverse indexes validation from node. */ @GridToStringInclude - private Map idxRes; + Map idxRes; /** Integrity check issues. */ @GridToStringInclude - private Collection integrityCheckFailures; + Collection integrityCheckFailures; /** Results of checking size cache and index. */ @GridToStringInclude - private Map checkSizeRes; + Map checkSizeRes; /** * Constructor. @@ -123,22 +116,6 @@ public boolean hasIssues() { (checkSizeRes != null && checkSizeRes.entrySet().stream().anyMatch(e -> !e.getValue().issues().isEmpty())); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - writeMap(out, partRes); - writeMap(out, idxRes); - writeCollection(out, integrityCheckFailures); - writeMap(out, checkSizeRes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - partRes = readMap(in); - idxRes = readMap(in); - integrityCheckFailures = readCollection(in); - checkSizeRes = readMap(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ValidateIndexesJobResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesPartitionResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesPartitionResult.java index 38823e1a65446..b361e9b982136 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesPartitionResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesPartitionResult.java @@ -17,15 +17,11 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.ArrayList; import java.util.List; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Encapsulates intermediate results of validation of SQL index. @@ -39,7 +35,7 @@ public class ValidateIndexesPartitionResult extends IgniteDataTransferObject { /** Issues. */ @GridToStringExclude - private List issues = new ArrayList<>(MAX_ISSUES); + List issues = new ArrayList<>(MAX_ISSUES); /** * @@ -68,16 +64,6 @@ public boolean reportIssue(IndexValidationIssue t) { return false; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, issues); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - issues = U.readList(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ValidateIndexesPartitionResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTaskResult.java index f62c821dac2ae..569ca607d7627 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ValidateIndexesTaskResult.java @@ -18,9 +18,6 @@ package org.apache.ignite.internal.management.cache; import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.io.Serializable; import java.util.Collections; import java.util.HashMap; @@ -30,7 +27,6 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; /** @@ -41,10 +37,10 @@ public class ValidateIndexesTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Exceptions. */ - private @Nullable Map exceptions; + @Nullable Map exceptions; /** Results from cluster. */ - private @Nullable Map results; + @Nullable Map results; /** * Adds single node job result. @@ -87,18 +83,6 @@ public Map exceptions() { return exceptions == null ? Collections.emptyMap() : exceptions; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, exceptions); - U.writeMap(out, results); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - exceptions = U.readMap(in); - results = U.readMap(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ValidateIndexesTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTaskResult.java index 886fb22c30095..5b67fa7d0685f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/ViewCacheTaskResult.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.List; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * @@ -34,7 +30,7 @@ public class ViewCacheTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cache infos. */ - private List cacheInfos; + List cacheInfos; /** * @param cacheInfos Cache infos. @@ -56,16 +52,6 @@ public Collection cacheInfos() { return cacheInfos; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, cacheInfos); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cacheInfos = U.readList(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ViewCacheTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanTaskResult.java index 8ca3309e1db4e..efb145fc77a29 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanTaskResult.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.cache.scan; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Result of running {@link CacheScanTask}. @@ -34,10 +30,10 @@ public class CacheScanTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Column titles. */ - private List titles; + List titles; /** Cache entries. */ - private List> entries; + List> entries; /** * @@ -67,18 +63,6 @@ public List> entries() { return entries; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, titles); - U.writeCollection(out, entries); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - titles = U.readList(in); - entries = U.readList(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheScanTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyTaskResult.java index 83212554e19b5..39bdf07ab4c6f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyTaskResult.java @@ -17,11 +17,7 @@ package org.apache.ignite.internal.management.consistency; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** * @@ -31,31 +27,13 @@ public class ConsistencyTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Result. */ - private String msg; + String msg; /** Failed. */ - private boolean failed; + boolean failed; /** Cancelled. */ - private boolean cancelled; - - /** - * {@inheritDoc} - */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, msg); - out.writeBoolean(failed); - out.writeBoolean(cancelled); - } - - /** - * {@inheritDoc} - */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - msg = U.readString(in); - failed = in.readBoolean(); - cancelled = in.readBoolean(); - } + boolean cancelled; /** * @return Result. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationCommand.java index b091e38efb5f0..6c95037dce297 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationCommand.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.defragmentation; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.CommandRegistryImpl; @@ -44,15 +41,5 @@ public static class DefragmentationCancelCommandArg extends DefragmentationStatu public static class DefragmentationStatusCommandArg extends IgniteDataTransferObject { /** */ private static final long serialVersionUID = 0; - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - // No-op. - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - // No-op. - } } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationTaskResult.java index 4a78ab13b7408..cd269077ec576 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationTaskResult.java @@ -17,11 +17,7 @@ package org.apache.ignite.internal.management.defragmentation; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class DefragmentationTaskResult extends IgniteDataTransferObject { @@ -29,10 +25,10 @@ public class DefragmentationTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private boolean success; + boolean success; /** */ - private String msg; + String msg; /** Empty constructor for serialization. */ public DefragmentationTaskResult() { @@ -55,18 +51,4 @@ public boolean isSuccess() { public String getMessage() { return msg; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeBoolean(success); - - U.writeString(out, msg); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException { - success = in.readBoolean(); - - msg = U.readString(in); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityResult.java index 07c20473be94c..1ec97669522c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/ConnectivityResult.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.diagnostic; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Map; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; /** @@ -34,7 +30,7 @@ public class ConnectivityResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - @Nullable private Map nodeStatuses; + @Nullable Map nodeStatuses; /** * Default constructor. @@ -49,16 +45,6 @@ public ConnectivityResult(@Nullable Map nodeStatuses) { this.nodeStatuses = nodeStatuses; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, nodeStatuses); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodeStatuses = U.readMap(in); - } - /** * Get connectivity statuses for a node */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticConnectivityCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticConnectivityCommandArg.java index f58c5fc857e82..5bfe00b4b020b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticConnectivityCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticConnectivityCommandArg.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.management.diagnostic; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class DiagnosticConnectivityCommandArg extends IgniteDataTransferObject { @@ -30,17 +26,7 @@ public class DiagnosticConnectivityCommandArg extends IgniteDataTransferObject { private static final long serialVersionUID = 0; /** */ - private UUID[] nodes; - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeArray(out, nodes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodes = U.readArray(in, UUID.class); - } + UUID[] nodes; /** */ public void nodes(UUID[] nodes) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksResult.java index 3022dedf22b7e..236d8dc5e45fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/PageLocksResult.java @@ -17,11 +17,7 @@ package org.apache.ignite.internal.management.diagnostic; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** * @@ -31,7 +27,7 @@ public class PageLocksResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private String payload; + String payload; /** * @@ -47,17 +43,6 @@ public PageLocksResult(String payload) { this.payload = payload; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, payload); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) - throws IOException, ClassNotFoundException { - payload = U.readString(in); - } - /** * @return String result represetnation. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTaskResult.java index 372fd90418f31..cff4c721afe49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/CacheGroupEncryptionTaskResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.encryption; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collections; import java.util.Map; import java.util.UUID; @@ -27,7 +24,6 @@ import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Multinode cache group encryption task result. @@ -41,11 +37,11 @@ public class CacheGroupEncryptionTaskResult extends IgniteDataTransferObject /** Per node job result. */ @GridToStringInclude - private Map results; + Map results; /** Per node execution problems. */ @GridToStringInclude - private Map exceptions; + Map exceptions; /** * @param results Per node job result. @@ -71,18 +67,6 @@ public Map exceptions() { return exceptions == null ? Collections.emptyMap() : exceptions; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, results); - U.writeMap(out, exceptions); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - results = U.readMap(in); - exceptions = U.readMap(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheGroupEncryptionTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionRateTask.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionRateTask.java index 1fb6a6afaf71a..ccd42233356d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionRateTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/ReencryptionRateTask.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.encryption; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -97,12 +94,12 @@ protected ReencryptionRateJob(EncryptionReencryptionRateLimitCommandArg arg, boo } /** */ - protected static class ReencryptionRateJobResult extends IgniteDataTransferObject { + public static class ReencryptionRateJobResult extends IgniteDataTransferObject { /** Serial version uid. */ private static final long serialVersionUID = 0L; /** Re-encryption rate limit. */ - private Double limit; + Double limit; /** */ public ReencryptionRateJobResult() { @@ -120,15 +117,5 @@ public ReencryptionRateJobResult(Double limit) { public Double limit() { return limit; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeDouble(limit); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - limit = in.readDouble(); - } } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataListResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataListResult.java index cfe6521c75f55..2ab1831fdb5c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataListResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataListResult.java @@ -17,15 +17,11 @@ package org.apache.ignite.internal.management.meta; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.Collections; import org.apache.ignite.internal.binary.BinaryMetadata; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.task.GridInternal; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Represents information about cluster metadata. @@ -36,7 +32,7 @@ public class MetadataListResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cluster metadata. */ - private Collection meta = Collections.emptyList(); + Collection meta = Collections.emptyList(); /** * Constructor for optimized marshaller. @@ -52,16 +48,6 @@ public MetadataListResult(Collection meta) { this.meta = meta; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, meta); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - meta = U.readCollection(in); - } - /** * @return Cluster binary metadata. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataMarshalled.java b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataMarshalled.java index d52eeb9b30d91..1655c3435f3e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataMarshalled.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetadataMarshalled.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.meta; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.binary.BinaryMetadata; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.task.GridInternal; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Represents information about cluster metadata. @@ -34,10 +30,10 @@ public class MetadataMarshalled extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Marshaled metadata. */ - private byte[] metaMarshalled; + byte[] metaMarshalled; /** Metadata. */ - private BinaryMetadata meta; + BinaryMetadata meta; /** * Constructor for optimized marshaller. @@ -55,18 +51,6 @@ public MetadataMarshalled(byte[] metaMarshalled, BinaryMetadata meta) { this.meta = meta; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeByteArray(out, metaMarshalled); - out.writeObject(meta); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - metaMarshalled = U.readByteArray(in); - meta = (BinaryMetadata)in.readObject(); - } - /** * @return Cluster binary metadata. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureMaxValueCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureMaxValueCommandArg.java index abd93cac7468e..7417d9f9e43d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureMaxValueCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureMaxValueCommandArg.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.metric; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; @@ -33,20 +30,6 @@ public class MetricConfigureMaxValueCommandArg extends MetricCommandArg { @Positional long newTimeInterval; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - out.writeLong(newTimeInterval); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - newTimeInterval = in.readLong(); - } - /** */ public long newTimeInterval() { return newTimeInterval; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/performancestatistics/PerformanceStatisticsCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/performancestatistics/PerformanceStatisticsCommand.java index 9d44862a68750..7a1d91a0f6f15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/performancestatistics/PerformanceStatisticsCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/performancestatistics/PerformanceStatisticsCommand.java @@ -17,8 +17,6 @@ package org.apache.ignite.internal.management.performancestatistics; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.CommandRegistryImpl; @@ -56,15 +54,5 @@ public static class PerformanceStatisticsRotateCommandArg extends PerformanceSta public static class PerformanceStatisticsStatusCommandArg extends IgniteDataTransferObject { /** */ private static final long serialVersionUID = 0; - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) { - // No-op. - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) { - // No-op. - } } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCommand.java index 6ddc1578831fa..c3f726bb18cb5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCommand.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.persistence; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.function.Consumer; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.CommandRegistryImpl; @@ -62,16 +59,6 @@ public PersistenceCommand() { public abstract static class PersistenceTaskArg extends IgniteDataTransferObject { /** */ private static final long serialVersionUID = 0; - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - // No-op. - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - // No-op. - } } /** */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTaskResult.java index 1a615edf0145a..1ccfd93acf7f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceTaskResult.java @@ -17,14 +17,9 @@ package org.apache.ignite.internal.management.persistence; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.Map; - import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; /** */ @@ -33,19 +28,19 @@ public class PersistenceTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private boolean inMaintenanceMode; + boolean inMaintenanceMode; /** */ - private boolean maintenanceTaskCompleted; + boolean maintenanceTaskCompleted; /** */ - private Collection handledCaches; + Collection handledCaches; /** */ - private Collection failedToHandleCaches; + Collection failedToHandleCaches; /** */ - private Map> cachesInfo; + Map> cachesInfo; /** */ public PersistenceTaskResult() { @@ -59,24 +54,6 @@ public PersistenceTaskResult(boolean inMaintenanceMode) { this.inMaintenanceMode = inMaintenanceMode; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeBoolean(inMaintenanceMode); - out.writeBoolean(maintenanceTaskCompleted); - U.writeCollection(out, handledCaches); - U.writeCollection(out, failedToHandleCaches); - U.writeMap(out, cachesInfo); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - inMaintenanceMode = in.readBoolean(); - maintenanceTaskCompleted = in.readBoolean(); - handledCaches = U.readCollection(in); - failedToHandleCaches = U.readCollection(in); - cachesInfo = U.readMap(in); - } - /** */ public boolean inMaintenanceMode() { return inMaintenanceMode; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListResult.java index 7923b184b1caf..54ffe5d65107d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertiesListResult.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.property; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.task.GridInternal; import org.apache.ignite.internal.util.typedef.T3; -import org.apache.ignite.internal.util.typedef.internal.U; /** * List of the distributed properties names. @@ -35,7 +31,7 @@ public class PropertiesListResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Properties info: name, value, description. */ - private Collection> props; + Collection> props; /** * Constructor for optimized marshaller. @@ -51,16 +47,6 @@ public PropertiesListResult(Collection> props) { this.props = props; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, props); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - props = U.readCollection(in); - } - /** * @return Properties (name, value, description) collection. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyOperationResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyOperationResult.java index 36bd07ab268d8..08a2af6d15db8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyOperationResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyOperationResult.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.management.property; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.task.GridInternal; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Result of an operation with property. @@ -33,7 +29,7 @@ public class PropertyOperationResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Property value. */ - private String val; + String val; /** * Constructor for optimized marshaller. @@ -49,16 +45,6 @@ public PropertyOperationResult(String val) { this.val = val; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, val); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - val = U.readString(in); - } - /** * @return Property value. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeStatusNode.java b/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeStatusNode.java index eb22b9c5b19a5..61607c4cd260c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeStatusNode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeStatusNode.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.rollingupgrade; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.UUID; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteProductVersion; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER; @@ -35,22 +31,22 @@ public class RollingUpgradeStatusNode extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private UUID uuid; + UUID uuid; /** */ - private Object consistentId; + Object consistentId; /** */ - private Collection addresses; + Collection addresses; /** */ - private IgniteProductVersion ver; + IgniteProductVersion ver; /** */ - private long order; + long order; /** */ - private boolean client; + boolean client; /** */ public RollingUpgradeStatusNode() { @@ -67,26 +63,6 @@ public RollingUpgradeStatusNode(ClusterNode node) { client = node.isClient(); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(ver); - U.writeUuid(out, uuid); - out.writeObject(consistentId); - U.writeCollection(out, addresses); - out.writeLong(order); - out.writeBoolean(client); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - ver = (IgniteProductVersion)in.readObject(); - uuid = U.readUuid(in); - consistentId = in.readObject(); - addresses = U.readCollection(in); - order = in.readLong(); - client = in.readBoolean(); - } - /** */ public IgniteProductVersion version() { return ver; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeTaskResult.java index 99e9b59371248..720cb5750c6f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeTaskResult.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.rollingupgrade; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteProductVersion; /** */ @@ -32,16 +28,16 @@ public class RollingUpgradeTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private IgniteProductVersion curVer; + IgniteProductVersion curVer; /** */ - private IgniteProductVersion targetVer; + IgniteProductVersion targetVer; /** */ - private String errMsg; + String errMsg; /** */ - private List nodes; + List nodes; /** */ public RollingUpgradeTaskResult(IgniteProductVersion curVer, IgniteProductVersion targetVer, String errMsg) { @@ -106,22 +102,6 @@ public void nodes(List nodes) { this.nodes = nodes; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(curVer); - out.writeObject(targetVer); - U.writeString(out, errMsg); - U.writeCollection(out, nodes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - this.curVer = (IgniteProductVersion)in.readObject(); - this.targetVer = (IgniteProductVersion)in.readObject(); - this.errMsg = U.readString(in); - this.nodes = U.readList(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(RollingUpgradeTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationItem.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationItem.java index 8da5aa2220961..a34649ab54958 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationItem.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationItem.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.tracing; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Set; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.tracing.Span; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.tracing.Scope; /** @@ -39,18 +35,18 @@ public class TracingConfigurationItem extends IgniteDataTransferObject { * Specifies the {@link Scope} of a trace's root span to which some specific tracing configuration will be applied. * It's a mandatory attribute. */ - private Scope scope; + Scope scope; /** * Specifies the label of a traced operation. It's an optional attribute. */ - private String lb; + String lb; /** * Number between 0 and 1 that more or less reflects the probability of sampling specific trace. 0 and 1 have * special meaning here, 0 means never 1 means always. Default value is 0 (never). */ - private Double samplingRate; + Double samplingRate; /** * Set of {@link Scope} that defines which sub-traces will be included in given trace. In other words, if child's @@ -58,7 +54,7 @@ public class TracingConfigurationItem extends IgniteDataTransferObject { * will be attached to the current trace, otherwise it'll be skipped. See {@link * Span#isChainable(Scope)} for more details. */ - private Set includedScopes; + Set includedScopes; /** * Default constructor. @@ -124,33 +120,6 @@ public Set includedScopes() { return includedScopes; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeBoolean(scope != null); - - if (scope != null) - out.writeShort(scope.idx()); - - U.writeString(out, label()); - - out.writeObject(samplingRate); - - U.writeCollection(out, includedScopes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - - if (in.readBoolean()) - scope = Scope.fromIndex(in.readShort()); - - lb = U.readString(in); - - samplingRate = (Double)in.readObject(); - - includedScopes = U.readSet(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TracingConfigurationItem.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationTaskResult.java index 7394d3dff976b..07dbc568301e7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationTaskResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.tracing; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -27,7 +24,6 @@ import java.util.List; import java.util.function.Consumer; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.tracing.TracingConfigurationCoordinates; import org.apache.ignite.spi.tracing.TracingConfigurationParameters; @@ -42,7 +38,7 @@ public class TracingConfigurationTaskResult extends IgniteDataTransferObject { private static final Character RES_PRINTER_SEPARATOR = ','; /** Retrieved reseted or updated tracing configuration. */ - private List tracingConfigurations = new ArrayList<>(); + List tracingConfigurations = new ArrayList<>(); /** * Default constructor. @@ -67,17 +63,6 @@ public void add(TracingConfigurationCoordinates coordinates, TracingConfiguratio )); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, tracingConfigurations); - } - - /** {@inheritDoc} */ - @SuppressWarnings("unchecked") @Override protected void readExternalData(ObjectInput in) - throws IOException, ClassNotFoundException { - tracingConfigurations = (List)U.readCollection(in); - } - /** * Fills printer {@link Consumer } by string view of this class. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxTaskResult.java index cdff4d94f92de..566d164dba1b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxTaskResult.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.tx; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Result for {@link TxTask}. @@ -33,7 +29,7 @@ public class TxTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private List infos; + List infos; /** * Default constructor. @@ -56,16 +52,6 @@ public List getInfos() { return infos; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, infos); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - infos = U.readList(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TxTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxVerboseInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxVerboseInfo.java index 4999038449190..1f650ae573bd8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxVerboseInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxVerboseInfo.java @@ -16,16 +16,12 @@ */ package org.apache.ignite.internal.management.tx; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import java.util.Map; import java.util.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Encapsulates all verbose info about transaction needed for --tx --info output. @@ -35,72 +31,40 @@ public class TxVerboseInfo extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Near xid version. */ - private GridCacheVersion nearXidVer; + GridCacheVersion nearXidVer; /** Local node id. */ - private UUID locNodeId; + UUID locNodeId; /** Local node consistent id. */ - private Object locNodeConsistentId; + Object locNodeConsistentId; /** Near node id. */ - private UUID nearNodeId; + UUID nearNodeId; /** Near node consistent id. */ - private Object nearNodeConsistentId; + Object nearNodeConsistentId; /** Tx mapping type. */ - private TxMappingType txMappingType; + TxMappingType txMappingType; /** Dht node id. */ - private UUID dhtNodeId; + UUID dhtNodeId; /** Dht node consistent id. */ - private Object dhtNodeConsistentId; + Object dhtNodeConsistentId; /** Used caches. */ - private Map usedCaches; + Map usedCaches; /** Used cache groups. */ - private Map usedCacheGroups; + Map usedCacheGroups; /** Local tx keys. */ - private List locTxKeys; + List locTxKeys; /** Near only tx keys. */ - private List nearOnlyTxKeys; - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(nearXidVer); - U.writeUuid(out, locNodeId); - out.writeObject(locNodeConsistentId); - U.writeUuid(out, nearNodeId); - out.writeObject(nearNodeConsistentId); - U.writeEnum(out, txMappingType); - U.writeUuid(out, dhtNodeId); - out.writeObject(dhtNodeConsistentId); - U.writeMap(out, usedCaches); - U.writeMap(out, usedCacheGroups); - U.writeCollection(out, locTxKeys); - U.writeCollection(out, nearOnlyTxKeys); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nearXidVer = (GridCacheVersion)in.readObject(); - locNodeId = U.readUuid(in); - locNodeConsistentId = in.readObject(); - nearNodeId = U.readUuid(in); - nearNodeConsistentId = in.readObject(); - txMappingType = TxMappingType.fromOrdinal(in.readByte()); - dhtNodeId = U.readUuid(in); - dhtNodeConsistentId = in.readObject(); - usedCaches = U.readHashMap(in); - usedCacheGroups = U.readHashMap(in); - locTxKeys = U.readList(in); - nearOnlyTxKeys = U.readList(in); - } + List nearOnlyTxKeys; /** * @return Near xid version. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxVerboseKey.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxVerboseKey.java index 08790f78eae40..ee79417410250 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxVerboseKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxVerboseKey.java @@ -16,13 +16,9 @@ */ package org.apache.ignite.internal.management.tx; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Encapsulates info about transaction key and its lock ownership for --tx --info output. @@ -32,16 +28,16 @@ public class TxVerboseKey extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Tx key. */ - private String txKey; + String txKey; /** Lock type. */ - private TxKeyLockType lockType; + TxKeyLockType lockType; /** Owner version. */ - private GridCacheVersion ownerVer; + GridCacheVersion ownerVer; /** Is read entry. */ - private boolean read; + boolean read; /** * Default constructor. @@ -91,23 +87,6 @@ public boolean read() { return read; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, txKey); - U.writeEnum(out, lockType); - out.writeObject(ownerVer); - out.writeBoolean(read); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - txKey = U.readString(in); - lockType = TxKeyLockType.fromOrdinal(in.readByte()); - ownerVer = (GridCacheVersion)in.readObject(); - read = in.readBoolean(); - } - - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TxVerboseKey.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/ClusterNode.java index bcb8ab5fa7f51..83a6b6899fe65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/ClusterNode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/ClusterNode.java @@ -17,15 +17,11 @@ package org.apache.ignite.internal.management.wal; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.Map; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Data transfer object for {@link org.apache.ignite.cluster.ClusterNode}. @@ -36,18 +32,18 @@ public class ClusterNode extends IgniteDataTransferObject { /** Cluster node consistent id. */ @GridToStringInclude - private String consistentId; + String consistentId; /** Cluster node attributes. */ - private Map attrs; + Map attrs; /** Cluster node addresses. */ @GridToStringInclude - private Collection addrs; + Collection addrs; /** Cluster node host names. */ @GridToStringInclude - private Collection hostNames; + Collection hostNames; /** * Default constructor. @@ -104,23 +100,6 @@ public Collection getHostNames() { return hostNames; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, consistentId); - U.writeMap(out, attrs); - U.writeCollection(out, hostNames); - U.writeCollection(out, addrs); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - consistentId = U.readString(in); - attrs = U.readMap(in); - hostNames = U.readCollection(in); - addrs = U.readCollection(in); - } - - /** {@inheritDoc} */ @Override public String toString() { return S.toString(ClusterNode.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTaskResult.java index ad55b7d3e21e1..c7449ee0626cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalTaskResult.java @@ -17,15 +17,11 @@ package org.apache.ignite.internal.management.wal; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.Map; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Result of {@link WalTask}. @@ -36,15 +32,15 @@ public class WalTaskResult extends IgniteDataTransferObject { /** Exceptions by node consistent id. */ @GridToStringInclude - private Map exceptions; + Map exceptions; /** Archived wal segments path search results by node consistent id. */ @GridToStringInclude - private Map> results; + Map> results; /** Nodes info by node consistent id. */ @GridToStringInclude - private Map nodesInfo; + Map nodesInfo; /** * Default constructor. @@ -92,20 +88,6 @@ public Map getNodesInfo() { return nodesInfo; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, exceptions); - U.writeMap(out, results); - U.writeMap(out, nodesInfo); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - exceptions = U.readMap(in); - results = U.readMap(in); - nodesInfo = U.readMap(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(WalTaskResult.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataEntry.java index 096b1e8e1ce70..9d9b5da6c048e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/DataEntry.java @@ -46,9 +46,11 @@ public class DataEntry { protected int cacheId; /** Cache object key. */ + @GridToStringInclude(sensitive = true) protected KeyCacheObject key; /** Cache object value. May be {@code} null for {@link GridCacheOperation#DELETE} */ + @GridToStringInclude(sensitive = true) @Nullable protected CacheObject val; /** Entry operation performed. */ diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2.java index 6ccee60d6ea5a..ce97fb0741d83 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.processors.affinity; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -35,7 +32,6 @@ import org.apache.ignite.internal.util.collection.ImmutableIntSet; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import static org.apache.ignite.internal.util.lang.ClusterNodeFunc.node2id; @@ -49,19 +45,19 @@ public class GridAffinityAssignmentV2 extends IgniteDataTransferObject implement private static final long serialVersionUID = 0L; /** Topology version. */ - private AffinityTopologyVersion topVer; + AffinityTopologyVersion topVer; /** Collection of calculated affinity nodes. */ - private List> assignment; + List> assignment; /** Map of primary node partitions. */ - private Map> primary; + Map> primary; /** Map of backup node partitions. */ - private Map> backup; + Map> backup; /** Set of partitions which primary is different than in ideal assignment. */ - private Set primariesDifferentToIdeal; + Set primariesDifferentToIdeal; /** Assignment node IDs */ private transient volatile List> assignmentIds; @@ -336,26 +332,4 @@ private Collection getOrCreateAssignmentsIds(int part) { @Override public String toString() { return S.toString(GridAffinityAssignmentV2.class, this, super.toString()); } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(topVer); - - U.writeCollection(out, assignment); - - U.writeMap(out, primary); - - U.writeMap(out, backup); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - topVer = (AffinityTopologyVersion)in.readObject(); - - assignment = U.readList(in); - - primary = U.readMap(in); - - backup = U.readMap(in); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClearCachesTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClearCachesTaskResult.java index b8717eb061131..ea864e7a21314 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClearCachesTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClearCachesTaskResult.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.processors.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; /** Result of {@link ClearCachesTask}. */ public class ClearCachesTaskResult extends IgniteDataTransferObject { @@ -30,10 +26,10 @@ public class ClearCachesTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** List of cleared caches. */ - private List clearedCaches; + List clearedCaches; /** List of non-existent caches. */ - private List nonExistentCaches; + List nonExistentCaches; /** */ public ClearCachesTaskResult(List clearedCaches, List nonExistentCaches) { @@ -55,16 +51,4 @@ public List clearedCaches() { public List nonExistentCaches() { return nonExistentCaches; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, clearedCaches); - U.writeCollection(out, nonExistentCaches); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - clearedCaches = U.readList(in); - nonExistentCaches = U.readList(in); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/EarliestCheckpointMapSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/EarliestCheckpointMapSnapshot.java index 7ea74c6e463b1..ee0bbc009e0bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/EarliestCheckpointMapSnapshot.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/checkpoint/EarliestCheckpointMapSnapshot.java @@ -17,16 +17,12 @@ package org.apache.ignite.internal.processors.cache.persistence.checkpoint; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; /** @@ -38,10 +34,10 @@ public class EarliestCheckpointMapSnapshot extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Last snapshot's checkpoint timestamp. */ - private Map> data = new HashMap<>(); + Map> data = new HashMap<>(); /** Ids of checkpoints present at the time of the snapshot capture. */ - private Set checkpointIds; + Set checkpointIds; /** Constructor. */ public EarliestCheckpointMapSnapshot( @@ -96,31 +92,19 @@ public boolean checkpointWasPresent(UUID checkpointId) { return checkpointIds.contains(checkpointId); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, data); - U.writeCollection(out, checkpointIds); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - data = U.readMap(in); - checkpointIds = U.readSet(in); - } - /** {@link CheckpointEntry.GroupState} snapshot. */ - static class GroupStateSnapshot extends IgniteDataTransferObject { + public static class GroupStateSnapshot extends IgniteDataTransferObject { /** Serial version UUID. */ private static final long serialVersionUID = 0L; /** Partition ids. */ - private int[] parts; + int[] parts; /** Partition counters which corresponds to partition ids. */ - private long[] cnts; + long[] cnts; /** Partitions count. */ - private int size; + int size; /** * @param parts Partitions' ids. @@ -159,19 +143,5 @@ long[] partitionCounters() { public int size() { return size; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeIntArray(out, parts); - U.writeLongArray(out, cnts); - out.writeInt(size); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - parts = U.readIntArray(in); - cnts = U.readLongArray(in); - size = in.readInt(); - } } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyResult.java index d00f2b212dc03..78fe2c618df6d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.processors.cache.persistence.snapshot; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -43,10 +40,10 @@ public class SnapshotPartitionsVerifyResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Map of snapshot metadata information found on each cluster node. */ - private Map> metas; + Map> metas; /** Result of cluster nodes partitions comparison. */ - @Nullable private IdleVerifyResult idleRes; + @Nullable IdleVerifyResult idleRes; /** Default constructor. */ public SnapshotPartitionsVerifyResult() { @@ -113,16 +110,4 @@ public IdleVerifyResult idleVerifyResult() { public Map exceptions() { return idleRes == null ? Collections.emptyMap() : idleRes.exceptions(); } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeMap(out, metas); - out.writeObject(idleRes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - metas = U.readMap(in); - idleRes = (IdleVerifyResult)in.readObject(); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecord.java index 14c68ef648f0d..6ccdae8075190 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecord.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/PartitionHashRecord.java @@ -16,9 +16,6 @@ */ package org.apache.ignite.internal.processors.cache.verify; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Objects; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.internal.binary.GridBinaryMarshaller; @@ -28,7 +25,6 @@ import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; /** @@ -43,62 +39,62 @@ public class PartitionHashRecord extends IgniteDataTransferObject { /** Partition key. */ @GridToStringExclude - private PartitionKey partKey; + PartitionKey partKey; /** Is primary flag. */ - private boolean isPrimary; + boolean isPrimary; /** Consistent id. */ @GridToStringInclude - private Object consistentId; + Object consistentId; /** Partition entries content hash. */ @GridToStringExclude - private int partHash; + int partHash; /** Partition entries versions hash. */ @GridToStringExclude - private int partVerHash; + int partVerHash; /** Update counter's state. */ @GridToStringInclude - private Object updateCntr; + Object updateCntr; /** Size. */ @GridToStringExclude - private long size; + long size; /** Partition state. */ - private PartitionState partitionState; + PartitionState partitionState; /** * Count of keys with compact footer. * @see BinaryConfiguration#isCompactFooter() */ @GridToStringExclude - private int cfKeys; + int cfKeys; /** * Count of keys without compact footer. * @see BinaryConfiguration#isCompactFooter() */ @GridToStringExclude - private int noCfKeys; + int noCfKeys; /** * Count of {@link org.apache.ignite.binary.BinaryObject} keys. * @see GridBinaryMarshaller#BINARY_OBJ */ @GridToStringExclude - private int binKeys; + int binKeys; /** Count of type supported by Ignite out of the box (numbers, strings, etc). */ @GridToStringExclude - private int regKeys; + int regKeys; /** If partition has entries to expire. */ @GridToStringExclude - private boolean hasExpiringEntries; + boolean hasExpiringEntries; /** * @param partKey Partition key. @@ -224,40 +220,6 @@ public void hasExpiringEntries(boolean hasExpiringEntries) { this.hasExpiringEntries = hasExpiringEntries; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(partKey); - out.writeBoolean(isPrimary); - out.writeObject(consistentId); - out.writeInt(partHash); - out.writeInt(partVerHash); - out.writeObject(updateCntr); - out.writeLong(size); - U.writeEnum(out, partitionState); - out.writeInt(cfKeys); - out.writeInt(noCfKeys); - out.writeInt(binKeys); - out.writeInt(regKeys); - out.writeBoolean(hasExpiringEntries); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - partKey = (PartitionKey)in.readObject(); - isPrimary = in.readBoolean(); - consistentId = in.readObject(); - partHash = in.readInt(); - partVerHash = in.readInt(); - updateCntr = in.readObject(); - size = in.readLong(); - partitionState = PartitionState.fromOrdinal(in.readByte()); - cfKeys = in.readInt(); - noCfKeys = in.readInt(); - binKeys = in.readInt(); - regKeys = in.readInt(); - hasExpiringEntries = in.readBoolean(); - } - /** {@inheritDoc} */ @Override public String toString() { return size == MOVING_PARTITION_SIZE ? diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/TransactionsHashRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/TransactionsHashRecord.java index 0d308a3bfc2cb..deeb2e6aac23f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/TransactionsHashRecord.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/verify/TransactionsHashRecord.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.processors.cache.verify; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; @@ -31,15 +28,15 @@ public class TransactionsHashRecord extends IgniteDataTransferObject { /** Consistent ID of local node that participated in the transaction. This node produces this record. */ @GridToStringInclude - private Object locConsistentId; + Object locConsistentId; /** Consistent ID of remote node that participated in the transactions. */ @GridToStringInclude - private Object rmtConsistentId; + Object rmtConsistentId; /** Committed transactions IDs hash. */ @GridToStringInclude - private int txHash; + int txHash; /** */ public TransactionsHashRecord() { @@ -68,20 +65,6 @@ public Object localConsistentId() { return locConsistentId; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(locConsistentId); - out.writeObject(rmtConsistentId); - out.writeInt(txHash); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - locConsistentId = in.readObject(); - rmtConsistentId = in.readObject(); - txHash = in.readInt(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(TransactionsHashRecord.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageVersion.java index 4b1c44de5e9bb..20689d3bcf6aa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageVersion.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.processors.metastorage.persistence; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.List; import java.util.function.LongFunction; @@ -28,7 +25,7 @@ import org.apache.ignite.internal.util.typedef.internal.S; /** Version class for distributed metastorage. */ -final class DistributedMetaStorageVersion extends IgniteDataTransferObject { +public final class DistributedMetaStorageVersion extends IgniteDataTransferObject { /** Serial version UID. */ private static final long serialVersionUID = 0L; @@ -47,14 +44,14 @@ private static long nextHash(long hash, DistributedMetaStorageHistoryItem update * @see #INITIAL_VERSION */ @GridToStringInclude - private long id; + long id; /** * Hash of the whole updates list. Hashing algorinthm is almost the same as in {@link List#hashCode()}, but with * {@code long} value instead of {@code int}. */ @GridToStringInclude - private long hash; + long hash; /** Default constructor for deserialization. */ public DistributedMetaStorageVersion() { @@ -159,18 +156,6 @@ public long hash() { return hash; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeLong(id); - out.writeLong(hash); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException { - id = in.readLong(); - hash = in.readLong(); - } - /** {@inheritDoc} */ @Override public boolean equals(Object o) { if (this == o) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/aware/IndexRebuildCacheInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/aware/IndexRebuildCacheInfo.java index 4fcd12b0b492e..1a198e68b94a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/aware/IndexRebuildCacheInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/aware/IndexRebuildCacheInfo.java @@ -18,13 +18,9 @@ package org.apache.ignite.internal.processors.query.aware; import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.managers.indexing.IndexesRebuildTask; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Information about the cache for which index rebuilding was started. @@ -35,13 +31,13 @@ public class IndexRebuildCacheInfo extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cache name. */ - private String cacheName; + String cacheName; /** * {@code True} if index.bin recreating, {@code false} otherwise. * @see IndexesRebuildTask */ - private boolean recreate; + boolean recreate; /** * Default constructor for {@link Externalizable}. @@ -60,18 +56,6 @@ public IndexRebuildCacheInfo(String cacheName, boolean recreate) { this.recreate = recreate; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeLongString(out, cacheName); - out.writeBoolean(recreate); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cacheName = U.readLongString(in); - recreate = in.readBoolean(); - } - /** * Getting cache name. * diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionsTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionsTaskArg.java index c2b9a4cbd6811..f5712cb87ed48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionsTaskArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeCancelSessionsTaskArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.visor.compute; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Set; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; /** @@ -34,7 +30,7 @@ public class VisorComputeCancelSessionsTaskArg extends IgniteDataTransferObject private static final long serialVersionUID = 0L; /** Session IDs to cancel. */ - private Set sesIds; + Set sesIds; /** * Default constructor. @@ -57,16 +53,6 @@ public Set getSessionIds() { return sesIds; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, sesIds); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - sesIds = U.readSet(in); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(VisorComputeCancelSessionsTaskArg.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTaskResult.java index 4dd249786b306..9a535e678ea9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTaskResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.visor.misc; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; @@ -31,13 +28,13 @@ public class VisorIdAndTagViewTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private UUID id; + UUID id; /** */ - private String tag; + String tag; /** */ - private String clusterName; + String clusterName; /** Default constructor. */ public VisorIdAndTagViewTaskResult() { @@ -55,20 +52,6 @@ public VisorIdAndTagViewTaskResult(UUID id, String tag, String clusterName) { this.clusterName = clusterName; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(id); - out.writeObject(tag); - out.writeObject(clusterName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - id = (UUID)in.readObject(); - tag = (String)in.readObject(); - clusterName = (String)in.readObject(); - } - /** */ public UUID id() { return id; diff --git a/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverter.java b/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverter.java index ead7f7d3bd20e..6f6c555e1ddc7 100644 --- a/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverter.java +++ b/modules/dev-utils/src/main/java/org/apache/ignite/development/utils/IgniteWalConverter.java @@ -71,7 +71,7 @@ public static void main(String[] args) { */ public static void convert(final PrintStream out, final IgniteWalConverterArguments params) { System.setProperty(IgniteSystemProperties.IGNITE_TO_STRING_INCLUDE_SENSITIVE, - Boolean.toString(params.getProcessSensitiveData() == ProcessSensitiveData.HIDE)); + Boolean.toString(params.getProcessSensitiveData() == ProcessSensitiveData.SHOW)); System.setProperty(IgniteSystemProperties.IGNITE_PDS_SKIP_CRC, Boolean.toString(params.isSkipCrc())); RecordV1Serializer.skipCrc = params.isSkipCrc(); diff --git a/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterSensitiveDataTest.java b/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterSensitiveDataTest.java index 1ebd9ae4b4ad7..8cd16712f8b34 100644 --- a/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterSensitiveDataTest.java +++ b/modules/dev-utils/src/test/java/org/apache/ignite/development/utils/IgniteWalConverterSensitiveDataTest.java @@ -45,6 +45,7 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl; import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; +import org.apache.ignite.internal.util.tostring.GridToStringBuilder; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; @@ -55,7 +56,10 @@ import static java.util.Arrays.asList; import static java.util.Objects.requireNonNull; import static java.util.function.Function.identity; +import static org.apache.ignite.IgniteCommonsSystemProperties.IGNITE_TO_STRING_INCLUDE_SENSITIVE; +import static org.apache.ignite.IgniteCommonsSystemProperties.getBoolean; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.internal.util.tostring.GridToStringBuilder.DFLT_TO_STRING_INCLUDE_SENSITIVE; import static org.apache.ignite.testframework.GridTestUtils.assertContains; import static org.apache.ignite.testframework.GridTestUtils.assertNotContains; import static org.apache.ignite.testframework.wal.record.RecordUtils.isIncludeIntoLog; @@ -90,6 +94,10 @@ public class IgniteWalConverterSensitiveDataTest extends GridCommonAbstractTest @Override protected void beforeTestsStarted() throws Exception { super.beforeTestsStarted(); + GridToStringBuilder.setIncludeSensitiveSupplier( + () -> getBoolean(IGNITE_TO_STRING_INCLUDE_SENSITIVE, DFLT_TO_STRING_INCLUDE_SENSITIVE) + ); + sysOut = System.out; testOut = new ByteArrayOutputStream(16 * 1024);