From 39f11fa4ae2bf10e236ef20b1de173cc97bff1e7 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Thu, 22 Jan 2026 12:54:20 +0300 Subject: [PATCH 01/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../internal/MessageSerializerGenerator.java | 17 +- .../idto/IDTOSerializerGenerator.java | 344 ++++++++++++++++++ .../IgniteDataTransferObjectProcessor.java | 263 +++++++++++++ modules/core/pom.xml | 1 + .../IgniteDataTransferObjectSerializer.java | 45 +++ ...ncryptionReencryptionStatusCommandArg.java | 47 --- 6 files changed, 661 insertions(+), 56 deletions(-) create mode 100644 modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java create mode 100644 modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObjectSerializer.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionStatusCommandArg.java diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index 03420b425ccf7..f95ce9aac0f2a 100644 --- a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -60,15 +60,15 @@ * Generates serializer class for given {@code Message} class. The generated serializer follows the naming convention: * {@code org.apache.ignite.internal.codegen.[MessageClassName]Serializer}. */ -class MessageSerializerGenerator { +public class MessageSerializerGenerator { /** */ - private static final String EMPTY = ""; + public static final String EMPTY = ""; /** */ - private static final String TAB = " "; + public static final String TAB = " "; /** */ - private static final String NL = System.lineSeparator(); + public static final String NL = System.lineSeparator(); /** */ private static final String PKG_NAME = "org.apache.ignite.internal.codegen"; @@ -81,7 +81,7 @@ class MessageSerializerGenerator { " */"; /** */ - private static final String METHOD_JAVADOC = "/** */"; + public static final String METHOD_JAVADOC = "/** */"; /** */ private static final String RETURN_FALSE_STMT = "return false;"; @@ -403,7 +403,7 @@ else if (assignableFrom(erasedType(type), type(Collection.class.getName()))) { "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(0))); } - else if (enumType(type)) { + else if (enumType(env, type)) { Element element = env.getTypeUtils().asElement(type); imports.add(element.toString()); @@ -609,8 +609,7 @@ else if (assignableFrom(erasedType(type), type(Collection.class.getName()))) { returnFalseIfReadFailed(name, collectionReader, "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(0))); } - - else if (enumType(type)) { + else if (enumType(env, type)) { String fieldPrefix = typeNameToFieldName(env.getTypeUtils().asElement(type).getSimpleName().toString()); boolean hasCustMapperAnn = field.getAnnotation(CustomMapper.class) != null; @@ -856,7 +855,7 @@ private boolean assignableFrom(TypeMirror type, TypeMirror superType) { } /** */ - private boolean enumType(TypeMirror type) { + public static boolean enumType(ProcessingEnvironment env, TypeMirror type) { Element element = env.getTypeUtils().asElement(type); return element != null && element.getKind() == ElementKind.ENUM; 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 new file mode 100644 index 0000000000000..7a24dd18ae72c --- /dev/null +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java @@ -0,0 +1,344 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.idto; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.PrintWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.function.Function; +import javax.annotation.processing.FilerException; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; +import javax.lang.model.type.ArrayType; +import javax.lang.model.type.PrimitiveType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.tools.JavaFileObject; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.lang.IgniteBiTuple; + +import static org.apache.ignite.internal.MessageSerializerGenerator.NL; +import static org.apache.ignite.internal.MessageSerializerGenerator.TAB; +import static org.apache.ignite.internal.MessageSerializerGenerator.enumType; + +/** + * Generates serializer class for given {@code IgniteDataTransferObject} class. + * The generated serializer follows the naming convention: + * {@code org.apache.ignite.internal.codegen.[IDTOClassName]Serializer}. + */ +public class IDTOSerializerGenerator { + /** */ + static final String PKG_NAME = "org.apache.ignite.internal.codegen.idto"; + + /** */ + public static final String DTO_SERDES_INTERFACE = "org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer"; + + /** */ + static final String CLS_JAVADOC = "/** " + NL + + " * This class is generated automatically." + NL + + " *" + NL + + " * @see org.apache.ignite.internal.dto.IgniteDataTransferObject" + NL + + " */"; + + /** */ + private final ProcessingEnvironment env; + + /** */ + private final TypeElement type; + + /** */ + private final Set imports = new HashSet<>(); + + /** */ + private static final Map> TYPE_SERDES = new HashMap<>(); + + { + TYPE_SERDES.put(boolean.class.getName(), F.t("out.writeBoolean(obj.${f}());", "obj.${f}(in.readBoolean());")); + TYPE_SERDES.put(byte.class.getName(), F.t("out.write(obj.${f}());", "obj.${f}(in.read());")); + TYPE_SERDES.put(short.class.getName(), F.t("out.writeShort(obj.${f}());", "obj.${f}(in.readShort());")); + TYPE_SERDES.put(int.class.getName(), F.t("out.writeInt(obj.${f}());", "obj.${f}(in.readInt());")); + TYPE_SERDES.put(long.class.getName(), F.t("out.writeLong(obj.${f}());", "obj.${f}(in.readLong());")); + 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(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(Map.class.getName(), F.t("U.writeMap(out, obj.${f}());", "obj.${f}(U.readMap(in));")); + } + + /** */ + private static final IgniteBiTuple ENUM_SERDES = + F.t("U.writeEnum(out, obj.${f}());", "obj.${f}(U.readEnum(in, ${c}.class));"); + + /** */ + private static final IgniteBiTuple OBJ_ARRAY_SERDES = + F.t("U.writeArray(out, obj.${f}());", "obj.${f}(U.readArray(in, ${c}.class));"); + + /** */ + private static final Map> ARRAY_TYPE_SERDES = new HashMap<>(); + + { + ARRAY_TYPE_SERDES.put(byte.class.getName(), F.t("U.writeByteArray(out, obj.${f}());", "obj.${f}(U.readByteArray(in));")); + ARRAY_TYPE_SERDES.put(int.class.getName(), F.t("U.writeIntArray(out, obj.${f}());", "obj.${f}(U.readIntArray(in));")); + ARRAY_TYPE_SERDES.put(long.class.getName(), F.t("U.writeLongArray(out, obj.${f}());", "obj.${f}(U.readLongArray(in));")); + ARRAY_TYPE_SERDES.put(String.class.getName(), OBJ_ARRAY_SERDES); + ARRAY_TYPE_SERDES.put(UUID.class.getName(), OBJ_ARRAY_SERDES); + } + + /** */ + public IDTOSerializerGenerator(ProcessingEnvironment env, TypeElement type) { + this.env = env; + this.type = type; + } + + /** */ + public String serializerFQN() { + return PKG_NAME + "." + serializerName(); + } + + /** */ + private String serializerName() { + return type.getSimpleName() + "Serializer"; + } + + /** */ + public void generate() throws Exception { + imports.add("org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer"); + imports.add(type.getQualifiedName().toString()); + imports.add(ObjectOutput.class.getName()); + imports.add(ObjectInput.class.getName()); + imports.add(IOException.class.getName()); + imports.add("org.apache.ignite.internal.util.typedef.internal.U"); + + String clsName = String.valueOf(type.getSimpleName()); + + List flds = fields(type); + + List write = generateWrite(clsName, flds); + List read = generateRead(clsName, flds); + + try { + JavaFileObject file = env.getFiler().createSourceFile(serializerFQN()); + + try (Writer writer = file.openWriter()) { + writeClassHeader(writer, clsName); + + for (String line : write) { + writer.write(TAB); + writer.write(line); + writer.write(NL); + } + + writer.write(NL); + for (String line : read) { + writer.write(TAB); + writer.write(line); + writer.write(NL); + } + + writer.write("}"); + writer.write(NL); + + writer.flush(); + } + } + catch (FilerException e) { + // IntelliJ IDEA parses Ignite's pom.xml and configures itself to use this annotation processor on each Run. + // During a Run, it invokes the processor and may fail when attempting to generate sources that already exist. + // There is no a setting to disable this invocation. The IntelliJ community suggests a workaround — delegating + // all Run commands to Maven. However, this significantly slows down test startup time. + // This hack checks whether the content of a generating file is identical to already existed file, and skips + // handling this class if it is. +/* + if (!identicalFileIsAlreadyGenerated(serCode, serClsName)) { + env.getMessager().printMessage( + Diagnostic.Kind.ERROR, + "MessageSerializer " + serClsName + " is already generated. Try 'mvn clean install' to fix the issue." + ); + + throw e; + } +*/ + throw e; + } + } + + /** */ + private List generateRead(String clsName, List flds) { + List code = new ArrayList<>(); + + code.add("/** {@inheritDoc} */"); + code.add("@Override public void readExternal(" + clsName + " obj, ObjectInput in) throws IOException, ClassNotFoundException {"); + fieldsSerdes(flds, IgniteBiTuple::get2).forEach(line -> code.add(TAB + line)); + code.add("}"); + + return code; + } + + /** */ + private List generateWrite(String clsName, List flds) { + List code = new ArrayList<>(); + + code.add("/** {@inheritDoc} */"); + code.add("@Override public void writeExternal(" + clsName + " obj, ObjectOutput out) throws IOException {"); + + fieldsSerdes(flds, IgniteBiTuple::get1).forEach(line -> code.add(TAB + line)); + + code.add("}"); + + return code; + } + + /** */ + private List fieldsSerdes( + List flds, + Function, String> patternProvider + ) { + List code = new ArrayList<>(); + + for (VariableElement fld : flds) { + TypeMirror type = fld.asType(); + TypeMirror comp = null; + + IgniteBiTuple serDes; + + if (type.getKind() == TypeKind.ARRAY) { + comp = ((ArrayType)type).getComponentType(); + + serDes = enumType(env, comp) ? OBJ_ARRAY_SERDES : ARRAY_TYPE_SERDES.get(typeName(comp)); + } + else + serDes = enumType(env, type) ? ENUM_SERDES : TYPE_SERDES.get(typeName(type)); + + if (serDes != null) { + String pattern = patternProvider.apply(serDes); + + code.add(pattern + .replaceAll("\\$\\{f}", fld.getSimpleName().toString()) + .replaceAll("\\$\\{c}", className(comp == null ? type : comp))); + } + else + code.add("// Unsupported type: " + typeName(type) + " " + fld.getSimpleName() + " " + type.getClass().getName()); + } + + return code; + } + + /** */ + private String className(TypeMirror type) { + if (type instanceof PrimitiveType) + return typeName(type); + + String fqn = typeName(type); + + if (!fqn.startsWith("java.lang")) + imports.add(fqn); + + return simpleName(fqn); + } + + /** */ + public static String simpleName(String fqn) { + return fqn.substring(fqn.lastIndexOf('.') + 1); + } + + /** */ + private void writeClassHeader(Writer writer, String clsName) throws IOException { + try (InputStream in = getClass().getClassLoader().getResourceAsStream("license.txt"); + BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { + + PrintWriter out = new PrintWriter(writer); + + String line; + + while ((line = reader.readLine()) != null) + out.println(line); + } + + writer.write(NL); + writer.write("package " + PKG_NAME + ";" + NL + NL); + + for (String regularImport: imports) + writer.write("import " + regularImport + ";" + NL); + + writer.write(NL); + writer.write(CLS_JAVADOC); + writer.write(NL); + writer.write("public class " + serializerName() + " implements " + simpleName(DTO_SERDES_INTERFACE) + "<" + clsName + "> {" + NL); + } + + /** */ + private List fields(TypeElement type) { + List res = new ArrayList<>(); + + while (type != null) { + for (Element el: type.getEnclosedElements()) { + if (el.getKind() != ElementKind.FIELD) + continue; + + if (el.getModifiers().contains(Modifier.STATIC)) + continue; + + res.add((VariableElement)el); + } + + Element superType = env.getTypeUtils().asElement(type.getSuperclass()); + + type = (TypeElement)superType; + } + + return res; + } + + /** */ + private static String typeName(TypeMirror comp) { + String n = comp.toString(); + int genIdx = n.indexOf('<'); + + return genIdx == -1 ? n : n.substring(0, genIdx); + } +} 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 new file mode 100644 index 0000000000000..5504c06dfbe07 --- /dev/null +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java @@ -0,0 +1,263 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.idto; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.Writer; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +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; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeMirror; +import javax.tools.Diagnostic; +import javax.tools.JavaFileObject; + +import static org.apache.ignite.internal.MessageSerializerGenerator.NL; +import static org.apache.ignite.internal.MessageSerializerGenerator.TAB; +import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.CLS_JAVADOC; +import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.DTO_SERDES_INTERFACE; +import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.PKG_NAME; +import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.simpleName; + +/** + * + */ +@SupportedAnnotationTypes("org.apache.ignite.internal.management.api.Argument") +@SupportedSourceVersion(SourceVersion.RELEASE_11) +public class IgniteDataTransferObjectProcessor extends AbstractProcessor { + /** Base interface that every message must implement. */ + private static final String DTO_CLASS = "org.apache.ignite.internal.dto.IgniteDataTransferObject"; + + /** Base interface that every message must implement. */ + private static final String ARG_ANNOTATION = "org.apache.ignite.internal.management.api.Argument"; + + /** Factory class name. */ + public static final String FACTORY_CLASS = "IDTOSerializerFactory"; + + /** + * Processes all classes extending the {@code IgniteDataTransferObject} and generates corresponding serializer code. + */ + @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { + TypeMirror dtoCls = processingEnv.getElementUtils().getTypeElement(DTO_CLASS).asType(); + TypeMirror argAnnotation = processingEnv.getElementUtils().getTypeElement(ARG_ANNOTATION).asType(); + + Map genSerDes = new HashMap<>(); + + for (Element el: roundEnv.getRootElements()) { + if (el.getKind() != ElementKind.CLASS) + continue; + + TypeElement clazz = (TypeElement)el; + + if (!processingEnv.getTypeUtils().isAssignable(clazz.asType(), dtoCls)) + continue; + + if (clazz.getModifiers().contains(Modifier.ABSTRACT)) + continue; + + if (!clazz.getModifiers().contains(Modifier.PUBLIC)) + continue; + + if (!hasArgumentFields(clazz, argAnnotation)) + continue; + + try { + IDTOSerializerGenerator gen = new IDTOSerializerGenerator(processingEnv, clazz); + + gen.generate(); + + genSerDes.put(clazz, gen.serializerFQN()); + } + catch (Exception e) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.ERROR, + "Failed to generate a dto serializer:" + e.getMessage(), + clazz + ); + } + } + + try { + generateFactory(genSerDes); + } + catch (IOException e) { + processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Failed to generate a serializer factory:" + e.getMessage()); + } + + return false; + } + + /** */ + private void generateFactory(Map genSerDes) throws IOException { + JavaFileObject file = processingEnv.getFiler().createSourceFile(PKG_NAME + "." + FACTORY_CLASS); + + try (Writer writer = file.openWriter()) { + writeClassHeader(writer, genSerDes.keySet()); + + writer.write(TAB); + writer.write("/** */"); + writer.write(NL); + writer.write(TAB); + writer.write("private static final " + FACTORY_CLASS + " instance = new " + FACTORY_CLASS + "();"); + writer.write(NL); + writer.write(NL); + + writer.write(TAB); + writer.write("/** */"); + writer.write(NL); + writer.write(TAB); + writer.write("private final Map, " + simpleName(DTO_SERDES_INTERFACE) + "> serdes = new HashMap();"); + writer.write(NL); + writer.write(NL); + + constructor(genSerDes, writer); + writer.write(NL); + + getInstance(writer); + writer.write(NL); + + serializer(writer); + + writer.write("}"); + writer.write(NL); + + writer.flush(); + } + } + + /** */ + private void serializer(Writer writer) throws IOException { + writer.write(TAB); + writer.write("/** */"); + writer.write(NL); + writer.write(TAB); + + String genericType = ""; + + writer.write("public " + genericType + " " + simpleName(DTO_SERDES_INTERFACE) + " serializer(Class cls) {"); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write("return serdes.get(cls);"); + writer.write(NL); + writer.write(TAB); + writer.write("}"); + writer.write(NL); + } + + /** */ + private static void getInstance(Writer writer) throws IOException { + writer.write(TAB); + writer.write("/** */"); + writer.write(NL); + writer.write(TAB); + writer.write("public static " + FACTORY_CLASS + " getInstance() {"); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write("return instance;"); + writer.write(NL); + writer.write(TAB); + writer.write("}"); + writer.write(NL); + } + + /** */ + private static void constructor(Map genSerDes, Writer writer) throws IOException { + writer.write(TAB); + writer.write("/** */"); + writer.write(NL); + writer.write(TAB); + writer.write("private " + FACTORY_CLASS + "() {"); + writer.write(NL); + + for (Map.Entry e : genSerDes.entrySet()) { + writer.write(TAB); + writer.write(TAB); + writer.write("serdes.put(" + e.getKey().getSimpleName() + ".class, new " + simpleName(e.getValue()) + "());"); + writer.write(NL); + } + + writer.write(TAB); + writer.write("}"); + writer.write(NL); + } + + /** */ + private void writeClassHeader(Writer writer, Set dtoClss) throws IOException { + try (InputStream in = getClass().getClassLoader().getResourceAsStream("license.txt"); + BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { + + PrintWriter out = new PrintWriter(writer); + + String line; + + while ((line = reader.readLine()) != null) + out.println(line); + } + + writer.write(NL); + writer.write("package " + PKG_NAME + ";" + NL + NL); + + for (TypeElement dtoCls : dtoClss) + writer.write("import " + dtoCls.getQualifiedName() + ";" + NL); + + writer.write("import " + Map.class.getName() + ";" + NL); + writer.write("import " + HashMap.class.getName() + ";" + NL); + writer.write("import " + DTO_SERDES_INTERFACE + ";" + NL); + writer.write("import " + DTO_CLASS + ";" + NL); + + writer.write(NL); + writer.write(CLS_JAVADOC); + writer.write(NL); + writer.write("public class " + FACTORY_CLASS + " {" + NL); + } + + /** */ + 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; + } + } + + Element superType = processingEnv.getTypeUtils().asElement(type.getSuperclass()); + type = (TypeElement)superType; + } + + return false; + } +} diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 536bfb760197d..0175c77aeb24b 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -386,6 +386,7 @@ ${ignite.generated.source.path} org.apache.ignite.internal.MessageProcessor + org.apache.ignite.internal.idto.IgniteDataTransferObjectProcessor -Xmaxerrs diff --git a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObjectSerializer.java b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObjectSerializer.java new file mode 100644 index 0000000000000..e43eaeeb420be --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObjectSerializer.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.dto; + +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; + +/** + * @param + */ +public interface IgniteDataTransferObjectSerializer { + /** + * + * @param instance + * @param out + * @throws IOException + */ + void writeExternal(T instance, ObjectOutput out) throws IOException; + + /** + * + * @param instance + * @param in + * @return + * @throws IOException + * @throws ClassNotFoundException + */ + void readExternal(T instance, ObjectInput in) throws IOException, ClassNotFoundException; +} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionStatusCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionStatusCommandArg.java deleted file mode 100644 index e418d6594969c..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionStatusCommandArg.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.management.encryption; - -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.Argument; -import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; - -/** */ -public class EncryptionReencryptionStatusCommandArg extends IgniteDataTransferObject { - /** */ - private static final long serialVersionUID = 0; - - /** */ - @Positional - @Argument(example = "cacheGroupName") - private String cacheGroupName; - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, cacheGroupName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cacheGroupName = U.readString(in); - } -} From 3f15eb9d631f7f00a9421da368b3eb0e06e4c4dd Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Thu, 22 Jan 2026 14:31:05 +0300 Subject: [PATCH 02/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../internal/MessageSerializerGenerator.java | 8 +- .../idto/IDTOSerializerGenerator.java | 90 +++++++++++-------- .../IgniteDataTransferObjectProcessor.java | 52 ++++++++--- .../dto/IgniteDataTransferObject.java | 29 +++++- .../management/SystemViewCommandArg.java | 20 ----- 5 files changed, 121 insertions(+), 78 deletions(-) diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index f95ce9aac0f2a..c14faa5ac13e1 100644 --- a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -136,7 +136,7 @@ void generate(TypeElement type, List fields) throws Exception { // all Run commands to Maven. However, this significantly slows down test startup time. // This hack checks whether the content of a generating file is identical to already existed file, and skips // handling this class if it is. - if (!identicalFileIsAlreadyGenerated(serCode, serClsName)) { + if (!identicalFileIsAlreadyGenerated(env, serCode, PKG_NAME, serClsName)) { env.getMessager().printMessage( Diagnostic.Kind.ERROR, "MessageSerializer " + serClsName + " is already generated. Try 'mvn clean install' to fix the issue."); @@ -881,9 +881,9 @@ private String capitalizeOnlyFirst(String input) { } /** @return {@code true} if trying to generate file with the same content. */ - private boolean identicalFileIsAlreadyGenerated(String srcCode, String clsName) { + public static boolean identicalFileIsAlreadyGenerated(ProcessingEnvironment env, String srcCode, String pkg, String clsName) { try { - String fileName = PKG_NAME.replace('.', '/') + '/' + clsName + ".java"; + String fileName = pkg.replace('.', '/') + '/' + clsName + ".java"; FileObject prevFile = env.getFiler().getResource(StandardLocation.SOURCE_OUTPUT, "", fileName); String prevFileContent; @@ -903,7 +903,7 @@ private boolean identicalFileIsAlreadyGenerated(String srcCode, String clsName) } /** */ - private String content(Reader reader) throws IOException { + private static String content(Reader reader) throws IOException { BufferedReader br = new BufferedReader(reader); StringBuilder sb = new StringBuilder(); String line; 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 7a24dd18ae72c..24107fc5f6529 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 @@ -24,6 +24,7 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.io.PrintWriter; +import java.io.StringWriter; import java.io.Writer; import java.util.ArrayList; import java.util.HashMap; @@ -44,6 +45,7 @@ import javax.lang.model.type.PrimitiveType; import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; +import javax.tools.Diagnostic; import javax.tools.JavaFileObject; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgniteBiTuple; @@ -51,6 +53,7 @@ import static org.apache.ignite.internal.MessageSerializerGenerator.NL; import static org.apache.ignite.internal.MessageSerializerGenerator.TAB; import static org.apache.ignite.internal.MessageSerializerGenerator.enumType; +import static org.apache.ignite.internal.MessageSerializerGenerator.identicalFileIsAlreadyGenerated; /** * Generates serializer class for given {@code IgniteDataTransferObject} class. @@ -146,7 +149,41 @@ private String serializerName() { } /** */ - public void generate() throws Exception { + public boolean generate() throws Exception { + String serClsName = type.getSimpleName() + "Serializer"; + String serCode = generateSerializerCode(); + + try { + JavaFileObject file = env.getFiler().createSourceFile(PKG_NAME + "." + serClsName); + + try (Writer writer = file.openWriter()) { + writer.append(serCode); + writer.flush(); + } + + return true; + } + catch (FilerException e) { + // IntelliJ IDEA parses Ignite's pom.xml and configures itself to use this annotation processor on each Run. + // During a Run, it invokes the processor and may fail when attempting to generate sources that already exist. + // There is no a setting to disable this invocation. The IntelliJ community suggests a workaround — delegating + // all Run commands to Maven. However, this significantly slows down test startup time. + // This hack checks whether the content of a generating file is identical to already existed file, and skips + // handling this class if it is. + if (!identicalFileIsAlreadyGenerated(env, serCode, PKG_NAME, serClsName)) { + env.getMessager().printMessage( + Diagnostic.Kind.ERROR, + serClsName + " is already generated. Try 'mvn clean install' to fix the issue."); + + throw e; + } + + return false; + } + } + + /** */ + private String generateSerializerCode() throws IOException { imports.add("org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer"); imports.add(type.getQualifiedName().toString()); imports.add(ObjectOutput.class.getName()); @@ -161,49 +198,26 @@ public void generate() throws Exception { List write = generateWrite(clsName, flds); List read = generateRead(clsName, flds); - try { - JavaFileObject file = env.getFiler().createSourceFile(serializerFQN()); - - try (Writer writer = file.openWriter()) { - writeClassHeader(writer, clsName); - - for (String line : write) { - writer.write(TAB); - writer.write(line); - writer.write(NL); - } + try (Writer writer = new StringWriter()) { + writeClassHeader(writer, clsName); + for (String line : write) { + writer.write(TAB); + writer.write(line); writer.write(NL); - for (String line : read) { - writer.write(TAB); - writer.write(line); - writer.write(NL); - } + } - writer.write("}"); + writer.write(NL); + for (String line : read) { + writer.write(TAB); + writer.write(line); writer.write(NL); - - writer.flush(); } - } - catch (FilerException e) { - // IntelliJ IDEA parses Ignite's pom.xml and configures itself to use this annotation processor on each Run. - // During a Run, it invokes the processor and may fail when attempting to generate sources that already exist. - // There is no a setting to disable this invocation. The IntelliJ community suggests a workaround — delegating - // all Run commands to Maven. However, this significantly slows down test startup time. - // This hack checks whether the content of a generating file is identical to already existed file, and skips - // handling this class if it is. -/* - if (!identicalFileIsAlreadyGenerated(serCode, serClsName)) { - env.getMessager().printMessage( - Diagnostic.Kind.ERROR, - "MessageSerializer " + serClsName + " is already generated. Try 'mvn clean install' to fix the issue." - ); - throw e; - } -*/ - throw e; + writer.write("}"); + writer.write(NL); + + return writer.toString(); } } 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 5504c06dfbe07..79dbdd015bbbd 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 @@ -22,11 +22,13 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; +import java.io.StringWriter; import java.io.Writer; import java.util.HashMap; import java.util.Map; import java.util.Set; import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.FilerException; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; import javax.annotation.processing.SupportedSourceVersion; @@ -42,6 +44,7 @@ import static org.apache.ignite.internal.MessageSerializerGenerator.NL; import static org.apache.ignite.internal.MessageSerializerGenerator.TAB; +import static org.apache.ignite.internal.MessageSerializerGenerator.identicalFileIsAlreadyGenerated; import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.CLS_JAVADOC; import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.DTO_SERDES_INTERFACE; import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.PKG_NAME; @@ -92,9 +95,8 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { try { IDTOSerializerGenerator gen = new IDTOSerializerGenerator(processingEnv, clazz); - gen.generate(); - - genSerDes.put(clazz, gen.serializerFQN()); + if (gen.generate()) + genSerDes.put(clazz, gen.serializerFQN()); } catch (Exception e) { processingEnv.getMessager().printMessage( @@ -105,21 +107,47 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { } } + if (genSerDes.isEmpty()) + return true; + try { - generateFactory(genSerDes); + String factoryFQN = PKG_NAME + "." + FACTORY_CLASS; + String factoryCode = generateFactory(genSerDes); + + try { + JavaFileObject file = processingEnv.getFiler().createSourceFile(factoryFQN); + + try (Writer writer = file.openWriter()) { + writer.append(factoryCode); + writer.flush(); + } + } + catch (FilerException e) { + // IntelliJ IDEA parses Ignite's pom.xml and configures itself to use this annotation processor on each Run. + // During a Run, it invokes the processor and may fail when attempting to generate sources that already exist. + // There is no a setting to disable this invocation. The IntelliJ community suggests a workaround — delegating + // all Run commands to Maven. However, this significantly slows down test startup time. + // This hack checks whether the content of a generating file is identical to already existed file, and skips + // handling this class if it is. + if (!identicalFileIsAlreadyGenerated(processingEnv, factoryCode, PKG_NAME, FACTORY_CLASS)) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.ERROR, + FACTORY_CLASS + " is already generated. Try 'mvn clean install' to fix the issue."); + + throw e; + } + } } - catch (IOException e) { - processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Failed to generate a serializer factory:" + e.getMessage()); + catch (Exception e) { + processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Failed to generate a dto factory:" + e.getMessage()); } - return false; + return true; } /** */ - private void generateFactory(Map genSerDes) throws IOException { - JavaFileObject file = processingEnv.getFiler().createSourceFile(PKG_NAME + "." + FACTORY_CLASS); - - try (Writer writer = file.openWriter()) { + private String generateFactory(Map genSerDes) throws IOException { + try (Writer writer = new StringWriter()) { writeClassHeader(writer, genSerDes.keySet()); writer.write(TAB); @@ -149,7 +177,7 @@ private void generateFactory(Map genSerDes) throws IOExcept writer.write("}"); writer.write(NL); - writer.flush(); + return writer.toString(); } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java index 2013554e55038..bc26b70839c12 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java @@ -26,6 +26,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import org.apache.ignite.internal.codegen.idto.IDTOSerializerFactory; import org.jetbrains.annotations.Nullable; /** @@ -68,14 +69,24 @@ public abstract class IgniteDataTransferObject implements Externalizable { * @param out Output object to write data content. * @throws IOException If I/O errors occur. */ - protected abstract void writeExternalData(ObjectOutput out) throws IOException; + protected void writeExternalData(ObjectOutput out) throws IOException { + throw new UnsupportedOperationException("Please, implement custom method or provide support in IDTOSerializerGenerator"); + } /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeInt(MAGIC); try (IgniteDataTransferObjectOutput dtout = new IgniteDataTransferObjectOutput(out)) { - writeExternalData(dtout); + IgniteDataTransferObjectSerializer serializer = IDTOSerializerFactory.getInstance().serializer(getClass()); + + if (serializer == null) { + writeExternalData(dtout); + + return; + } + + serializer.writeExternal(this, dtout); } } @@ -86,7 +97,9 @@ public abstract class IgniteDataTransferObject implements Externalizable { * @throws IOException If I/O errors occur. * @throws ClassNotFoundException If the class for an object being restored cannot be found. */ - protected abstract void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException; + protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { + throw new UnsupportedOperationException("Please, implement custom method or provide support in IDTOSerializerGenerator"); + } /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { @@ -97,7 +110,15 @@ public abstract class IgniteDataTransferObject implements Externalizable { "[actual=" + Integer.toHexString(hdr) + ", expected=" + Integer.toHexString(MAGIC) + "]"); try (IgniteDataTransferObjectInput dtin = new IgniteDataTransferObjectInput(in)) { - readExternalData(dtin); + IgniteDataTransferObjectSerializer serializer = IDTOSerializerFactory.getInstance().serializer(getClass()); + + if (serializer == null) { + readExternalData(dtin); + + return; + } + + serializer.readExternal(this, dtin); } } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommandArg.java index e7c7c78cb0b51..ac7ac0aa11327 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommandArg.java @@ -17,15 +17,11 @@ package org.apache.ignite.internal.management; -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.management.api.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @ArgumentGroup(value = {"nodeIds", "nodeId", "allNodes"}, optional = true, onlyOneOf = true) @@ -59,22 +55,6 @@ public class SystemViewCommandArg extends IgniteDataTransferObject { @Argument(description = "Get the system view from all nodes. If not set, random node will be chosen") private boolean allNodes; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, systemViewName); - U.writeUuid(out, nodeId); - U.writeArray(out, nodeIds); - out.writeBoolean(allNodes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - systemViewName = U.readString(in); - nodeId = U.readUuid(in); - nodeIds = U.readArray(in, UUID.class); - allNodes = in.readBoolean(); - } - /** */ public String systemViewName() { return systemViewName; From ab1ff1ae1f5fd03e6932ceaa33b08e1e5df2ccc6 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Thu, 22 Jan 2026 15:03:13 +0300 Subject: [PATCH 03/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../management/ChangeTagCommandArg.java | 14 -------- .../management/DeactivateCommandArg.java | 16 ---------- .../management/SetStateCommandArg.java | 18 ----------- .../management/ShutdownPolicyCommandArg.java | 14 -------- .../baseline/BaselineAddCommandArg.java | 18 ----------- .../BaselineAutoAdjustCommandArg.java | 20 ------------ .../management/baseline/BaselineCommand.java | 13 -------- .../baseline/BaselineVersionCommandArg.java | 17 ---------- .../cache/CacheClearCommandArg.java | 14 -------- .../cache/CacheContentionCommandArg.java | 18 ----------- .../cache/CacheCreateCommandArg.java | 16 ---------- .../cache/CacheDestroyCommandArg.java | 16 ---------- .../cache/CacheDistributionCommandArg.java | 20 ------------ .../cache/CacheFindGarbageCommandArg.java | 22 ------------- .../cache/CacheIdleVerifyCommandArg.java | 22 ------------- .../CacheIndexesForceRebuildCommandArg.java | 22 ------------- .../cache/CacheIndexesListCommandArg.java | 20 ------------ .../CacheIndexesRebuildStatusCommandArg.java | 14 -------- .../management/cache/CacheListCommandArg.java | 24 -------------- .../cache/CacheMetricsCommandArg.java | 18 ----------- .../CacheResetLostPartitionsCommandArg.java | 14 -------- ...CacheScheduleIndexesRebuildCommandArg.java | 24 -------------- .../cache/CacheValidateIndexesCommandArg.java | 28 ---------------- .../cache/scan/CacheScanCommandArg.java | 18 ----------- .../CdcDeleteLostSegmentLinksCommandArg.java | 14 -------- .../management/cdc/CdcResendCommandArg.java | 14 -------- .../checkpoint/CheckpointCommandArg.java | 18 ----------- .../ConsistencyRepairCommandArg.java | 20 ------------ .../DefragmentationScheduleCommandArg.java | 20 ------------ .../DiagnosticPagelocksCommandArg.java | 20 ------------ .../encryption/EncryptionCacheGroupArg.java | 14 -------- .../EncryptionChangeMasterKeyCommandArg.java | 14 -------- ...yptionReencryptionRateLimitCommandArg.java | 13 -------- .../management/kill/KillClientCommandArg.java | 16 ---------- .../kill/KillComputeCommandArg.java | 14 -------- .../kill/KillContinuousCommandArg.java | 16 ---------- .../management/kill/KillScanCommandArg.java | 18 ----------- .../kill/KillServiceCommandArg.java | 14 -------- .../kill/KillSnapshotCommandArg.java | 16 ---------- .../management/kill/KillSqlCommandArg.java | 19 +---------- .../kill/KillTransactionCommandArg.java | 14 -------- .../meta/MetaDetailsCommandArg.java | 17 +--------- .../management/meta/MetaRemoveCommandArg.java | 17 ---------- .../management/meta/MetaUpdateCommandArg.java | 14 -------- .../management/metric/MetricCommandArg.java | 16 ---------- .../MetricConfigureHistogramCommandArg.java | 18 ----------- .../MetricConfigureHitrateCommandArg.java | 17 ---------- .../PersistenceBackupCachesTaskArg.java | 18 ----------- .../PersistenceCleanCachesTaskArg.java | 18 ----------- .../persistence/PersistenceCommand.java | 13 -------- .../property/PropertyGetCommandArg.java | 14 -------- .../property/PropertyListCommandArg.java | 13 -------- .../property/PropertySetCommandArg.java | 18 ----------- .../RollingUpgradeEnableCommandArg.java | 16 ---------- .../snapshot/SnapshotCancelCommandArg.java | 16 ---------- .../snapshot/SnapshotCheckCommandArg.java | 18 ----------- .../snapshot/SnapshotCreateCommandArg.java | 20 ------------ .../snapshot/SnapshotRestoreCommandArg.java | 30 ----------------- .../tracing/TracingConfigurationCommand.java | 13 -------- .../TracingConfigurationGetAllCommandArg.java | 18 ----------- .../TracingConfigurationGetCommandArg.java | 20 ------------ .../TracingConfigurationSetCommandArg.java | 21 +----------- .../internal/management/tx/TxCommandArg.java | 32 ------------------- .../management/tx/TxInfoCommandArg.java | 18 ----------- .../management/wal/WalDeleteCommandArg.java | 14 -------- .../management/wal/WalStateCommandArg.java | 14 -------- 66 files changed, 3 insertions(+), 1154 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/ChangeTagCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/ChangeTagCommandArg.java index 9080445578b65..922ffe8a80647 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/ChangeTagCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/ChangeTagCommandArg.java @@ -17,15 +17,11 @@ 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.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.CliConfirmArgument; import org.apache.ignite.internal.management.api.Positional; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @CliConfirmArgument @@ -38,16 +34,6 @@ public class ChangeTagCommandArg extends IgniteDataTransferObject { @Argument(example = "newTagValue") private String newTagValue; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, newTagValue); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - newTagValue = U.readString(in); - } - /** */ public String newTagValue() { return newTagValue; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommandArg.java index 31a53374aa265..72ca6fac80119 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommandArg.java @@ -17,13 +17,9 @@ 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.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.CliConfirmArgument; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @CliConfirmArgument @@ -38,18 +34,6 @@ public class DeactivateCommandArg extends IgniteDataTransferObject { /** */ private String clusterName; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeBoolean(force); - U.writeString(out, clusterName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - force = in.readBoolean(); - clusterName = U.readString(in); - } - /** */ public boolean force() { return force; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommandArg.java index 10b9ae80ba574..24009edf9229a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommandArg.java @@ -17,16 +17,12 @@ package org.apache.ignite.internal.management; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.cluster.ClusterState; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.CliConfirmArgument; import org.apache.ignite.internal.management.api.EnumDescription; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @CliConfirmArgument @@ -58,20 +54,6 @@ public class SetStateCommandArg extends IgniteDataTransferObject { /** */ private String clusterName; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeEnum(out, state); - out.writeBoolean(force); - U.writeString(out, clusterName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - state = U.readEnum(in, ClusterState.class); - force = in.readBoolean(); - clusterName = U.readString(in); - } - /** */ public ClusterState state() { return state; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyCommandArg.java index d3fcf55d8323c..e976ef5b5bd1a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyCommandArg.java @@ -17,15 +17,11 @@ 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; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.EnumDescription; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class ShutdownPolicyCommandArg extends IgniteDataTransferObject { @@ -47,16 +43,6 @@ public class ShutdownPolicyCommandArg extends IgniteDataTransferObject { ) private ShutdownPolicy shutdownPolicy; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeEnum(out, shutdownPolicy); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - shutdownPolicy = U.readEnum(in, ShutdownPolicy.class); - } - /** */ public ShutdownPolicy shutdownPolicy() { return shutdownPolicy; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAddCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAddCommandArg.java index 1561f0df71f1e..1170deaeb8165 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAddCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAddCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.baseline; -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.CliConfirmArgument; import org.apache.ignite.internal.management.api.Positional; import org.apache.ignite.internal.management.baseline.BaselineCommand.BaselineTaskArg; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @CliConfirmArgument @@ -37,20 +33,6 @@ public class BaselineAddCommandArg extends BaselineTaskArg { @Argument(example = "consistentId1[,consistentId2,....,consistentIdN]") private String[] consistentIDs; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeArray(out, consistentIDs); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - consistentIDs = U.readArray(in, String.class); - } - /** */ public String[] consistentIDs() { return consistentIDs; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustCommandArg.java index bc39c4b131992..992a8898687ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustCommandArg.java @@ -17,16 +17,12 @@ package org.apache.ignite.internal.management.baseline; -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.ArgumentGroup; import org.apache.ignite.internal.management.api.CliConfirmArgument; import org.apache.ignite.internal.management.api.EnumDescription; import org.apache.ignite.internal.management.api.Positional; import org.apache.ignite.internal.management.baseline.BaselineCommand.BaselineTaskArg; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @CliConfirmArgument @@ -63,22 +59,6 @@ public enum Enabled { ENABLE } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeEnum(out, enabled); - out.writeObject(timeout); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - enabled = U.readEnum(in, Enabled.class); - timeout = (Long)in.readObject(); - } - /** */ public Enabled enabled() { return enabled; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineCommand.java index 06f3e7968e228..0116a3a8ce99c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineCommand.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.util.Collection; import java.util.function.Consumer; import org.apache.ignite.cluster.ClusterNode; @@ -84,16 +81,6 @@ public abstract static class BaselineTaskArg extends IgniteDataTransferObject { @Argument(optional = true, description = "Show the full list of node ips") private boolean verbose; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeBoolean(verbose); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - verbose = in.readBoolean(); - } - /** */ public boolean verbose() { return verbose; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineVersionCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineVersionCommandArg.java index 3441d8b1b8da4..39641c53d98d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineVersionCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineVersionCommandArg.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.management.api.Argument; import org.apache.ignite.internal.management.api.CliConfirmArgument; import org.apache.ignite.internal.management.api.Positional; @@ -36,20 +33,6 @@ public class BaselineVersionCommandArg extends BaselineTaskArg { @Argument(example = "topologyVersion") private long topologyVersion; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - out.writeLong(topologyVersion); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - topologyVersion = in.readLong(); - } - /** */ public long topologyVersion() { return topologyVersion; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheClearCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheClearCommandArg.java index 9a01eed153e3c..3019935a36753 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheClearCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheClearCommandArg.java @@ -17,12 +17,8 @@ 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.management.api.Argument; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CacheClearCommandArg extends IgniteDataTransferObject { @@ -33,16 +29,6 @@ public class CacheClearCommandArg extends IgniteDataTransferObject { @Argument(description = "specifies a comma-separated list of cache names to be cleared") private String[] caches; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeArray(out, caches); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - caches = U.readArray(in, String.class); - } - /** */ public String[] caches() { return caches; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommandArg.java index 0c16176b72209..e11eefb45fcc5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommandArg.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.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CacheContentionCommandArg extends IgniteDataTransferObject { @@ -46,20 +42,6 @@ public class CacheContentionCommandArg extends IgniteDataTransferObject { @Argument(optional = true, example = "maxPrint") private int maxPrint = 10; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeInt(minQueueSize); - U.writeUuid(out, nodeId); - out.writeInt(maxPrint); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - minQueueSize = in.readInt(); - nodeId = U.readUuid(in); - maxPrint = in.readInt(); - } - /** */ public UUID nodeId() { return nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommandArg.java index 1a88b048b10b0..a855739344730 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommandArg.java @@ -19,8 +19,6 @@ import java.io.File; import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.IgniteException; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; @@ -59,20 +57,6 @@ private void readFile() { } } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, springxmlconfig); - U.writeString(out, fileContent); - out.writeBoolean(skipExisting); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - springxmlconfig = U.readString(in); - fileContent = U.readString(in); - skipExisting = in.readBoolean(); - } - /** */ public String springxmlconfig() { return springxmlconfig; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommandArg.java index f5d880d31d98f..49c585412c2b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommandArg.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.management.api.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @ArgumentGroup(value = {"destroyAllCaches", "caches"}, onlyOneOf = true, optional = false) @@ -40,18 +36,6 @@ public class CacheDestroyCommandArg extends IgniteDataTransferObject { @Argument(description = "permanently destroy all user-created caches") private boolean destroyAllCaches; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeArray(out, caches); - out.writeBoolean(destroyAllCaches); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - caches = U.readArray(in, String.class); - destroyAllCaches = in.readBoolean(); - } - /** */ public boolean destroyAllCaches() { return destroyAllCaches; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDistributionCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDistributionCommandArg.java index 2f942ee7db3c0..42192bcfe5db0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDistributionCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDistributionCommandArg.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.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.CommandUtils; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CacheDistributionCommandArg extends IgniteDataTransferObject { @@ -49,22 +45,6 @@ public class CacheDistributionCommandArg extends IgniteDataTransferObject { @Argument(optional = true, example = "attrName1,...,attrNameN") private String[] userAttributes; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, nodeIdOrNull); - U.writeArray(out, caches); - U.writeUuid(out, nodeId); - U.writeArray(out, userAttributes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodeIdOrNull = U.readString(in); - caches = U.readArray(in, String.class); - nodeId = U.readUuid(in); - userAttributes = U.readArray(in, String.class); - } - /** */ private void parse(String value) { if (!"null".equals(value)) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommandArg.java index f842abf797613..b2e9686d72d19 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommandArg.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.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.CommandUtils; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CacheFindGarbageCommandArg extends IgniteDataTransferObject { @@ -66,24 +62,6 @@ private void parse(String value) { groups = CommandUtils.parseVal(value, String[].class); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, value); - U.writeString(out, value2); - U.writeArray(out, groups); - U.writeArray(out, nodeIds); - out.writeBoolean(delete); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - value = U.readString(in); - value2 = U.readString(in); - groups = U.readArray(in, String.class); - nodeIds = U.readArray(in, UUID.class); - delete = in.readBoolean(); - } - /** */ public UUID[] nodeIds() { return nodeIds; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java index 894cb0e2b3609..d263547456f86 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.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.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.apache.ignite.IgniteException; @@ -27,7 +24,6 @@ import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.EnumDescription; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; import static java.lang.String.format; @@ -90,24 +86,6 @@ private void validateRegexes(String[] string) { } } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeArray(out, caches); - out.writeBoolean(skipZeros); - out.writeBoolean(checkCrc); - U.writeArray(out, excludeCaches); - U.writeEnum(out, cacheFilter); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - caches = U.readArray(in, String.class); - skipZeros = in.readBoolean(); - checkCrc = in.readBoolean(); - excludeCaches = U.readArray(in, String.class); - cacheFilter = U.readEnum(in, CacheFilterEnum.class); - } - /** */ public String[] caches() { return caches; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommandArg.java index a124a3c6802cb..026e5b1828d4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommandArg.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.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @ArgumentGroup(value = {"nodeIds", "allNodes", "nodeId"}, onlyOneOf = true, optional = false) @@ -59,24 +55,6 @@ public class CacheIndexesForceRebuildCommandArg extends IgniteDataTransferObject example = "groupName1,...groupNameN") private String[] groupNames; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, nodeId); - U.writeArray(out, cacheNames); - U.writeArray(out, groupNames); - U.writeArray(out, nodeIds); - out.writeBoolean(allNodes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodeId = U.readUuid(in); - cacheNames = U.readArray(in, String.class); - groupNames = U.readArray(in, String.class); - nodeIds = U.readArray(in, UUID.class); - allNodes = in.readBoolean(); - } - /** */ public UUID nodeId() { return nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommandArg.java index 812dd52e3adbf..867cb5a13b174 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommandArg.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.UUID; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CacheIndexesListCommandArg extends IgniteDataTransferObject { @@ -75,22 +71,6 @@ private boolean validateRegEx(String name, String regex) { } } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, nodeId); - U.writeString(out, groupName); - U.writeString(out, cacheName); - U.writeString(out, indexName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodeId = U.readUuid(in); - groupName = U.readString(in); - cacheName = U.readString(in); - indexName = U.readString(in); - } - /** */ public UUID nodeId() { return nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommandArg.java index 1c84bdbef3296..ec483178e87e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommandArg.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.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CacheIndexesRebuildStatusCommandArg extends IgniteDataTransferObject { @@ -37,16 +33,6 @@ public class CacheIndexesRebuildStatusCommandArg extends IgniteDataTransferObjec optional = true) private UUID nodeId; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, nodeId); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodeId = U.readUuid(in); - } - /** */ public UUID nodeId() { return nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommandArg.java index eedaac2da3355..d99cf9c975956 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommandArg.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.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @ArgumentGroup(value = {"groups", "seq"}, onlyOneOf = true, optional = true) @@ -61,26 +57,6 @@ public class CacheListCommandArg extends IgniteDataTransferObject { @Argument(description = "print information about sequences") private boolean seq; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, regex); - out.writeBoolean(config); - U.writeUuid(out, nodeId); - U.writeString(out, outputFormat); - out.writeBoolean(groups); - out.writeBoolean(seq); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - regex = U.readString(in); - config = in.readBoolean(); - nodeId = U.readUuid(in); - outputFormat = U.readString(in); - groups = in.readBoolean(); - seq = in.readBoolean(); - } - /** */ public String regex() { return regex; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java index 624f7757f09df..e311e33e4b648 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.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 org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; import org.apache.ignite.internal.management.api.EnumDescription; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @ArgumentGroup(value = {"caches", "allCaches"}, onlyOneOf = true, optional = false) @@ -59,20 +55,6 @@ public class CacheMetricsCommandArg extends IgniteDataTransferObject { @Argument(description = "applies operation to all user caches") private boolean allCaches; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeEnum(out, operation); - U.writeArray(out, caches); - out.writeBoolean(allCaches); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - operation = U.readEnum(in, CacheMetricsOperation.class); - caches = U.readArray(in, String.class); - allCaches = in.readBoolean(); - } - /** */ public CacheMetricsOperation operation() { return operation; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheResetLostPartitionsCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheResetLostPartitionsCommandArg.java index 391b615651937..f2082c0a968b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheResetLostPartitionsCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheResetLostPartitionsCommandArg.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.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CacheResetLostPartitionsCommandArg extends IgniteDataTransferObject { @@ -35,16 +31,6 @@ public class CacheResetLostPartitionsCommandArg extends IgniteDataTransferObject @Argument(example = "cacheName1,...,cacheNameN") private String[] caches; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeArray(out, caches); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - caches = U.readArray(in, String.class); - } - /** */ public String[] caches() { return caches; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommandArg.java index 3fc90052e1556..26e918ffe1b49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommandArg.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.Arrays; import java.util.Collections; import java.util.HashMap; @@ -33,7 +30,6 @@ import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @ArgumentGroup(value = {"nodeIds", "allNodes", "nodeId"}, onlyOneOf = true, optional = true) @@ -79,26 +75,6 @@ public class CacheScheduleIndexesRebuildCommandArg extends IgniteDataTransferObj /** Cache name -> indexes. */ private Map> cacheToIndexes; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, nodeId); - U.writeString(out, cacheNames); - U.writeArray(out, groupNames); - U.writeMap(out, cacheToIndexes); - U.writeArray(out, nodeIds); - out.writeBoolean(allNodes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodeId = U.readUuid(in); - cacheNames = U.readString(in); - groupNames = U.readArray(in, String.class); - cacheToIndexes = U.readMap(in); - nodeIds = U.readArray(in, UUID.class); - allNodes = in.readBoolean(); - } - /** */ private void parse() { cacheToIndexes = new HashMap<>(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommandArg.java index c186e436f7187..b9317a509d58d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommandArg.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.UUID; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.CommandUtils; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CacheValidateIndexesCommandArg extends IgniteDataTransferObject { @@ -84,30 +80,6 @@ private void parse(String value) { caches = CommandUtils.parseVal(value, String[].class); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, value); - U.writeString(out, value2); - U.writeArray(out, caches); - U.writeArray(out, nodeIds); - out.writeInt(checkFirst); - out.writeInt(checkThrough); - out.writeBoolean(checkCrc); - out.writeBoolean(checkSizes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - value = U.readString(in); - value2 = U.readString(in); - caches = U.readArray(in, String.class); - nodeIds = U.readArray(in, UUID.class); - checkFirst = in.readInt(); - checkThrough = in.readInt(); - checkCrc = in.readBoolean(); - checkSizes = in.readBoolean(); - } - /** */ public String value2() { return value2; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanCommandArg.java index 3af1c1c821c0f..e439b742c3259 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanCommandArg.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 org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CacheScanCommandArg extends IgniteDataTransferObject { @@ -46,20 +42,6 @@ public class CacheScanCommandArg extends IgniteDataTransferObject { @Argument(description = "limit count of entries to scan (" + DFLT_LIMIT + " by default)", example = "N", optional = true) private int limit = DFLT_LIMIT; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, cacheName); - U.writeString(out, outputFormat); - out.writeInt(limit); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cacheName = U.readString(in); - outputFormat = U.readString(in); - limit = in.readInt(); - } - /** */ public String outputFormat() { return outputFormat; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcDeleteLostSegmentLinksCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcDeleteLostSegmentLinksCommandArg.java index 86a011020dbe0..2ff54191b2eb7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcDeleteLostSegmentLinksCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcDeleteLostSegmentLinksCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.cdc; -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.management.api.Argument; import org.apache.ignite.internal.management.api.CliConfirmArgument; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @CliConfirmArgument @@ -37,16 +33,6 @@ public class CdcDeleteLostSegmentLinksCommandArg extends IgniteDataTransferObjec "If not set, the command will affect all server nodes") private UUID nodeId; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, nodeId); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodeId = U.readUuid(in); - } - /** */ public UUID nodeId() { return nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcResendCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcResendCommandArg.java index b2fa30bf59e19..1fb71875d85d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcResendCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcResendCommandArg.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.management.cdc; -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.Argument; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class CdcResendCommandArg extends IgniteDataTransferObject { @@ -36,16 +32,6 @@ public class CdcResendCommandArg extends IgniteDataTransferObject { ) private String[] caches; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeArray(out, caches); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - caches = U.readArray(in, String.class); - } - /** */ public String[] caches() { return caches; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/checkpoint/CheckpointCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/checkpoint/CheckpointCommandArg.java index f5f40c9a54961..7cde16988400c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/checkpoint/CheckpointCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/checkpoint/CheckpointCommandArg.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.management.checkpoint; -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.Argument; -import org.apache.ignite.internal.util.typedef.internal.U; /** Checkpoint command arguments. */ public class CheckpointCommandArg extends IgniteDataTransferObject { @@ -41,20 +37,6 @@ public class CheckpointCommandArg extends IgniteDataTransferObject { @Argument(description = "Timeout in milliseconds", optional = true) private long timeout = -1; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, reason); - out.writeBoolean(waitForFinish); - out.writeLong(timeout); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - reason = U.readString(in); - waitForFinish = in.readBoolean(); - timeout = in.readLong(); - } - /** */ public String reason() { return reason; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommandArg.java index dba4bd6f74154..5b34081c52274 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.consistency; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.cache.ReadRepairStrategy; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.EnumDescription; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class ConsistencyRepairCommandArg extends IgniteDataTransferObject { @@ -72,22 +68,6 @@ public void ensureParams() { } } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, cache); - U.writeIntArray(out, partitions); - U.writeEnum(out, strategy); - out.writeBoolean(parallel); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cache = U.readString(in); - partitions = U.readIntArray(in); - strategy = U.readEnum(in, ReadRepairStrategy.class); - parallel = in.readBoolean(); - } - /** */ public int[] partitions() { return partitions; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationScheduleCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationScheduleCommandArg.java index 682e2f9d2cb0c..ab43e66a34c9b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationScheduleCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationScheduleCommandArg.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.management.defragmentation; -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.defragmentation.DefragmentationCommand.DefragmentationStatusCommandArg; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class DefragmentationScheduleCommandArg extends DefragmentationStatusCommandArg { @@ -37,22 +33,6 @@ public class DefragmentationScheduleCommandArg extends DefragmentationStatusComm @Argument(example = "cache1,cache2,cache3", optional = true) private String[] caches; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeArray(out, nodes); - U.writeArray(out, caches); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - nodes = U.readArray(in, String.class); - caches = U.readArray(in, String.class); - } - /** */ public String[] nodes() { return nodes; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java index 8bb42454571dc..a3d1c10253cad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java @@ -17,15 +17,11 @@ 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.management.api.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; import org.apache.ignite.internal.management.api.EnumDescription; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; import static org.apache.ignite.internal.management.diagnostic.Operation.DUMP_LOG; @@ -71,22 +67,6 @@ private void ensureOperationAndPath(Operation op, String path) { throw new IllegalArgumentException("Path can be specified only in DUMP mode."); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeEnum(out, operation); - U.writeString(out, path); - out.writeBoolean(all); - U.writeArray(out, nodes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - operation = U.readEnum(in, Operation.class); - path = U.readString(in); - all = in.readBoolean(); - nodes = U.readArray(in, String.class); - } - /** */ public String[] nodes() { return nodes; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheGroupArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheGroupArg.java index acc5661baaf98..62b43ffc78bb4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheGroupArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheGroupArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.encryption; -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.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class EncryptionCacheGroupArg extends IgniteDataTransferObject { @@ -35,16 +31,6 @@ public class EncryptionCacheGroupArg extends IgniteDataTransferObject { @Argument(example = "cacheGroupName") private String cacheGroupName; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, cacheGroupName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cacheGroupName = U.readString(in); - } - /** */ public String cacheGroupName() { return cacheGroupName; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommandArg.java index 1afd5d321a5d9..ffa0403153fdf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommandArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.encryption; -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.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class EncryptionChangeMasterKeyCommandArg extends IgniteDataTransferObject { @@ -35,16 +31,6 @@ public class EncryptionChangeMasterKeyCommandArg extends IgniteDataTransferObjec @Argument(example = "newMasterKeyName") private String newMasterKeyName; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, newMasterKeyName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - newMasterKeyName = U.readString(in); - } - /** */ public String newMasterKeyName() { return newMasterKeyName; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommandArg.java index 60dc932f02672..4ba0b4ce10ed3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommandArg.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 org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; @@ -34,16 +31,6 @@ public class EncryptionReencryptionRateLimitCommandArg extends IgniteDataTransfe @Argument(optional = true, description = "Decimal value to change re-encryption rate limit (MB/s)") private Double newLimit; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(newLimit); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - newLimit = (Double)in.readObject(); - } - /** */ public Double newLimit() { return newLimit; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillClientCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillClientCommandArg.java index 57cf89df4e20c..fb9283edd233b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillClientCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillClientCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.kill; -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.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class KillClientCommandArg extends IgniteDataTransferObject { @@ -40,18 +36,6 @@ public class KillClientCommandArg extends IgniteDataTransferObject { @Argument(description = "Node id to drop connection from", optional = true) private UUID nodeId; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, connectionId); - U.writeUuid(out, nodeId); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - connectionId = U.readString(in); - nodeId = U.readUuid(in); - } - /** */ public String connectionId() { return connectionId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillComputeCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillComputeCommandArg.java index 7dcd9f63fe83e..f195da579a7d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillComputeCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillComputeCommandArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.kill; -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.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; /** */ @@ -36,16 +32,6 @@ public class KillComputeCommandArg extends IgniteDataTransferObject { @Argument(description = "Session identifier") private IgniteUuid sessionId; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeIgniteUuid(out, sessionId); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - sessionId = U.readIgniteUuid(in); - } - /** */ public IgniteUuid sessionId() { return sessionId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillContinuousCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillContinuousCommandArg.java index 01c8be66db5bf..6f7920647b464 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillContinuousCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillContinuousCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.kill; -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.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class KillContinuousCommandArg extends IgniteDataTransferObject { @@ -41,18 +37,6 @@ public class KillContinuousCommandArg extends IgniteDataTransferObject { @Argument(description = "Routine identifier") private UUID routineId; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, originNodeId); - U.writeUuid(out, routineId); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - originNodeId = U.readUuid(in); - routineId = U.readUuid(in); - } - /** */ public UUID originNodeId() { return originNodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillScanCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillScanCommandArg.java index f71484f9a21f7..de8139e6af3dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillScanCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillScanCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.kill; -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.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class KillScanCommandArg extends IgniteDataTransferObject { @@ -46,20 +42,6 @@ public class KillScanCommandArg extends IgniteDataTransferObject { @Argument(description = "Query identifier") private long queryId; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, originNodeId); - U.writeString(out, cacheName); - out.writeLong(queryId); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - originNodeId = U.readUuid(in); - cacheName = U.readString(in); - queryId = in.readLong(); - } - /** */ public UUID originNodeId() { return originNodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillServiceCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillServiceCommandArg.java index 45fbcf7e63a75..0d2e572ed405c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillServiceCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillServiceCommandArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.kill; -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.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class KillServiceCommandArg extends IgniteDataTransferObject { @@ -35,16 +31,6 @@ public class KillServiceCommandArg extends IgniteDataTransferObject { @Argument(description = "Service name") private String name; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, name); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - name = U.readString(in); - } - /** */ public String name() { return name; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommandArg.java index d24c494b984a8..afb8898548eee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.kill; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.UUID; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; import org.apache.ignite.internal.management.kill.SnapshotCancelTask.CancelSnapshotArg; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class KillSnapshotCommandArg extends CancelSnapshotArg { @@ -39,18 +35,6 @@ public class KillSnapshotCommandArg extends CancelSnapshotArg { /** */ private String snapshotName; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, requestId); - U.writeString(out, snapshotName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - requestId = U.readUuid(in); - snapshotName = U.readString(in); - } - /** {@inheritDoc} */ @Override public UUID requestId() { return requestId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSqlCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSqlCommandArg.java index 95bcbc0dc374c..fd78ae80e4761 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSqlCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSqlCommandArg.java @@ -17,15 +17,12 @@ package org.apache.ignite.internal.management.kill; -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.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; import org.apache.ignite.internal.util.typedef.T2; -import org.apache.ignite.internal.util.typedef.internal.U; + import static org.apache.ignite.internal.QueryMXBeanImpl.EXPECTED_GLOBAL_QRY_ID_FORMAT; import static org.apache.ignite.internal.sql.command.SqlKillQueryCommand.parseGlobalQueryId; @@ -45,20 +42,6 @@ public class KillSqlCommandArg extends IgniteDataTransferObject { /** */ private long qryId; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, queryId); - U.writeUuid(out, nodeId); - out.writeLong(qryId); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - queryId = U.readString(in); - nodeId = U.readUuid(in); - qryId = in.readLong(); - } - /** */ public UUID nodeId() { return nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillTransactionCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillTransactionCommandArg.java index 16aff9e5d4999..a04e58978d404 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillTransactionCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillTransactionCommandArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.kill; -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.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class KillTransactionCommandArg extends IgniteDataTransferObject { @@ -35,16 +31,6 @@ public class KillTransactionCommandArg extends IgniteDataTransferObject { @Argument(description = "Transaction identifier") private String xid; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, xid); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - xid = U.readString(in); - } - /** */ public String xid() { return xid; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommandArg.java index fb72f57cb0c57..81980347aec15 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommandArg.java @@ -17,13 +17,10 @@ package org.apache.ignite.internal.management.meta; -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.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; -import org.apache.ignite.internal.util.typedef.internal.U; + import static org.apache.ignite.internal.management.meta.MetaListCommand.printInt; /** */ @@ -40,18 +37,6 @@ public class MetaDetailsCommandArg extends IgniteDataTransferObject { @Argument(optional = true, example = "", javaStyleName = true) private String typeName; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeInt(typeId); - U.writeString(out, typeName); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - typeId = in.readInt(); - typeName = U.readString(in); - } - /** */ public int typeId() { return typeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommandArg.java index 8231eea68dd37..3702d75a562e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommandArg.java @@ -18,15 +18,12 @@ package org.apache.ignite.internal.management.meta; import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.io.OutputStream; import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @ArgumentGroup(value = {"typeId", "typeName"}, onlyOneOf = true, optional = false) @@ -38,20 +35,6 @@ public class MetaRemoveCommandArg extends MetaDetailsCommandArg { @Argument(optional = true, example = "") private String out; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeString(out, this.out); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - out = U.readString(in); - } - /** */ public String out() { return out; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommandArg.java index 811b5a042fed2..ebd30e56553d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommandArg.java @@ -20,8 +20,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; @@ -41,18 +39,6 @@ public class MetaUpdateCommandArg extends IgniteDataTransferObject { /** Marshaled metadata. */ private byte[] metaMarshalled; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, in); - U.writeByteArray(out, metaMarshalled); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - this.in = U.readString(in); - metaMarshalled = U.readByteArray(in); - } - /** */ public byte[] metaMarshalled() { return metaMarshalled; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommandArg.java index 560e867b0fa6a..545dcdbaa7fc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.metric; -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.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class MetricCommandArg extends IgniteDataTransferObject { @@ -40,18 +36,6 @@ public class MetricCommandArg extends IgniteDataTransferObject { @Argument(description = "Node id", optional = true) private UUID nodeId; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, name); - U.writeUuid(out, nodeId); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - name = U.readString(in); - nodeId = U.readUuid(in); - } - /** */ public UUID nodeId() { return nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHistogramCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHistogramCommandArg.java index 793e07beb3b0c..9730af3a21ce7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHistogramCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHistogramCommandArg.java @@ -17,13 +17,9 @@ 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; import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class MetricConfigureHistogramCommandArg extends MetricCommandArg { @@ -35,20 +31,6 @@ public class MetricConfigureHistogramCommandArg extends MetricCommandArg { @Positional private long[] newBounds; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeLongArray(out, newBounds); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - newBounds = U.readLongArray(in); - } - /** */ public long[] newBounds() { return newBounds; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHitrateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHitrateCommandArg.java index a54f52b592233..5893d6d200075 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHitrateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHitrateCommandArg.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 MetricConfigureHitrateCommandArg extends MetricCommandArg { @Positional private long newRateTimeInterval; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - out.writeLong(newRateTimeInterval); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - newRateTimeInterval = in.readLong(); - } - /** */ public long newRateTimeInterval() { return newRateTimeInterval; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceBackupCachesTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceBackupCachesTaskArg.java index 579de355f7be3..185fc1d9d99e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceBackupCachesTaskArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceBackupCachesTaskArg.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.management.persistence; -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; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class PersistenceBackupCachesTaskArg extends PersistenceCommand.PersistenceTaskArg { @@ -34,20 +30,6 @@ public class PersistenceBackupCachesTaskArg extends PersistenceCommand.Persisten @Argument(example = "cache1,cache2,cache3") private String[] caches; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeArray(out, caches); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - caches = U.readArray(in, String.class); - } - /** */ public String[] caches() { return caches; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCleanCachesTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCleanCachesTaskArg.java index 2d503799d702c..81b373b7d35a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCleanCachesTaskArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCleanCachesTaskArg.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.management.persistence; -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; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class PersistenceCleanCachesTaskArg extends PersistenceCommand.PersistenceTaskArg { @@ -34,20 +30,6 @@ public class PersistenceCleanCachesTaskArg extends PersistenceCommand.Persistenc @Argument(example = "cache1,cache2,cache3") private String[] caches; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeArray(out, caches); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - caches = U.readArray(in, String.class); - } - /** */ public String[] caches() { return caches; 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/property/PropertyGetCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommandArg.java index 3c3a7adc658d7..00469ed7ece32 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommandArg.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.management.api.Argument; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class PropertyGetCommandArg extends IgniteDataTransferObject { @@ -33,16 +29,6 @@ public class PropertyGetCommandArg extends IgniteDataTransferObject { @Argument(example = "") private String name; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, name); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - name = U.readString(in); - } - /** */ public String name() { return name; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommandArg.java index 6f7ecfd8d1f90..aad5c9a2cac3b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommandArg.java @@ -17,9 +17,6 @@ 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.management.api.Argument; @@ -32,16 +29,6 @@ public class PropertyListCommandArg extends IgniteDataTransferObject { @Argument(optional = true, description = "Print detailed information: name, value, description") private boolean info; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeBoolean(info); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - info = in.readBoolean(); - } - /** */ public boolean info() { return info; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommandArg.java index 01d777af16032..125e2d7adf6a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommandArg.java @@ -17,11 +17,7 @@ package org.apache.ignite.internal.management.property; -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.util.typedef.internal.U; /** */ public class PropertySetCommandArg extends PropertyGetCommandArg { @@ -32,20 +28,6 @@ public class PropertySetCommandArg extends PropertyGetCommandArg { @Argument(example = "") private String val; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeString(out, val); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - val = U.readString(in); - } - /** */ public String val() { return val; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeEnableCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeEnableCommandArg.java index 16cccf4eafe67..3cd081b7b882a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeEnableCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeEnableCommandArg.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 org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** Rolling upgrade enable command argument. */ public class RollingUpgradeEnableCommandArg extends IgniteDataTransferObject { @@ -60,16 +56,4 @@ public boolean force() { public void force(boolean force) { this.force = force; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, targetVersion); - out.writeBoolean(force); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - targetVersion = U.readString(in); - force = in.readBoolean(); - } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCancelCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCancelCommandArg.java index 68462aead81f8..4374e74ca5801 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCancelCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCancelCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.snapshot; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.UUID; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; import org.apache.ignite.internal.management.kill.SnapshotCancelTask.CancelSnapshotArg; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @ArgumentGroup(value = {"id", "name"}, optional = false, onlyOneOf = true) @@ -40,18 +36,6 @@ public class SnapshotCancelCommandArg extends CancelSnapshotArg { @Argument(description = "Snapshot name (deprecated)", optional = true) private String name; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeUuid(out, id); - U.writeString(out, name); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - id = U.readUuid(in); - name = U.readString(in); - } - /** */ public UUID id() { return id; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommandArg.java index 294fa54f7749f..1850715a46c08 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommandArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.snapshot; -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.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class SnapshotCheckCommandArg extends IgniteDataTransferObject { @@ -48,20 +44,6 @@ public class SnapshotCheckCommandArg extends IgniteDataTransferObject { "The command will check incremental snapshots sequentially from 1 to the specified index") private int increment; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, snapshotName); - U.writeString(out, src); - out.writeInt(increment); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - snapshotName = U.readString(in); - src = U.readString(in); - increment = in.readInt(); - } - /** */ public String snapshotName() { return snapshotName; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommandArg.java index f933cc4c67135..06530fe7a4371 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommandArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.snapshot; -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.Argument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class SnapshotCreateCommandArg extends IgniteDataTransferObject { @@ -53,22 +49,6 @@ public class SnapshotCreateCommandArg extends IgniteDataTransferObject { "Full snapshot must be accessible via --dest and snapshot_name") private boolean incremental; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, snapshotName); - U.writeString(out, dest); - out.writeBoolean(sync); - out.writeBoolean(incremental); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - snapshotName = U.readString(in); - dest = U.readString(in); - sync = in.readBoolean(); - incremental = in.readBoolean(); - } - /** */ public String snapshotName() { return snapshotName; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommandArg.java index 4b79fd77ca2db..c923ae65b6c96 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.snapshot; -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.Argument; import org.apache.ignite.internal.management.api.ArgumentGroup; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @@ -89,32 +85,6 @@ public void ensureOptions() { throw new IllegalArgumentException("--sync and --status can't be used together"); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, snapshotName); - out.writeInt(increment); - U.writeArray(out, groups); - U.writeString(out, src); - out.writeBoolean(sync); - out.writeBoolean(check); - out.writeBoolean(status); - out.writeBoolean(cancel); - out.writeBoolean(start); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - snapshotName = U.readString(in); - increment = in.readInt(); - groups = U.readArray(in, String.class); - src = U.readString(in); - sync = in.readBoolean(); - check = in.readBoolean(); - status = in.readBoolean(); - cancel = in.readBoolean(); - start = in.readBoolean(); - } - /** */ public boolean start() { return start; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationCommand.java index 82dc5477a348f..afd2479ed9367 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationCommand.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.Collection; import java.util.function.Consumer; import org.apache.ignite.cluster.ClusterNode; @@ -79,16 +76,6 @@ public TracingConfigurationCommand() { public abstract static class TracingConfigurationCommandArg 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/tracing/TracingConfigurationGetAllCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetAllCommandArg.java index 7eac6fbebb35e..a1714fb9b786a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetAllCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetAllCommandArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.tracing; -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.EnumDescription; import org.apache.ignite.internal.management.tracing.TracingConfigurationCommand.TracingConfigurationCommandArg; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.tracing.Scope; /** */ @@ -51,20 +47,6 @@ public class TracingConfigurationGetAllCommandArg extends TracingConfigurationCo ) private Scope scope; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeEnum(out, scope); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - scope = U.readEnum(in, Scope.class); - } - /** */ public Scope scope() { return scope; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetCommandArg.java index 20218668a3b4a..2e531e905201d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetCommandArg.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.tracing; -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.EnumDescription; import org.apache.ignite.internal.management.tracing.TracingConfigurationCommand.TracingConfigurationCommandArg; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.tracing.Scope; /** */ @@ -55,22 +51,6 @@ public class TracingConfigurationGetCommandArg extends TracingConfigurationComma @Argument(optional = true) private String label; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - U.writeEnum(out, scope); - U.writeString(out, label); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - scope = U.readEnum(in, Scope.class); - label = U.readString(in); - } - /** */ public Scope scope() { return scope; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationSetCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationSetCommandArg.java index afe7be4147bfb..bcbc1137c46ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationSetCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationSetCommandArg.java @@ -17,12 +17,9 @@ package org.apache.ignite.internal.management.tracing; -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.util.typedef.internal.U; import org.apache.ignite.spi.tracing.Scope; + import static org.apache.ignite.spi.tracing.TracingConfigurationParameters.SAMPLING_RATE_ALWAYS; import static org.apache.ignite.spi.tracing.TracingConfigurationParameters.SAMPLING_RATE_NEVER; @@ -40,22 +37,6 @@ public class TracingConfigurationSetCommandArg extends TracingConfigurationGetCo @Argument(optional = true, example = "Set of scopes with comma as separator DISCOVERY|EXCHANGE|COMMUNICATION|TX|SQL") private Scope[] includedScopes; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - super.writeExternalData(out); - - out.writeDouble(samplingRate); - U.writeArray(out, includedScopes); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - super.readExternalData(in); - - samplingRate = in.readDouble(); - includedScopes = U.readArray(in, Scope.class); - } - /** */ public double samplingRate() { return samplingRate; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxCommandArg.java index 307c4a98f4434..636c050ccd6b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxCommandArg.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.management.tx; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import org.apache.ignite.internal.management.api.Argument; @@ -27,7 +24,6 @@ import org.apache.ignite.internal.management.api.CliConfirmArgument; import org.apache.ignite.internal.management.api.EnumDescription; import org.apache.ignite.internal.util.typedef.internal.A; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @CliConfirmArgument @@ -88,34 +84,6 @@ public class TxCommandArg extends TxCommand.AbstractTxCommandArg { @Argument(optional = true) private boolean kill; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, xid); - out.writeObject(minDuration); - out.writeObject(minSize); - U.writeString(out, label); - out.writeBoolean(servers); - out.writeBoolean(clients); - U.writeArray(out, nodes); - out.writeObject(limit); - U.writeEnum(out, order); - out.writeBoolean(kill); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - xid = U.readString(in); - minDuration = (Long)in.readObject(); - minSize = (Integer)in.readObject(); - label = U.readString(in); - servers = in.readBoolean(); - clients = in.readBoolean(); - nodes = U.readArray(in, String.class); - limit = (Integer)in.readObject(); - order = U.readEnum(in, TxSortOrder.class); - kill = in.readBoolean(); - } - /** */ public String xid() { return xid; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommandArg.java index 2edf59b8cdcd7..07ed60875feb1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommandArg.java @@ -17,15 +17,11 @@ package org.apache.ignite.internal.management.tx; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.ignite.internal.management.api.Argument; import org.apache.ignite.internal.management.api.Positional; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; /** */ @@ -46,20 +42,6 @@ public class TxInfoCommandArg extends TxCommand.AbstractTxCommandArg { /** */ private GridCacheVersion gridCacheVersion; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, value); - U.writeIgniteUuid(out, uuid); - out.writeObject(gridCacheVersion); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - value = U.readString(in); - uuid = U.readIgniteUuid(in); - gridCacheVersion = (GridCacheVersion)in.readObject(); - } - /** */ public void uuid(IgniteUuid uuid) { this.uuid = uuid; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommandArg.java index 47a486e15acbc..11501bf863b91 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommandArg.java @@ -17,14 +17,10 @@ package org.apache.ignite.internal.management.wal; -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.Argument; import org.apache.ignite.internal.management.api.CliConfirmArgument; import org.apache.ignite.internal.management.api.Positional; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ @CliConfirmArgument @@ -37,16 +33,6 @@ public class WalDeleteCommandArg extends IgniteDataTransferObject { @Argument(optional = true, example = "consistentId1,consistentId2,....,consistentIdN") private String[] consistentIds; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeArray(out, consistentIds); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - consistentIds = U.readArray(in, String.class); - } - /** */ public String[] consistentIds() { return consistentIds; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalStateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalStateCommandArg.java index 9cf59a5ff9f73..f7b12060a6876 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalStateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalStateCommandArg.java @@ -17,12 +17,8 @@ package org.apache.ignite.internal.management.wal; -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.Argument; -import org.apache.ignite.internal.util.typedef.internal.U; /** */ public class WalStateCommandArg extends IgniteDataTransferObject { @@ -36,16 +32,6 @@ public class WalStateCommandArg extends IgniteDataTransferObject { ) private String[] groups; - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeArray(out, groups); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - groups = U.readArray(in, String.class); - } - /** */ public String[] groups() { return groups; From 45720ab60d0fbb4045dddbe8ebd4018debed4a86 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Fri, 23 Jan 2026 11:49:41 +0300 Subject: [PATCH 04/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../apache/ignite/internal/idto/IDTOSerializerGenerator.java | 2 +- .../ignite/internal/idto/IgniteDataTransferObjectProcessor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 24107fc5f6529..52dc636c84d90 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 @@ -276,7 +276,7 @@ private List fieldsSerdes( .replaceAll("\\$\\{c}", className(comp == null ? type : comp))); } else - code.add("// Unsupported type: " + typeName(type) + " " + fld.getSimpleName() + " " + type.getClass().getName()); + throw new IllegalStateException("Unsupported type: " + type); } return code; 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 79dbdd015bbbd..ef41eb6d6b876 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 @@ -162,7 +162,7 @@ private String generateFactory(Map genSerDes) throws IOExce writer.write("/** */"); writer.write(NL); writer.write(TAB); - writer.write("private final Map, " + simpleName(DTO_SERDES_INTERFACE) + "> serdes = new HashMap();"); + writer.write("private final Map, " + simpleName(DTO_SERDES_INTERFACE) + "> serdes = new HashMap<>();"); writer.write(NL); writer.write(NL); From bc0e9f0fb523ce2dde02ca7b8aefabb927f3c687 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Fri, 23 Jan 2026 23:05:13 +0300 Subject: [PATCH 05/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../IgniteDataTransferObjectProcessor.java | 33 +++++++++++++++++-- .../dto/IgniteDataTransferObject.java | 5 +-- .../ignite/internal/util/IgniteUtils.java | 30 +++++++++++++++++ .../internal/visor/VisorTaskArgument.java | 1 + 4 files changed, 65 insertions(+), 4 deletions(-) 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 ef41eb6d6b876..b3f6f1c482a8a 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 @@ -69,6 +69,9 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { * Processes all classes extending the {@code IgniteDataTransferObject} and generates corresponding serializer code. */ @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { + if (roundEnv.errorRaised()) + return true; + TypeMirror dtoCls = processingEnv.getElementUtils().getTypeElement(DTO_CLASS).asType(); TypeMirror argAnnotation = processingEnv.getElementUtils().getTypeElement(ARG_ANNOTATION).asType(); @@ -95,7 +98,7 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { try { IDTOSerializerGenerator gen = new IDTOSerializerGenerator(processingEnv, clazz); - if (gen.generate()) + if (gen.generate() && !clazz.toString().contains("SystemView")) genSerDes.put(clazz, gen.serializerFQN()); } catch (Exception e) { @@ -194,7 +197,32 @@ private void serializer(Writer writer) throws IOException { writer.write(NL); writer.write(TAB); writer.write(TAB); - writer.write("return serdes.get(cls);"); + writer.write("IgniteDataTransferObjectSerializer res = (IgniteDataTransferObjectSerializer)serdes.get(cls);"); + writer.write(NL); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write("if (res == null && getClass().desiredAssertionStatus()) {"); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write(TAB); + writer.write("res = U.loadSerializer(cls);"); + writer.write(NL); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write(TAB); + writer.write("serdes.put(cls, res);"); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write("}"); + writer.write(NL); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write("return res;"); writer.write(NL); writer.write(TAB); writer.write("}"); @@ -262,6 +290,7 @@ private void writeClassHeader(Writer writer, Set dtoClss) throws IO writer.write("import " + HashMap.class.getName() + ";" + NL); writer.write("import " + DTO_SERDES_INTERFACE + ";" + NL); writer.write("import " + DTO_CLASS + ";" + NL); + writer.write("import org.apache.ignite.internal.util.typedef.internal.U;" + NL); writer.write(NL); writer.write(CLS_JAVADOC); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java index bc26b70839c12..d96951d53b8c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Set; import org.apache.ignite.internal.codegen.idto.IDTOSerializerFactory; +import org.apache.ignite.internal.util.IgniteUtils; import org.jetbrains.annotations.Nullable; /** @@ -80,7 +81,7 @@ protected void writeExternalData(ObjectOutput out) throws IOException { try (IgniteDataTransferObjectOutput dtout = new IgniteDataTransferObjectOutput(out)) { IgniteDataTransferObjectSerializer serializer = IDTOSerializerFactory.getInstance().serializer(getClass()); - if (serializer == null) { + if (serializer == IgniteUtils.EMPTY) { writeExternalData(dtout); return; @@ -112,7 +113,7 @@ protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoun try (IgniteDataTransferObjectInput dtin = new IgniteDataTransferObjectInput(in)) { IgniteDataTransferObjectSerializer serializer = IDTOSerializerFactory.getInstance().serializer(getClass()); - if (serializer == null) { + if (serializer == IgniteUtils.EMPTY) { readExternalData(dtin); return; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 0e175970852f0..cab06e8525171 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -178,8 +178,11 @@ import org.apache.ignite.internal.binary.builder.BinaryObjectBuilderEx; import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; +import org.apache.ignite.internal.codegen.idto.IDTOSerializerFactory; import org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException; import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException; +import org.apache.ignite.internal.dto.IgniteDataTransferObject; +import org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer; import org.apache.ignite.internal.events.DiscoveryCustomEvent; import org.apache.ignite.internal.logger.IgniteLoggerEx; import org.apache.ignite.internal.managers.communication.GridIoPolicy; @@ -8241,4 +8244,31 @@ public void clearAllListener() { listeners.clear(); } } + + /** */ + public static final IgniteDataTransferObjectSerializer EMPTY = new IgniteDataTransferObjectSerializer() { + /** {@inheritDoc} */ + @Override public void writeExternal(Object instance, ObjectOutput out) { + // No-op. + } + + /** {@inheritDoc} */ + @Override public void readExternal(Object instance, ObjectInput in) { + // No-op. + } + }; + + /** */ + public static IgniteDataTransferObjectSerializer loadSerializer(Class cls) { + try { + Class cls0 = IgniteUtils.class.getClassLoader() + .loadClass(IDTOSerializerFactory.class.getPackage().getName() + "." + cls.getSimpleName() + "Serializer"); + + return (IgniteDataTransferObjectSerializer)cls0.getDeclaredConstructor().newInstance(); + } + catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | + InvocationTargetException e) { + return (IgniteDataTransferObjectSerializer)EMPTY; + } + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java index 4baa71d1ff157..5244dc8a6176b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java @@ -121,6 +121,7 @@ public boolean isDebug() { /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { + // TODO: FIXME - NOT IDTO METHODS! U.writeCollection(out, nodes); out.writeObject(arg); out.writeBoolean(debug); From 6959ecc2e95f889a46e3d7d3cc12cd710b59d192 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Fri, 23 Jan 2026 23:05:35 +0300 Subject: [PATCH 06/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../ignite/internal/idto/IgniteDataTransferObjectProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b3f6f1c482a8a..4d6115253ce95 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 @@ -98,7 +98,7 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { try { IDTOSerializerGenerator gen = new IDTOSerializerGenerator(processingEnv, clazz); - if (gen.generate() && !clazz.toString().contains("SystemView")) + if (gen.generate()) genSerDes.put(clazz, gen.serializerFQN()); } catch (Exception e) { From 308ddd6a043b8076181152dde7036ffe870129de Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Sat, 24 Jan 2026 00:14:13 +0300 Subject: [PATCH 07/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../java/org/apache/ignite/internal/visor/VisorTaskArgument.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java index 5244dc8a6176b..4baa71d1ff157 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java @@ -121,7 +121,6 @@ public boolean isDebug() { /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { - // TODO: FIXME - NOT IDTO METHODS! U.writeCollection(out, nodes); out.writeObject(arg); out.writeBoolean(debug); From baa6d7b9a8226e57277d47b65b197c336c62bf8f Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Sat, 24 Jan 2026 00:16:06 +0300 Subject: [PATCH 08/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../org/apache/ignite/internal/MessageSerializerGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index c14faa5ac13e1..28b04ba2bce85 100644 --- a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -62,7 +62,7 @@ */ public class MessageSerializerGenerator { /** */ - public static final String EMPTY = ""; + private static final String EMPTY = ""; /** */ public static final String TAB = " "; From d58705f8a847040585cc203b56477ab5879458f0 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Sat, 24 Jan 2026 13:25:28 +0300 Subject: [PATCH 09/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../idto/IDTOSerializerGenerator.java | 202 ++++++++++-------- .../IgniteDataTransferObjectProcessor.java | 200 ++++++++++------- 2 files changed, 233 insertions(+), 169 deletions(-) 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 52dc636c84d90..1ea0f1cbb501b 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 @@ -56,34 +56,25 @@ import static org.apache.ignite.internal.MessageSerializerGenerator.identicalFileIsAlreadyGenerated; /** - * Generates serializer class for given {@code IgniteDataTransferObject} class. + * Generates serializer class for given {@code IgniteDataTransferObject} extension. * The generated serializer follows the naming convention: * {@code org.apache.ignite.internal.codegen.[IDTOClassName]Serializer}. */ public class IDTOSerializerGenerator { - /** */ + /** Package for serializers. */ static final String PKG_NAME = "org.apache.ignite.internal.codegen.idto"; - /** */ + /** Serializer interface. */ public static final String DTO_SERDES_INTERFACE = "org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer"; - /** */ + /** Class javadoc */ static final String CLS_JAVADOC = "/** " + NL + " * This class is generated automatically." + NL + " *" + NL + " * @see org.apache.ignite.internal.dto.IgniteDataTransferObject" + NL + " */"; - /** */ - private final ProcessingEnvironment env; - - /** */ - private final TypeElement type; - - /** */ - private final Set imports = new HashSet<>(); - - /** */ + /** Type name to write/read code for the type. */ private static final Map> TYPE_SERDES = new HashMap<>(); { @@ -113,15 +104,15 @@ public class IDTOSerializerGenerator { TYPE_SERDES.put(Map.class.getName(), F.t("U.writeMap(out, obj.${f}());", "obj.${f}(U.readMap(in));")); } - /** */ + /** Write/Read code for enum. */ private static final IgniteBiTuple ENUM_SERDES = F.t("U.writeEnum(out, obj.${f}());", "obj.${f}(U.readEnum(in, ${c}.class));"); - /** */ + /** Write/Read code for array. */ private static final IgniteBiTuple OBJ_ARRAY_SERDES = F.t("U.writeArray(out, obj.${f}());", "obj.${f}(U.readArray(in, ${c}.class));"); - /** */ + /** Type name to write/read code for the array of type. */ private static final Map> ARRAY_TYPE_SERDES = new HashMap<>(); { @@ -132,23 +123,33 @@ public class IDTOSerializerGenerator { ARRAY_TYPE_SERDES.put(UUID.class.getName(), OBJ_ARRAY_SERDES); } - /** */ + /** Environment. */ + private final ProcessingEnvironment env; + + /** Type to generated serializer for. */ + private final TypeElement type; + + /** Serializer imports. */ + private final Set imports = new HashSet<>(); + + /** + * @param env Environment. + * @param type Type to generate serializer for. + */ public IDTOSerializerGenerator(ProcessingEnvironment env, TypeElement type) { this.env = env; this.type = type; } - /** */ + /** @return Fully qualified name for generated class. */ public String serializerFQN() { return PKG_NAME + "." + serializerName(); } - /** */ - private String serializerName() { - return type.getSimpleName() + "Serializer"; - } - - /** */ + /** + * @return {@code True} if generation succeed. + * @throws Exception in case of error. + */ public boolean generate() throws Exception { String serClsName = type.getSimpleName() + "Serializer"; String serCode = generateSerializerCode(); @@ -182,7 +183,7 @@ public boolean generate() throws Exception { } } - /** */ + /** @return Code for the calss implementing {@code org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer}. */ private String generateSerializerCode() throws IOException { imports.add("org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer"); imports.add(type.getQualifiedName().toString()); @@ -191,15 +192,15 @@ private String generateSerializerCode() throws IOException { imports.add(IOException.class.getName()); imports.add("org.apache.ignite.internal.util.typedef.internal.U"); - String clsName = String.valueOf(type.getSimpleName()); + String simpleClsName = String.valueOf(type.getSimpleName()); List flds = fields(type); - List write = generateWrite(clsName, flds); - List read = generateRead(clsName, flds); + List write = generateWrite(simpleClsName, flds); + List read = generateRead(simpleClsName, flds); try (Writer writer = new StringWriter()) { - writeClassHeader(writer, clsName); + writeClassHeader(writer, simpleClsName); for (String line : write) { writer.write(TAB); @@ -221,19 +222,36 @@ private String generateSerializerCode() throws IOException { } } - /** */ - private List generateRead(String clsName, List flds) { - List code = new ArrayList<>(); + /** + * @param writer Writer to write class to. + * @param simpleClsName Class name + * @throws IOException + */ + private void writeClassHeader(Writer writer, String simpleClsName) throws IOException { + try (InputStream in = getClass().getClassLoader().getResourceAsStream("license.txt"); + BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { - code.add("/** {@inheritDoc} */"); - code.add("@Override public void readExternal(" + clsName + " obj, ObjectInput in) throws IOException, ClassNotFoundException {"); - fieldsSerdes(flds, IgniteBiTuple::get2).forEach(line -> code.add(TAB + line)); - code.add("}"); + PrintWriter out = new PrintWriter(writer); - return code; + String line; + + while ((line = reader.readLine()) != null) + out.println(line); + } + + writer.write(NL); + writer.write("package " + PKG_NAME + ";" + NL + NL); + + for (String regularImport: imports) + writer.write("import " + regularImport + ";" + NL); + + writer.write(NL); + writer.write(CLS_JAVADOC); + writer.write(NL); + writer.write("public class " + serializerName() + " implements " + simpleName(DTO_SERDES_INTERFACE) + "<" + simpleClsName + "> {" + NL); } - /** */ + /** @return Lines for generated {@code IgniteDataTransferObjectSerializer#writeExternal(T, ObjectOutput)} method. */ private List generateWrite(String clsName, List flds) { List code = new ArrayList<>(); @@ -247,10 +265,26 @@ private List generateWrite(String clsName, List flds) { return code; } - /** */ + /** @return Lines for generated {@code IgniteDataTransferObjectSerializer#readExternal(T, ObjectInput)} method. */ + private List generateRead(String clsName, List flds) { + List code = new ArrayList<>(); + + code.add("/** {@inheritDoc} */"); + code.add("@Override public void readExternal(" + clsName + " obj, ObjectInput in) throws IOException, ClassNotFoundException {"); + fieldsSerdes(flds, IgniteBiTuple::get2).forEach(line -> code.add(TAB + line)); + code.add("}"); + + return code; + } + + /** + * @param flds Fields to generated serdes for. + * @param lineProvider Function to generated serdes code for the field. + * @return Lines to serdes fields. + */ private List fieldsSerdes( List flds, - Function, String> patternProvider + Function, String> lineProvider ) { List code = new ArrayList<>(); @@ -263,17 +297,17 @@ private List fieldsSerdes( if (type.getKind() == TypeKind.ARRAY) { comp = ((ArrayType)type).getComponentType(); - serDes = enumType(env, comp) ? OBJ_ARRAY_SERDES : ARRAY_TYPE_SERDES.get(typeName(comp)); + serDes = enumType(env, comp) ? OBJ_ARRAY_SERDES : ARRAY_TYPE_SERDES.get(className(comp)); } else - serDes = enumType(env, type) ? ENUM_SERDES : TYPE_SERDES.get(typeName(type)); + serDes = enumType(env, type) ? ENUM_SERDES : TYPE_SERDES.get(className(type)); if (serDes != null) { - String pattern = patternProvider.apply(serDes); + String pattern = lineProvider.apply(serDes); code.add(pattern .replaceAll("\\$\\{f}", fld.getSimpleName().toString()) - .replaceAll("\\$\\{c}", className(comp == null ? type : comp))); + .replaceAll("\\$\\{c}", simpleClassName(comp == null ? type : comp))); } else throw new IllegalStateException("Unsupported type: " + type); @@ -282,50 +316,7 @@ private List fieldsSerdes( return code; } - /** */ - private String className(TypeMirror type) { - if (type instanceof PrimitiveType) - return typeName(type); - - String fqn = typeName(type); - - if (!fqn.startsWith("java.lang")) - imports.add(fqn); - - return simpleName(fqn); - } - - /** */ - public static String simpleName(String fqn) { - return fqn.substring(fqn.lastIndexOf('.') + 1); - } - - /** */ - private void writeClassHeader(Writer writer, String clsName) throws IOException { - try (InputStream in = getClass().getClassLoader().getResourceAsStream("license.txt"); - BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { - - PrintWriter out = new PrintWriter(writer); - - String line; - - while ((line = reader.readLine()) != null) - out.println(line); - } - - writer.write(NL); - writer.write("package " + PKG_NAME + ";" + NL + NL); - - for (String regularImport: imports) - writer.write("import " + regularImport + ";" + NL); - - writer.write(NL); - writer.write(CLS_JAVADOC); - writer.write(NL); - writer.write("public class " + serializerName() + " implements " + simpleName(DTO_SERDES_INTERFACE) + "<" + clsName + "> {" + NL); - } - - /** */ + /** @return List of non-static and non-transient field for given {@code type}. */ private List fields(TypeElement type) { List res = new ArrayList<>(); @@ -334,7 +325,7 @@ private List fields(TypeElement type) { if (el.getKind() != ElementKind.FIELD) continue; - if (el.getModifiers().contains(Modifier.STATIC)) + if (el.getModifiers().contains(Modifier.STATIC) || el.getModifiers().contains(Modifier.TRANSIENT)) continue; res.add((VariableElement)el); @@ -348,11 +339,38 @@ private List fields(TypeElement type) { return res; } - /** */ - private static String typeName(TypeMirror comp) { + /** @return FQN of {@code comp}. */ + private static String className(TypeMirror comp) { String n = comp.toString(); int genIdx = n.indexOf('<'); return genIdx == -1 ? n : n.substring(0, genIdx); } + + /** @return Serializer class name. */ + private String serializerName() { + return type.getSimpleName() + "Serializer"; + } + + /** + * Adds to imports if class need to be imported explicitly. + * + * @return Simple class name. + */ + private String simpleClassName(TypeMirror type) { + if (type instanceof PrimitiveType) + return className(type); + + String fqn = className(type); + + if (!fqn.startsWith("java.lang")) + imports.add(fqn); + + return simpleName(fqn); + } + + /** @return Simple class name. */ + public static String simpleName(String fqn) { + return fqn.substring(fqn.lastIndexOf('.') + 1); + } } 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 4d6115253ce95..366e1c5ecda91 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 @@ -51,15 +51,23 @@ import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.simpleName; /** - * + * Generates implementations of {@code IgniteDataTransferObjectSerializer} for all supported classes. + * Generates factory {@code IDTOSerializerFactory} to get instance of serializer for given class. + * See, {@code IgniteDataTransferObject#writeExternal(ObjectOutput)} and {@code IgniteDataTransferObject#writeExternal(ObjectInput)} to get + * insight of using serializers. */ @SupportedAnnotationTypes("org.apache.ignite.internal.management.api.Argument") @SupportedSourceVersion(SourceVersion.RELEASE_11) public class IgniteDataTransferObjectProcessor extends AbstractProcessor { - /** Base interface that every message must implement. */ + /** Base class that every dto must extends. */ private static final String DTO_CLASS = "org.apache.ignite.internal.dto.IgniteDataTransferObject"; - /** Base interface that every message must implement. */ + /** + * 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"; /** Factory class name. */ @@ -110,12 +118,23 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { } } + // IDE recompile only modified classes. Don't want to touch factory in the case no matching classes was recompiled. if (genSerDes.isEmpty()) return true; + generateFactory(genSerDes); + + return true; + } + + /** + * Generates and writes factory. + * @param genSerDes Generated serdes classes. + */ + private void generateFactory(Map genSerDes) { try { String factoryFQN = PKG_NAME + "." + FACTORY_CLASS; - String factoryCode = generateFactory(genSerDes); + String factoryCode = factoryCode(genSerDes); try { JavaFileObject file = processingEnv.getFiler().createSourceFile(factoryFQN); @@ -144,12 +163,14 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { catch (Exception e) { processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Failed to generate a dto factory:" + e.getMessage()); } - - return true; } - /** */ - private String generateFactory(Map genSerDes) throws IOException { + /** + * @param genSerDes Generated serdes classes. + * @return Factory code. + * @throws IOException In case of error. + */ + private String factoryCode(Map genSerDes) throws IOException { try (Writer writer = new StringWriter()) { writeClassHeader(writer, genSerDes.keySet()); @@ -169,7 +190,7 @@ private String generateFactory(Map genSerDes) throws IOExce writer.write(NL); writer.write(NL); - constructor(genSerDes, writer); + constructor(writer, genSerDes); writer.write(NL); getInstance(writer); @@ -184,52 +205,49 @@ private String generateFactory(Map genSerDes) throws IOExce } } - /** */ - private void serializer(Writer writer) throws IOException { - writer.write(TAB); - writer.write("/** */"); - writer.write(NL); - writer.write(TAB); + /** + * Generates class header. + * + * @param writer Writer to write code to. + * @param dtoClss DTO classes to import. + * @throws IOException In case of error. + */ + private void writeClassHeader(Writer writer, Set dtoClss) throws IOException { + try (InputStream in = getClass().getClassLoader().getResourceAsStream("license.txt"); + BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { - String genericType = ""; + PrintWriter out = new PrintWriter(writer); + + String line; + + while ((line = reader.readLine()) != null) + out.println(line); + } - writer.write("public " + genericType + " " + simpleName(DTO_SERDES_INTERFACE) + " serializer(Class cls) {"); - writer.write(NL); - writer.write(TAB); - writer.write(TAB); - writer.write("IgniteDataTransferObjectSerializer res = (IgniteDataTransferObjectSerializer)serdes.get(cls);"); - writer.write(NL); - writer.write(NL); - writer.write(TAB); - writer.write(TAB); - writer.write("if (res == null && getClass().desiredAssertionStatus()) {"); - writer.write(NL); - writer.write(TAB); - writer.write(TAB); - writer.write(TAB); - writer.write("res = U.loadSerializer(cls);"); - writer.write(NL); - writer.write(NL); - writer.write(TAB); - writer.write(TAB); - writer.write(TAB); - writer.write("serdes.put(cls, res);"); - writer.write(NL); - writer.write(TAB); - writer.write(TAB); - writer.write("}"); - writer.write(NL); writer.write(NL); - writer.write(TAB); - writer.write(TAB); - writer.write("return res;"); + writer.write("package " + PKG_NAME + ";" + NL + NL); + + for (TypeElement dtoCls : dtoClss) + writer.write("import " + dtoCls.getQualifiedName() + ";" + NL); + + writer.write("import " + Map.class.getName() + ";" + NL); + writer.write("import " + HashMap.class.getName() + ";" + NL); + writer.write("import " + DTO_SERDES_INTERFACE + ";" + NL); + writer.write("import " + DTO_CLASS + ";" + NL); + writer.write("import org.apache.ignite.internal.util.typedef.internal.U;" + NL); + writer.write(NL); - writer.write(TAB); - writer.write("}"); + writer.write(CLS_JAVADOC); writer.write(NL); + writer.write("public class " + FACTORY_CLASS + " {" + NL); } - /** */ + /** + * Generates static {@code getInstance} method. + * + * @param writer Writer to write code to. + * @throws IOException In case of error. + */ private static void getInstance(Writer writer) throws IOException { writer.write(TAB); writer.write("/** */"); @@ -246,8 +264,14 @@ private static void getInstance(Writer writer) throws IOException { writer.write(NL); } - /** */ - private static void constructor(Map genSerDes, Writer writer) throws IOException { + /** + * Generates private constructor. + * + * @param writer Writer to write code to. + * @param genSerDes Serdes to support in factory. + * @throws IOException In case of error. + */ + private static void constructor(Writer writer, Map genSerDes) throws IOException { writer.write(TAB); writer.write("/** */"); writer.write(NL); @@ -267,38 +291,61 @@ private static void constructor(Map genSerDes, Writer write writer.write(NL); } - /** */ - private void writeClassHeader(Writer writer, Set dtoClss) throws IOException { - try (InputStream in = getClass().getClassLoader().getResourceAsStream("license.txt"); - BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { - - PrintWriter out = new PrintWriter(writer); - - String line; - - while ((line = reader.readLine()) != null) - out.println(line); - } - + /** + * Generates method to get serializer from factory. + * + * @param writer Writer to write code to. + * @throws IOException In case of error. + */ + private void serializer(Writer writer) throws IOException { + writer.write(TAB); + writer.write("/** */"); writer.write(NL); - writer.write("package " + PKG_NAME + ";" + NL + NL); - - for (TypeElement dtoCls : dtoClss) - writer.write("import " + dtoCls.getQualifiedName() + ";" + NL); + writer.write(TAB); - writer.write("import " + Map.class.getName() + ";" + NL); - writer.write("import " + HashMap.class.getName() + ";" + NL); - writer.write("import " + DTO_SERDES_INTERFACE + ";" + NL); - writer.write("import " + DTO_CLASS + ";" + NL); - writer.write("import org.apache.ignite.internal.util.typedef.internal.U;" + NL); + String genericType = ""; + writer.write("public " + genericType + " " + simpleName(DTO_SERDES_INTERFACE) + " serializer(Class cls) {"); writer.write(NL); - writer.write(CLS_JAVADOC); + writer.write(TAB); + writer.write(TAB); + writer.write("IgniteDataTransferObjectSerializer res = (IgniteDataTransferObjectSerializer)serdes.get(cls);"); + writer.write(NL); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write("if (res == null && getClass().desiredAssertionStatus()) {"); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write(TAB); + writer.write("res = U.loadSerializer(cls);"); + writer.write(NL); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write(TAB); + writer.write("serdes.put(cls, res);"); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write("}"); + writer.write(NL); + writer.write(NL); + writer.write(TAB); + writer.write(TAB); + writer.write("return res;"); + writer.write(NL); + writer.write(TAB); + writer.write("}"); writer.write(NL); - writer.write("public class " + FACTORY_CLASS + " {" + 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()) { @@ -311,8 +358,7 @@ private boolean hasArgumentFields(TypeElement type, TypeMirror argAnnotation) { } } - Element superType = processingEnv.getTypeUtils().asElement(type.getSuperclass()); - type = (TypeElement)superType; + type = (TypeElement)processingEnv.getTypeUtils().asElement(type.getSuperclass()); } return false; From 2f51d3d94ee278c1d35cbaa840c32a6bbfdc3154 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Sat, 24 Jan 2026 13:31:16 +0300 Subject: [PATCH 10/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../internal/idto/IgniteDataTransferObjectProcessor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 366e1c5ecda91..95ee6186c8ea1 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 @@ -314,11 +314,15 @@ private void serializer(Writer writer) throws IOException { writer.write(NL); writer.write(TAB); writer.write(TAB); - writer.write("if (res == null && getClass().desiredAssertionStatus()) {"); + writer.write("if (res == null) {"); writer.write(NL); writer.write(TAB); writer.write(TAB); writer.write(TAB); + // IDE can invoke partial recompile during development. + // In this case there will be only part (one) of serdes in the map initially. + // We want to correctly initialize and trying to load serializer dynamically. + // Other case to do it custom commands. writer.write("res = U.loadSerializer(cls);"); writer.write(NL); writer.write(NL); From bea02ab3330bdb320fd13e08f7fe525de8cb7f7e Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Sat, 24 Jan 2026 14:16:45 +0300 Subject: [PATCH 11/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../apache/ignite/internal/idto/IDTOSerializerGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 1ea0f1cbb501b..fe8d3cc300a19 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 @@ -248,7 +248,8 @@ private void writeClassHeader(Writer writer, String simpleClsName) throws IOExce writer.write(NL); writer.write(CLS_JAVADOC); writer.write(NL); - writer.write("public class " + serializerName() + " implements " + simpleName(DTO_SERDES_INTERFACE) + "<" + simpleClsName + "> {" + NL); + writer.write("public class " + serializerName() + " implements " + simpleName(DTO_SERDES_INTERFACE) + + "<" + simpleClsName + "> {" + NL); } /** @return Lines for generated {@code IgniteDataTransferObjectSerializer#writeExternal(T, ObjectOutput)} method. */ From 1913eca4d0316b9347f62391446447b17ac50cee Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Sun, 25 Jan 2026 11:57:11 +0300 Subject: [PATCH 12/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../internal/management/cache/CacheIdleVerifyCommandArg.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java index d263547456f86..fc5e63f20333a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java @@ -76,6 +76,9 @@ public class CacheIdleVerifyCommandArg extends IgniteDataTransferObject { * @param string To validate that given name is valed regex. */ private void validateRegexes(String[] string) { + if (string == null) + return; + for (String s : string) { try { Pattern.compile(s); From 9d9e5b8378bae56f9ef6371e67c87d78e90cfd64 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 26 Jan 2026 13:36:12 +0300 Subject: [PATCH 13/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../internal/MessageSerializerGenerator.java | 9 ++-- .../idto/IDTOSerializerGenerator.java | 50 +++++++++---------- .../IgniteDataTransferObjectProcessor.java | 20 +++++--- .../management/ChangeTagCommandArg.java | 2 +- .../management/DeactivateCommandArg.java | 4 +- .../management/SetStateCommandArg.java | 6 +-- .../management/ShutdownPolicyCommandArg.java | 2 +- .../management/SystemViewCommandArg.java | 8 +-- .../baseline/BaselineAddCommandArg.java | 2 +- .../BaselineAutoAdjustCommandArg.java | 4 +- .../management/baseline/BaselineCommand.java | 2 +- .../baseline/BaselineVersionCommandArg.java | 2 +- .../cache/CacheClearCommandArg.java | 2 +- .../cache/CacheContentionCommandArg.java | 6 +-- .../cache/CacheCreateCommandArg.java | 6 +-- .../cache/CacheDestroyCommandArg.java | 4 +- .../cache/CacheDistributionCommandArg.java | 8 +-- .../cache/CacheFindGarbageCommandArg.java | 10 ++-- .../cache/CacheIdleVerifyCommandArg.java | 10 ++-- .../CacheIndexesForceRebuildCommandArg.java | 10 ++-- .../cache/CacheIndexesListCommandArg.java | 8 +-- .../CacheIndexesRebuildStatusCommandArg.java | 2 +- .../management/cache/CacheListCommandArg.java | 12 ++--- .../cache/CacheMetricsCommandArg.java | 6 +-- .../CacheResetLostPartitionsCommandArg.java | 2 +- ...CacheScheduleIndexesRebuildCommandArg.java | 12 ++--- .../cache/CacheValidateIndexesCommandArg.java | 16 +++--- .../cache/scan/CacheScanCommandArg.java | 6 +-- .../CdcDeleteLostSegmentLinksCommandArg.java | 2 +- .../management/cdc/CdcResendCommandArg.java | 2 +- .../checkpoint/CheckpointCommandArg.java | 6 +-- .../ConsistencyRepairCommandArg.java | 6 +-- .../DefragmentationScheduleCommandArg.java | 4 +- .../DiagnosticPagelocksCommandArg.java | 8 +-- .../encryption/EncryptionCacheGroupArg.java | 2 +- .../EncryptionChangeMasterKeyCommandArg.java | 2 +- ...yptionReencryptionRateLimitCommandArg.java | 2 +- .../management/kill/KillClientCommandArg.java | 4 +- .../kill/KillComputeCommandArg.java | 2 +- .../kill/KillContinuousCommandArg.java | 4 +- .../management/kill/KillScanCommandArg.java | 6 +-- .../kill/KillServiceCommandArg.java | 2 +- .../kill/KillSnapshotCommandArg.java | 4 +- .../management/kill/KillSqlCommandArg.java | 6 +-- .../kill/KillTransactionCommandArg.java | 2 +- .../meta/MetaDetailsCommandArg.java | 4 +- .../management/meta/MetaRemoveCommandArg.java | 2 +- .../management/meta/MetaUpdateCommandArg.java | 4 +- .../management/metric/MetricCommandArg.java | 4 +- .../MetricConfigureHistogramCommandArg.java | 2 +- .../MetricConfigureHitrateCommandArg.java | 2 +- .../MetricConfigureMaxValueCommandArg.java | 2 +- .../PersistenceBackupCachesTaskArg.java | 2 +- .../PersistenceCleanCachesTaskArg.java | 2 +- .../property/PropertyGetCommandArg.java | 2 +- .../property/PropertyListCommandArg.java | 2 +- .../property/PropertySetCommandArg.java | 2 +- .../RollingUpgradeEnableCommandArg.java | 4 +- .../snapshot/SnapshotCancelCommandArg.java | 4 +- .../snapshot/SnapshotCheckCommandArg.java | 6 +-- .../snapshot/SnapshotCreateCommandArg.java | 8 +-- .../snapshot/SnapshotRestoreCommandArg.java | 18 +++---- .../TracingConfigurationGetAllCommandArg.java | 2 +- .../TracingConfigurationGetCommandArg.java | 4 +- .../TracingConfigurationSetCommandArg.java | 4 +- .../internal/management/tx/TxCommandArg.java | 20 ++++---- .../management/tx/TxInfoCommandArg.java | 6 +-- .../management/wal/WalDeleteCommandArg.java | 2 +- .../management/wal/WalStateCommandArg.java | 2 +- 69 files changed, 203 insertions(+), 202 deletions(-) diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java index 28b04ba2bce85..a253c05897098 100644 --- a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java @@ -119,10 +119,11 @@ void generate(TypeElement type, List fields) throws Exception { imports.add(type.getQualifiedName().toString()); String serClsName = type.getSimpleName() + "Serializer"; + String serFqnClsName = PKG_NAME + "." + serClsName; String serCode = generateSerializerCode(serClsName); try { - JavaFileObject file = env.getFiler().createSourceFile(PKG_NAME + "." + serClsName); + JavaFileObject file = env.getFiler().createSourceFile(serFqnClsName); try (Writer writer = file.openWriter()) { writer.append(serCode); @@ -136,7 +137,7 @@ void generate(TypeElement type, List fields) throws Exception { // all Run commands to Maven. However, this significantly slows down test startup time. // This hack checks whether the content of a generating file is identical to already existed file, and skips // handling this class if it is. - if (!identicalFileIsAlreadyGenerated(env, serCode, PKG_NAME, serClsName)) { + if (!identicalFileIsAlreadyGenerated(env, serCode, serFqnClsName)) { env.getMessager().printMessage( Diagnostic.Kind.ERROR, "MessageSerializer " + serClsName + " is already generated. Try 'mvn clean install' to fix the issue."); @@ -881,9 +882,9 @@ private String capitalizeOnlyFirst(String input) { } /** @return {@code true} if trying to generate file with the same content. */ - public static boolean identicalFileIsAlreadyGenerated(ProcessingEnvironment env, String srcCode, String pkg, String clsName) { + public static boolean identicalFileIsAlreadyGenerated(ProcessingEnvironment env, String srcCode, String fqnClsName) { try { - String fileName = pkg.replace('.', '/') + '/' + clsName + ".java"; + String fileName = fqnClsName.replace('.', '/') + ".java"; FileObject prevFile = env.getFiler().getResource(StandardLocation.SOURCE_OUTPUT, "", fileName); String prevFileContent; 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 fe8d3cc300a19..a7f2ebcad633f 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 @@ -61,9 +61,6 @@ * {@code org.apache.ignite.internal.codegen.[IDTOClassName]Serializer}. */ public class IDTOSerializerGenerator { - /** Package for serializers. */ - static final String PKG_NAME = "org.apache.ignite.internal.codegen.idto"; - /** Serializer interface. */ public static final String DTO_SERDES_INTERFACE = "org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer"; @@ -78,15 +75,15 @@ public class IDTOSerializerGenerator { private static final Map> TYPE_SERDES = new HashMap<>(); { - TYPE_SERDES.put(boolean.class.getName(), F.t("out.writeBoolean(obj.${f}());", "obj.${f}(in.readBoolean());")); - TYPE_SERDES.put(byte.class.getName(), F.t("out.write(obj.${f}());", "obj.${f}(in.read());")); - TYPE_SERDES.put(short.class.getName(), F.t("out.writeShort(obj.${f}());", "obj.${f}(in.readShort());")); - TYPE_SERDES.put(int.class.getName(), F.t("out.writeInt(obj.${f}());", "obj.${f}(in.readInt());")); - TYPE_SERDES.put(long.class.getName(), F.t("out.writeLong(obj.${f}());", "obj.${f}(in.readLong());")); - 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());")); + TYPE_SERDES.put(boolean.class.getName(), F.t("out.writeBoolean(obj.${f});", "obj.${f} = in.readBoolean();")); + TYPE_SERDES.put(byte.class.getName(), F.t("out.write(obj.${f});", "obj.${f} = in.read();")); + TYPE_SERDES.put(short.class.getName(), F.t("out.writeShort(obj.${f});", "obj.${f} = in.readShort();")); + TYPE_SERDES.put(int.class.getName(), F.t("out.writeInt(obj.${f});", "obj.${f} = in.readInt();")); + TYPE_SERDES.put(long.class.getName(), F.t("out.writeLong(obj.${f});", "obj.${f} = in.readLong();")); + 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());"); + 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); @@ -96,29 +93,29 @@ public class IDTOSerializerGenerator { TYPE_SERDES.put(Float.class.getName(), objSerdes); TYPE_SERDES.put(Double.class.getName(), objSerdes); - 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(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(Map.class.getName(), F.t("U.writeMap(out, obj.${f}());", "obj.${f}(U.readMap(in));")); + TYPE_SERDES.put(Map.class.getName(), F.t("U.writeMap(out, obj.${f});", "obj.${f} = U.readMap(in);")); } /** Write/Read code for enum. */ private static final IgniteBiTuple ENUM_SERDES = - F.t("U.writeEnum(out, obj.${f}());", "obj.${f}(U.readEnum(in, ${c}.class));"); + F.t("U.writeEnum(out, obj.${f});", "obj.${f} = U.readEnum(in, ${c}.class);"); /** Write/Read code for array. */ private static final IgniteBiTuple OBJ_ARRAY_SERDES = - F.t("U.writeArray(out, obj.${f}());", "obj.${f}(U.readArray(in, ${c}.class));"); + F.t("U.writeArray(out, obj.${f});", "obj.${f} = U.readArray(in, ${c}.class);"); /** Type name to write/read code for the array of type. */ private static final Map> ARRAY_TYPE_SERDES = new HashMap<>(); { - ARRAY_TYPE_SERDES.put(byte.class.getName(), F.t("U.writeByteArray(out, obj.${f}());", "obj.${f}(U.readByteArray(in));")); - ARRAY_TYPE_SERDES.put(int.class.getName(), F.t("U.writeIntArray(out, obj.${f}());", "obj.${f}(U.readIntArray(in));")); - ARRAY_TYPE_SERDES.put(long.class.getName(), F.t("U.writeLongArray(out, obj.${f}());", "obj.${f}(U.readLongArray(in));")); + ARRAY_TYPE_SERDES.put(byte.class.getName(), F.t("U.writeByteArray(out, obj.${f});", "obj.${f} = U.readByteArray(in);")); + ARRAY_TYPE_SERDES.put(int.class.getName(), F.t("U.writeIntArray(out, obj.${f});", "obj.${f} = U.readIntArray(in);")); + ARRAY_TYPE_SERDES.put(long.class.getName(), F.t("U.writeLongArray(out, obj.${f});", "obj.${f} = U.readLongArray(in);")); ARRAY_TYPE_SERDES.put(String.class.getName(), OBJ_ARRAY_SERDES); ARRAY_TYPE_SERDES.put(UUID.class.getName(), OBJ_ARRAY_SERDES); } @@ -143,7 +140,7 @@ public IDTOSerializerGenerator(ProcessingEnvironment env, TypeElement type) { /** @return Fully qualified name for generated class. */ public String serializerFQN() { - return PKG_NAME + "." + serializerName(); + return type.getQualifiedName() + "Serializer"; } /** @@ -151,11 +148,11 @@ public String serializerFQN() { * @throws Exception in case of error. */ public boolean generate() throws Exception { - String serClsName = type.getSimpleName() + "Serializer"; + String fqnClsName = serializerFQN(); String serCode = generateSerializerCode(); try { - JavaFileObject file = env.getFiler().createSourceFile(PKG_NAME + "." + serClsName); + JavaFileObject file = env.getFiler().createSourceFile(fqnClsName); try (Writer writer = file.openWriter()) { writer.append(serCode); @@ -171,10 +168,10 @@ public boolean generate() throws Exception { // all Run commands to Maven. However, this significantly slows down test startup time. // This hack checks whether the content of a generating file is identical to already existed file, and skips // handling this class if it is. - if (!identicalFileIsAlreadyGenerated(env, serCode, PKG_NAME, serClsName)) { + if (!identicalFileIsAlreadyGenerated(env, serCode, fqnClsName)) { env.getMessager().printMessage( Diagnostic.Kind.ERROR, - serClsName + " is already generated. Try 'mvn clean install' to fix the issue."); + fqnClsName + " is already generated. Try 'mvn clean install' to fix the issue."); throw e; } @@ -186,7 +183,6 @@ public boolean generate() throws Exception { /** @return Code for the calss implementing {@code org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer}. */ private String generateSerializerCode() throws IOException { imports.add("org.apache.ignite.internal.dto.IgniteDataTransferObjectSerializer"); - imports.add(type.getQualifiedName().toString()); imports.add(ObjectOutput.class.getName()); imports.add(ObjectInput.class.getName()); imports.add(IOException.class.getName()); @@ -240,7 +236,7 @@ private void writeClassHeader(Writer writer, String simpleClsName) throws IOExce } writer.write(NL); - writer.write("package " + PKG_NAME + ";" + NL + NL); + writer.write("package " + env.getElementUtils().getPackageOf(type).toString() + ";" + NL + NL); for (String regularImport: imports) writer.write("import " + regularImport + ";" + NL); 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 95ee6186c8ea1..59cf5649b156e 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 @@ -47,7 +47,6 @@ import static org.apache.ignite.internal.MessageSerializerGenerator.identicalFileIsAlreadyGenerated; import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.CLS_JAVADOC; import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.DTO_SERDES_INTERFACE; -import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.PKG_NAME; import static org.apache.ignite.internal.idto.IDTOSerializerGenerator.simpleName; /** @@ -59,6 +58,9 @@ @SupportedAnnotationTypes("org.apache.ignite.internal.management.api.Argument") @SupportedSourceVersion(SourceVersion.RELEASE_11) 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 extends. */ private static final String DTO_CLASS = "org.apache.ignite.internal.dto.IgniteDataTransferObject"; @@ -133,7 +135,7 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { */ private void generateFactory(Map genSerDes) { try { - String factoryFQN = PKG_NAME + "." + FACTORY_CLASS; + String factoryFQN = FACTORY_PKG_NAME + "." + FACTORY_CLASS; String factoryCode = factoryCode(genSerDes); try { @@ -151,7 +153,7 @@ private void generateFactory(Map genSerDes) { // all Run commands to Maven. However, this significantly slows down test startup time. // This hack checks whether the content of a generating file is identical to already existed file, and skips // handling this class if it is. - if (!identicalFileIsAlreadyGenerated(processingEnv, factoryCode, PKG_NAME, FACTORY_CLASS)) { + if (!identicalFileIsAlreadyGenerated(processingEnv, factoryCode, FACTORY_PKG_NAME + "." + FACTORY_CLASS)) { processingEnv.getMessager().printMessage( Diagnostic.Kind.ERROR, FACTORY_CLASS + " is already generated. Try 'mvn clean install' to fix the issue."); @@ -172,7 +174,7 @@ private void generateFactory(Map genSerDes) { */ private String factoryCode(Map genSerDes) throws IOException { try (Writer writer = new StringWriter()) { - writeClassHeader(writer, genSerDes.keySet()); + writeClassHeader(writer, genSerDes); writer.write(TAB); writer.write("/** */"); @@ -212,7 +214,7 @@ private String factoryCode(Map genSerDes) throws IOExceptio * @param dtoClss DTO classes to import. * @throws IOException In case of error. */ - private void writeClassHeader(Writer writer, Set dtoClss) throws IOException { + private void writeClassHeader(Writer writer, Map dtoClss) throws IOException { try (InputStream in = getClass().getClassLoader().getResourceAsStream("license.txt"); BufferedReader reader = new BufferedReader(new InputStreamReader(in))) { @@ -225,10 +227,12 @@ private void writeClassHeader(Writer writer, Set dtoClss) throws IO } writer.write(NL); - writer.write("package " + PKG_NAME + ";" + NL + NL); + writer.write("package " + FACTORY_PKG_NAME + ";" + NL + NL); - for (TypeElement dtoCls : dtoClss) - writer.write("import " + dtoCls.getQualifiedName() + ";" + NL); + for (Map.Entry e : dtoClss.entrySet()) { + writer.write("import " + e.getKey().getQualifiedName() + ";" + NL); + writer.write("import " + e.getValue() + ";" + NL); + } writer.write("import " + Map.class.getName() + ";" + NL); writer.write("import " + HashMap.class.getName() + ";" + NL); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/ChangeTagCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/ChangeTagCommandArg.java index 922ffe8a80647..1d75cdd0fa811 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/ChangeTagCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/ChangeTagCommandArg.java @@ -32,7 +32,7 @@ public class ChangeTagCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(example = "newTagValue") - private String newTagValue; + String newTagValue; /** */ public String newTagValue() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommandArg.java index 72ca6fac80119..989fc9d97bedd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/DeactivateCommandArg.java @@ -29,10 +29,10 @@ public class DeactivateCommandArg extends IgniteDataTransferObject { /** */ @Argument(optional = true) - private boolean force; + boolean force; /** */ - private String clusterName; + String clusterName; /** */ public boolean force() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommandArg.java index 24009edf9229a..5b003d1c12787 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/SetStateCommandArg.java @@ -45,14 +45,14 @@ public class SetStateCommandArg extends IgniteDataTransferObject { "Activate cluster. Cache updates are denied" } ) - private ClusterState state; + ClusterState state; /** */ @Argument(optional = true, description = "If true, cluster deactivation will be forced") - private boolean force; + boolean force; /** */ - private String clusterName; + String clusterName; /** */ public ClusterState state() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyCommandArg.java index e976ef5b5bd1a..fdf85d21e57bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/ShutdownPolicyCommandArg.java @@ -41,7 +41,7 @@ public class ShutdownPolicyCommandArg extends IgniteDataTransferObject { "Node will stop if and only if it does not store any unique partitions, that don't have another copies in the cluster" } ) - private ShutdownPolicy shutdownPolicy; + ShutdownPolicy shutdownPolicy; /** */ public ShutdownPolicy shutdownPolicy() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommandArg.java index ac7ac0aa11327..bc15cc485bcc7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewCommandArg.java @@ -34,14 +34,14 @@ public class SystemViewCommandArg extends IgniteDataTransferObject { @Argument(description = "Name of the system view which content should be printed." + " Both \"SQL\" and \"Java\" styles of system view name are supported" + " (e.g. SQL_TABLES and sql.tables will be handled similarly)") - private String systemViewName; + String systemViewName; /** */ @Argument( description = "ID of the node to get the system view from (deprecated. Use --node-ids instead). " + "If not set, random node will be chosen" ) - private UUID nodeId; + UUID nodeId; /** ID of the nodes to get the system view content from. */ @Argument( @@ -49,11 +49,11 @@ public class SystemViewCommandArg extends IgniteDataTransferObject { "If not set, random node will be chosen", example = "nodeId1,nodeId2,.." ) - private UUID[] nodeIds; + UUID[] nodeIds; /** Flag to get the system view from all nodes. */ @Argument(description = "Get the system view from all nodes. If not set, random node will be chosen") - private boolean allNodes; + boolean allNodes; /** */ public String systemViewName() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAddCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAddCommandArg.java index 1170deaeb8165..e138d40a9cce9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAddCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAddCommandArg.java @@ -31,7 +31,7 @@ public class BaselineAddCommandArg extends BaselineTaskArg { /** */ @Positional @Argument(example = "consistentId1[,consistentId2,....,consistentIdN]") - private String[] consistentIDs; + String[] consistentIDs; /** */ public String[] consistentIDs() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustCommandArg.java index 992a8898687ce..37346f88e5aa6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineAutoAdjustCommandArg.java @@ -44,11 +44,11 @@ public class BaselineAutoAdjustCommandArg extends BaselineTaskArg { "Disable baseline auto adjust" } ) - private Enabled enabled; + Enabled enabled; /** */ @Argument(optional = true, example = "", withoutPrefix = true) - private Long timeout; + Long timeout; /** */ public enum Enabled { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineCommand.java index 0116a3a8ce99c..cedeea0bbbed5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineCommand.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineCommand.java @@ -79,7 +79,7 @@ public BaselineCommand() { public abstract static class BaselineTaskArg extends IgniteDataTransferObject { /** */ @Argument(optional = true, description = "Show the full list of node ips") - private boolean verbose; + boolean verbose; /** */ public boolean verbose() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineVersionCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineVersionCommandArg.java index 39641c53d98d2..b8a424b5c4476 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineVersionCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/baseline/BaselineVersionCommandArg.java @@ -31,7 +31,7 @@ public class BaselineVersionCommandArg extends BaselineTaskArg { /** */ @Positional @Argument(example = "topologyVersion") - private long topologyVersion; + long topologyVersion; /** */ public long topologyVersion() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheClearCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheClearCommandArg.java index 3019935a36753..1d662c2432407 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheClearCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheClearCommandArg.java @@ -27,7 +27,7 @@ public class CacheClearCommandArg extends IgniteDataTransferObject { /** */ @Argument(description = "specifies a comma-separated list of cache names to be cleared") - private String[] caches; + String[] caches; /** */ public String[] caches() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommandArg.java index e11eefb45fcc5..245d7d1130868 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheContentionCommandArg.java @@ -30,17 +30,17 @@ public class CacheContentionCommandArg extends IgniteDataTransferObject { /** Min queue size. */ @Positional @Argument(example = "minQueueSize") - private int minQueueSize; + int minQueueSize; /** Node id. */ @Positional @Argument(optional = true, example = "nodeId") - private UUID nodeId; + UUID nodeId; /** Max print. */ @Positional @Argument(optional = true, example = "maxPrint") - private int maxPrint = 10; + int maxPrint = 10; /** */ public UUID nodeId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommandArg.java index a855739344730..2570550464183 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheCreateCommandArg.java @@ -32,14 +32,14 @@ public class CacheCreateCommandArg extends IgniteDataTransferObject { /** */ @Argument(description = "Path to the Spring XML configuration that contains " + "'org.apache.ignite.configuration.CacheConfiguration' beans to create caches from", example = "springXmlConfigPath") - private String springxmlconfig; + String springxmlconfig; /** */ @Argument(description = "Optional flag to skip existing caches", optional = true) - private boolean skipExisting; + boolean skipExisting; /** */ - private String fileContent; + String fileContent; /** */ private void readFile() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommandArg.java index 49c585412c2b7..ad54ac3a2fa16 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDestroyCommandArg.java @@ -30,11 +30,11 @@ public class CacheDestroyCommandArg extends IgniteDataTransferObject { /** */ @Argument(description = "specifies a comma-separated list of cache names to be destroyed", example = "cache1,...,cacheN") - private String[] caches; + String[] caches; /** */ @Argument(description = "permanently destroy all user-created caches") - private boolean destroyAllCaches; + boolean destroyAllCaches; /** */ public boolean destroyAllCaches() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDistributionCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDistributionCommandArg.java index 42192bcfe5db0..eb4fae387ec5e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDistributionCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheDistributionCommandArg.java @@ -31,19 +31,19 @@ public class CacheDistributionCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(example = "nodeId|null") - private String nodeIdOrNull; + String nodeIdOrNull; /** */ @Positional @Argument(optional = true, example = "cacheName1,...,cacheNameN") - private String[] caches; + String[] caches; /** */ - private UUID nodeId; + UUID nodeId; /** */ @Argument(optional = true, example = "attrName1,...,attrNameN") - private String[] userAttributes; + String[] userAttributes; /** */ private void parse(String value) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommandArg.java index b2e9686d72d19..f093611ad6c56 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheFindGarbageCommandArg.java @@ -31,22 +31,22 @@ public class CacheFindGarbageCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(optional = true, example = "groupName1,...,groupNameN") - private String value; + String value; /** */ @Positional @Argument(optional = true, example = "nodeId") - private String value2; + String value2; /** */ - private String[] groups; + String[] groups; /** */ - private UUID[] nodeIds; + UUID[] nodeIds; /** */ @Argument(optional = true) - private boolean delete; + boolean delete; /** */ private void parse(String value) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java index fc5e63f20333a..27ca7cd04eb1f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIdleVerifyCommandArg.java @@ -35,20 +35,20 @@ public class CacheIdleVerifyCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(optional = true, example = "cacheName1,...,cacheNameN") - private String[] caches; + String[] caches; /** */ @Argument(optional = true) - private boolean skipZeros; + boolean skipZeros; /** */ @Argument(description = "check the CRC-sum of pages stored on disk before verifying data consistency " + "in partitions between primary and backup nodes", optional = true) - private boolean checkCrc; + boolean checkCrc; /** */ @Argument(optional = true, example = "cacheName1,...,cacheNameN") - private String[] excludeCaches; + String[] excludeCaches; /** */ @Argument(optional = true, description = "Type of cache(s)") @@ -70,7 +70,7 @@ public class CacheIdleVerifyCommandArg extends IgniteDataTransferObject { "All" } ) - private CacheFilterEnum cacheFilter = CacheFilterEnum.DEFAULT; + CacheFilterEnum cacheFilter = CacheFilterEnum.DEFAULT; /** * @param string To validate that given name is valed regex. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommandArg.java index 026e5b1828d4f..c9aece2862342 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesForceRebuildCommandArg.java @@ -32,28 +32,28 @@ public class CacheIndexesForceRebuildCommandArg extends IgniteDataTransferObject /** */ @Argument(description = "Specify node for indexes rebuild (deprecated. Use --node-ids or --all-nodes instead)", example = "nodeId") - private UUID nodeId; + UUID nodeId; /** */ @Argument( description = "Comma-separated list of nodes ids to run index rebuild on", example = "nodeId1,...nodeIdN" ) - private UUID[] nodeIds; + UUID[] nodeIds; /** Flag to launch index rebuild on all nodes. */ @Argument(description = "Rebuild index on all nodes") - private boolean allNodes; + boolean allNodes; /** */ @Argument(description = "Comma-separated list of cache names for which indexes should be rebuilt", example = "cacheName1,...cacheNameN") - private String[] cacheNames; + String[] cacheNames; /** */ @Argument(description = "Comma-separated list of cache group names for which indexes should be rebuilt", example = "groupName1,...groupNameN") - private String[] groupNames; + String[] groupNames; /** */ public UUID nodeId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommandArg.java index 867cb5a13b174..867f24de8395b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesListCommandArg.java @@ -33,28 +33,28 @@ public class CacheIndexesListCommandArg extends IgniteDataTransferObject { example = "nodeId", optional = true, description = "Specify node for job execution. If not specified explicitly, node will be chosen by grid") - private UUID nodeId; + UUID nodeId; /** */ @Argument( example = "grpRegExp", optional = true, description = "Regular expression allowing filtering by cache group name") - private String groupName; + String groupName; /** */ @Argument( example = "cacheRegExp", optional = true, description = "Regular expression allowing filtering by cache name") - private String cacheName; + String cacheName; /** */ @Argument( example = "idxNameRegExp", optional = true, description = "Regular expression allowing filtering by index name") - private String indexName; + String indexName; /** * @param regex Regex to validate diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommandArg.java index ec483178e87e9..7c4316ea284e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheIndexesRebuildStatusCommandArg.java @@ -31,7 +31,7 @@ public class CacheIndexesRebuildStatusCommandArg extends IgniteDataTransferObjec description = "Specify node for job execution. If not specified explicitly, info will be gathered from all nodes", example = "nodeId", optional = true) - private UUID nodeId; + UUID nodeId; /** */ public UUID nodeId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommandArg.java index d99cf9c975956..d29292a67ced6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheListCommandArg.java @@ -32,30 +32,30 @@ public class CacheListCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(example = "regexPattern") - private String regex; + String regex; /** */ @Argument(description = "print all configuration parameters for each cache", optional = true) - private boolean config; + boolean config; /** */ @Positional @Argument(optional = true, example = "nodeId") - private UUID nodeId; + UUID nodeId; /** */ @Argument(description = "print configuration parameters per line. " + "This option has effect only when used with --config and without [--groups|--seq]", example = "multi-line", optional = true) - private String outputFormat; + String outputFormat; /** */ @Argument(description = "print information about groups") - private boolean groups; + boolean groups; /** */ @Argument(description = "print information about sequences") - private boolean seq; + boolean seq; /** */ public String regex() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java index e311e33e4b648..786ead3b64fc1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheMetricsCommandArg.java @@ -44,16 +44,16 @@ public class CacheMetricsCommandArg extends IgniteDataTransferObject { "Status" } ) - private CacheMetricsOperation operation; + CacheMetricsOperation operation; /** */ @Argument(description = "specifies a comma-separated list of cache names to which operation should be applied", example = "cache1[,...,cacheN]") - private String[] caches; + String[] caches; /** */ @Argument(description = "applies operation to all user caches") - private boolean allCaches; + boolean allCaches; /** */ public CacheMetricsOperation operation() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheResetLostPartitionsCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheResetLostPartitionsCommandArg.java index f2082c0a968b1..8b0029016303b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheResetLostPartitionsCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheResetLostPartitionsCommandArg.java @@ -29,7 +29,7 @@ public class CacheResetLostPartitionsCommandArg extends IgniteDataTransferObject /** */ @Positional @Argument(example = "cacheName1,...,cacheNameN") - private String[] caches; + String[] caches; /** */ public String[] caches() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommandArg.java index 26e918ffe1b49..1f87a92395fac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheScheduleIndexesRebuildCommandArg.java @@ -46,34 +46,34 @@ public class CacheScheduleIndexesRebuildCommandArg extends IgniteDataTransferObj description = "(Optional) Specify node for indexes rebuild. If not specified, schedules rebuild on all nodes " + "(deprecated. Use --node-ids or --all-nodes instead)", example = "nodeId") - private UUID nodeId; + UUID nodeId; /** */ @Argument( description = "Comma-separated list of nodes ids to schedule index rebuild on", example = "nodeId1,...nodeIdN" ) - private UUID[] nodeIds; + UUID[] nodeIds; /** Flag to launch index rebuild on all nodes. */ @Argument(description = "Rebuild index on all nodes") - private boolean allNodes; + boolean allNodes; /** */ @Argument(description = "Comma-separated list of cache names with optionally specified indexes. " + "If indexes are not specified then all indexes of the cache will be scheduled for the rebuild operation. " + "Can be used simultaneously with cache group names", example = "cacheName[index1,...indexN],cacheName2,cacheName3[index1]") - private String cacheNames; + String cacheNames; /** */ @Argument(description = "Comma-separated list of cache group names for which indexes should be scheduled for the " + "rebuild. Can be used simultaneously with cache names", example = "groupName1,groupName2,...groupNameN") - private String[] groupNames; + String[] groupNames; /** Cache name -> indexes. */ - private Map> cacheToIndexes; + Map> cacheToIndexes; /** */ private void parse() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommandArg.java index b9317a509d58d..4db4893e64177 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/CacheValidateIndexesCommandArg.java @@ -31,34 +31,34 @@ public class CacheValidateIndexesCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(example = "cacheName1,...,cacheNameN", optional = true) - private String value; + String value; /** */ @Positional @Argument(example = "nodeId", optional = true) - private String value2; + String value2; /** */ - private String[] caches; + String[] caches; /** */ - private UUID[] nodeIds; + UUID[] nodeIds; /** */ @Argument(example = "N", description = "validate only the first N keys", optional = true) - private int checkFirst = -1; + int checkFirst = -1; /** */ @Argument(example = "K", description = "validate every Kth key", optional = true) - private int checkThrough = -1; + int checkThrough = -1; /** */ @Argument(description = "check the CRC-sum of pages stored on disk", optional = true) - private boolean checkCrc; + boolean checkCrc; /** */ @Argument(description = "check that index size and cache size are the same", optional = true) - private boolean checkSizes; + boolean checkSizes; /** */ private static void ensurePositive(int numVal, String arg) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanCommandArg.java index e439b742c3259..2c352b54c518a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/scan/CacheScanCommandArg.java @@ -32,15 +32,15 @@ public class CacheScanCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(example = "cacheName") - private String cacheName; + String cacheName; /** */ @Argument(description = "Pluggable output format. 'default', 'table' exists by default", example = "table", optional = true) - private String outputFormat; + String outputFormat; /** */ @Argument(description = "limit count of entries to scan (" + DFLT_LIMIT + " by default)", example = "N", optional = true) - private int limit = DFLT_LIMIT; + int limit = DFLT_LIMIT; /** */ public String outputFormat() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcDeleteLostSegmentLinksCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcDeleteLostSegmentLinksCommandArg.java index 2ff54191b2eb7..2608e5ca6b9c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcDeleteLostSegmentLinksCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcDeleteLostSegmentLinksCommandArg.java @@ -31,7 +31,7 @@ public class CdcDeleteLostSegmentLinksCommandArg extends IgniteDataTransferObjec /** */ @Argument(optional = true, description = "ID of the node to delete lost segment links from. " + "If not set, the command will affect all server nodes") - private UUID nodeId; + UUID nodeId; /** */ public UUID nodeId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcResendCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcResendCommandArg.java index 1fb71875d85d9..c1dbbdaf7c39d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcResendCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/cdc/CdcResendCommandArg.java @@ -30,7 +30,7 @@ public class CdcResendCommandArg extends IgniteDataTransferObject { description = "specifies a comma-separated list of cache names", example = "cache1,...,cacheN" ) - private String[] caches; + String[] caches; /** */ public String[] caches() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/checkpoint/CheckpointCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/checkpoint/CheckpointCommandArg.java index 7cde16988400c..620318a1b151d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/checkpoint/CheckpointCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/checkpoint/CheckpointCommandArg.java @@ -27,15 +27,15 @@ public class CheckpointCommandArg extends IgniteDataTransferObject { /** */ @Argument(description = "Reason (visible in logs)", optional = true) - private String reason; + String reason; /** */ @Argument(description = "Wait for checkpoint to finish", optional = true) - private boolean waitForFinish; + boolean waitForFinish; /** */ @Argument(description = "Timeout in milliseconds", optional = true) - private long timeout = -1; + long timeout = -1; /** */ public String reason() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommandArg.java index 5b34081c52274..f71218aa3d370 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/consistency/ConsistencyRepairCommandArg.java @@ -29,11 +29,11 @@ public class ConsistencyRepairCommandArg extends IgniteDataTransferObject { /** */ @Argument(description = "Cache to be checked/repaired") - private String cache; + String cache; /** */ @Argument(description = "Cache's partition to be checked/repaired", example = "partition") - private int[] partitions; + int[] partitions; /** Strategy. */ @Argument(description = "Repair strategy") @@ -57,7 +57,7 @@ public class ConsistencyRepairCommandArg extends IgniteDataTransferObject { /** */ @Argument(description = "Run concurrently on each node", optional = true) - private boolean parallel; + boolean parallel; /** */ public void ensureParams() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationScheduleCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationScheduleCommandArg.java index ab43e66a34c9b..21b6612d19932 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationScheduleCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/defragmentation/DefragmentationScheduleCommandArg.java @@ -27,11 +27,11 @@ public class DefragmentationScheduleCommandArg extends DefragmentationStatusComm /** */ @Argument(example = "consistentId0,consistentId1") - private String[] nodes; + String[] nodes; /** */ @Argument(example = "cache1,cache2,cache3", optional = true) - private String[] caches; + String[] caches; /** */ public String[] nodes() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java index a3d1c10253cad..de30e8f726059 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/diagnostic/DiagnosticPagelocksCommandArg.java @@ -44,22 +44,22 @@ public class DiagnosticPagelocksCommandArg extends IgniteDataTransferObject { "Print page locks dump to console" } ) - private Operation operation = DUMP_LOG; + Operation operation = DUMP_LOG; /** */ @Argument(optional = true) - private String path; + String path; /** Run command for all nodes. */ @Argument(description = "Run for all nodes") - private boolean all; + boolean all; /** */ @Argument( description = "Comma separated list of node ids or consistent ids", example = "node_id1[,node_id2....node_idN]|consistend_id1[,consistent_id2,....,consistent_idN]" ) - private String[] nodes; + String[] nodes; /** */ private void ensureOperationAndPath(Operation op, String path) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheGroupArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheGroupArg.java index 62b43ffc78bb4..90673574cb19a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheGroupArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionCacheGroupArg.java @@ -29,7 +29,7 @@ public class EncryptionCacheGroupArg extends IgniteDataTransferObject { /** */ @Positional @Argument(example = "cacheGroupName") - private String cacheGroupName; + String cacheGroupName; /** */ public String cacheGroupName() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommandArg.java index ffa0403153fdf..dbc92e7868be0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionChangeMasterKeyCommandArg.java @@ -29,7 +29,7 @@ public class EncryptionChangeMasterKeyCommandArg extends IgniteDataTransferObjec /** */ @Positional @Argument(example = "newMasterKeyName") - private String newMasterKeyName; + String newMasterKeyName; /** */ public String newMasterKeyName() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommandArg.java index 4ba0b4ce10ed3..02c76cd9cd350 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionReencryptionRateLimitCommandArg.java @@ -29,7 +29,7 @@ public class EncryptionReencryptionRateLimitCommandArg extends IgniteDataTransfe /** */ @Positional @Argument(optional = true, description = "Decimal value to change re-encryption rate limit (MB/s)") - private Double newLimit; + Double newLimit; /** */ public Double newLimit() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillClientCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillClientCommandArg.java index fb9283edd233b..abd4d9d0579a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillClientCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillClientCommandArg.java @@ -30,11 +30,11 @@ public class KillClientCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(description = "Connection identifier or ALL") - private String connectionId; + String connectionId; /** */ @Argument(description = "Node id to drop connection from", optional = true) - private UUID nodeId; + UUID nodeId; /** */ public String connectionId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillComputeCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillComputeCommandArg.java index f195da579a7d9..0e901e6e6a96a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillComputeCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillComputeCommandArg.java @@ -30,7 +30,7 @@ public class KillComputeCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(description = "Session identifier") - private IgniteUuid sessionId; + IgniteUuid sessionId; /** */ public IgniteUuid sessionId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillContinuousCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillContinuousCommandArg.java index 6f7920647b464..5d08942a0b38b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillContinuousCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillContinuousCommandArg.java @@ -30,12 +30,12 @@ public class KillContinuousCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(description = "Originating node id") - private UUID originNodeId; + UUID originNodeId; /** */ @Positional @Argument(description = "Routine identifier") - private UUID routineId; + UUID routineId; /** */ public UUID originNodeId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillScanCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillScanCommandArg.java index de8139e6af3dd..63b463436ca13 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillScanCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillScanCommandArg.java @@ -30,17 +30,17 @@ public class KillScanCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(description = "Originating node id") - private UUID originNodeId; + UUID originNodeId; /** */ @Positional @Argument(description = "Cache name") - private String cacheName; + String cacheName; /** */ @Positional @Argument(description = "Query identifier") - private long queryId; + long queryId; /** */ public UUID originNodeId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillServiceCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillServiceCommandArg.java index 0d2e572ed405c..70228b69442ee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillServiceCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillServiceCommandArg.java @@ -29,7 +29,7 @@ public class KillServiceCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(description = "Service name") - private String name; + String name; /** */ public String name() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommandArg.java index afb8898548eee..cd727bb6115bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSnapshotCommandArg.java @@ -30,10 +30,10 @@ public class KillSnapshotCommandArg extends CancelSnapshotArg { /** */ @Positional @Argument(description = "Request id") - private UUID requestId; + UUID requestId; /** */ - private String snapshotName; + String snapshotName; /** {@inheritDoc} */ @Override public UUID requestId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSqlCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSqlCommandArg.java index fd78ae80e4761..a06b265bdbf3d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSqlCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillSqlCommandArg.java @@ -34,13 +34,13 @@ public class KillSqlCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(description = "Query identifier") - private String queryId; + String queryId; /** */ - private UUID nodeId; + UUID nodeId; /** */ - private long qryId; + long qryId; /** */ public UUID nodeId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillTransactionCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillTransactionCommandArg.java index a04e58978d404..916028aa43450 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillTransactionCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/kill/KillTransactionCommandArg.java @@ -29,7 +29,7 @@ public class KillTransactionCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(description = "Transaction identifier") - private String xid; + String xid; /** */ public String xid() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommandArg.java index 81980347aec15..e280e4a2af5b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaDetailsCommandArg.java @@ -31,11 +31,11 @@ public class MetaDetailsCommandArg extends IgniteDataTransferObject { /** */ @Argument(optional = true, example = "", javaStyleName = true) - private int typeId; + int typeId; /** */ @Argument(optional = true, example = "", javaStyleName = true) - private String typeName; + String typeName; /** */ public int typeId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommandArg.java index 3702d75a562e9..6b343c9cbc5ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommandArg.java @@ -33,7 +33,7 @@ public class MetaRemoveCommandArg extends MetaDetailsCommandArg { /** */ @Argument(optional = true, example = "") - private String out; + String out; /** */ public String out() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommandArg.java index ebd30e56553d3..5e3ceabeb8a93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaUpdateCommandArg.java @@ -34,10 +34,10 @@ public class MetaUpdateCommandArg extends IgniteDataTransferObject { /** */ @Argument(example = "") - private String in; + String in; /** Marshaled metadata. */ - private byte[] metaMarshalled; + byte[] metaMarshalled; /** */ public byte[] metaMarshalled() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommandArg.java index 545dcdbaa7fc4..2725723fa7543 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricCommandArg.java @@ -30,11 +30,11 @@ public class MetricCommandArg extends IgniteDataTransferObject { /** */ @Argument(description = "Name of the metric") @Positional - private String name; + String name; /** */ @Argument(description = "Node id", optional = true) - private UUID nodeId; + UUID nodeId; /** */ public UUID nodeId() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHistogramCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHistogramCommandArg.java index 9730af3a21ce7..cfedb633f9672 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHistogramCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHistogramCommandArg.java @@ -29,7 +29,7 @@ public class MetricConfigureHistogramCommandArg extends MetricCommandArg { /** */ @Argument(description = "Comma-separated list of longs to configure histogram", example = "newBounds") @Positional - private long[] newBounds; + long[] newBounds; /** */ public long[] newBounds() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHitrateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHitrateCommandArg.java index 5893d6d200075..4e9ea0286a6b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHitrateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/metric/MetricConfigureHitrateCommandArg.java @@ -28,7 +28,7 @@ public class MetricConfigureHitrateCommandArg extends MetricCommandArg { /** */ @Argument(description = "Rate time interval of hitrate", example = "newRateTimeInterval") @Positional - private long newRateTimeInterval; + long newRateTimeInterval; /** */ public long newRateTimeInterval() { 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 09ae7ee95a07b..abd93cac7468e 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 @@ -31,7 +31,7 @@ public class MetricConfigureMaxValueCommandArg extends MetricCommandArg { /** */ @Argument(description = "Time interval of the metric", example = "newTimeInterval") @Positional - private long newTimeInterval; + long newTimeInterval; /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceBackupCachesTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceBackupCachesTaskArg.java index 185fc1d9d99e6..0d834ef41f247 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceBackupCachesTaskArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceBackupCachesTaskArg.java @@ -28,7 +28,7 @@ public class PersistenceBackupCachesTaskArg extends PersistenceCommand.Persisten /** */ @Positional @Argument(example = "cache1,cache2,cache3") - private String[] caches; + String[] caches; /** */ public String[] caches() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCleanCachesTaskArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCleanCachesTaskArg.java index 81b373b7d35a8..f0b537f0d732e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCleanCachesTaskArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/persistence/PersistenceCleanCachesTaskArg.java @@ -28,7 +28,7 @@ public class PersistenceCleanCachesTaskArg extends PersistenceCommand.Persistenc /** */ @Positional @Argument(example = "cache1,cache2,cache3") - private String[] caches; + String[] caches; /** */ public String[] caches() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommandArg.java index 00469ed7ece32..6aae6f9adae4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyGetCommandArg.java @@ -27,7 +27,7 @@ public class PropertyGetCommandArg extends IgniteDataTransferObject { /** */ @Argument(example = "") - private String name; + String name; /** */ public String name() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommandArg.java index aad5c9a2cac3b..7997c8164c191 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertyListCommandArg.java @@ -27,7 +27,7 @@ public class PropertyListCommandArg extends IgniteDataTransferObject { /** */ @Argument(optional = true, description = "Print detailed information: name, value, description") - private boolean info; + boolean info; /** */ public boolean info() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommandArg.java index 125e2d7adf6a4..6954e770995da 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/property/PropertySetCommandArg.java @@ -26,7 +26,7 @@ public class PropertySetCommandArg extends PropertyGetCommandArg { /** */ @Argument(example = "") - private String val; + String val; /** */ public String val() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeEnableCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeEnableCommandArg.java index 3cd081b7b882a..b11016a052e0b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeEnableCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/rollingupgrade/RollingUpgradeEnableCommandArg.java @@ -30,12 +30,12 @@ public class RollingUpgradeEnableCommandArg extends IgniteDataTransferObject { @Positional @Argument(description = "Target Ignite version. The target version can be one minor higher if its maintenance version is zero, " + "or one maintenance version higher (e.g. 2.18.0 -> 2.18.1 or 2.18.1 -> 2.19.0)") - private String targetVersion; + String targetVersion; /** Force flag. */ @Argument(description = "Enable rolling upgrade without target version checks." + " Use only when required, if the upgrade cannot proceed otherwise", optional = true) - private boolean force; + boolean force; /** */ public String targetVersion() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCancelCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCancelCommandArg.java index 4374e74ca5801..58ea346dff7ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCancelCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCancelCommandArg.java @@ -30,11 +30,11 @@ public class SnapshotCancelCommandArg extends CancelSnapshotArg { /** */ @Argument(description = "Snapshot operation request ID", optional = true) - private UUID id; + UUID id; /** */ @Argument(description = "Snapshot name (deprecated)", optional = true) - private String name; + String name; /** */ public UUID id() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommandArg.java index 1850715a46c08..3ef670e98e55c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCheckCommandArg.java @@ -30,19 +30,19 @@ public class SnapshotCheckCommandArg extends IgniteDataTransferObject { @Positional @Argument(description = "Snapshot name. " + "In case incremental snapshot (--incremental) full snapshot name must be provided") - private String snapshotName; + String snapshotName; /** */ @Argument(example = "path", optional = true, description = "Path to the directory where the snapshot files are located. " + "If not specified, the default configured snapshot directory will be used") - private String src; + String src; /** */ @Argument(example = "incrementIndex", optional = true, description = "Incremental snapshot index. " + "The command will check incremental snapshots sequentially from 1 to the specified index") - private int increment; + int increment; /** */ public String snapshotName() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommandArg.java index 06530fe7a4371..74f6617b17e31 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotCreateCommandArg.java @@ -30,24 +30,24 @@ public class SnapshotCreateCommandArg extends IgniteDataTransferObject { @Positional @Argument(description = "Snapshot name. " + "In the case of incremental snapshot (--incremental) full snapshot name must be provided") - private String snapshotName; + String snapshotName; /** */ @Argument(example = "path", optional = true, description = "Path to the directory where the snapshot will be saved. " + "If not specified, the default configured snapshot directory will be used") - private String dest; + String dest; /** */ @Argument(optional = true, description = "Run the operation synchronously, " + "the command will wait for the entire operation to complete. " + "Otherwise, it will be performed in the background, and the command will immediately return control") - private boolean sync; + boolean sync; /** */ @Argument(optional = true, description = "Create an incremental snapshot for previously created full snapshot. " + "Full snapshot must be accessible via --dest and snapshot_name") - private boolean incremental; + boolean incremental; /** */ public String snapshotName() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommandArg.java index c923ae65b6c96..7ae6da790f995 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/snapshot/SnapshotRestoreCommandArg.java @@ -33,45 +33,45 @@ public class SnapshotRestoreCommandArg extends IgniteDataTransferObject { @Positional @Argument(description = "Snapshot name. " + "In the case of incremental snapshot (--incremental) full snapshot name must be provided") - private String snapshotName; + String snapshotName; /** */ @Argument(optional = true, example = "incrementIndex", description = "Incremental snapshot index. " + "The command will restore snapshot and after that all its increments sequentially from 1 to the specified index") - private int increment; + int increment; /** */ @Argument(optional = true, description = "Cache group names", example = "group1,...groupN") - private String[] groups; + String[] groups; /** */ @Argument(example = "path", optional = true, description = "Path to the directory where the snapshot files are located. " + "If not specified, the default configured snapshot directory will be used") - private String src; + String src; /** */ @Argument(optional = true, description = "Run the operation synchronously, " + "the command will wait for the entire operation to complete. " + "Otherwise, it will be performed in the background, and the command will immediately return control") - private boolean sync; + boolean sync; /** */ @Argument(optional = true, description = "Check snapshot data integrity before restore (slow!). Similar to the \"check\" command") - private boolean check; + boolean check; /** */ @Argument(description = "Snapshot restore operation status (Command deprecated. Use '--snapshot status' instead)") - private boolean status; + boolean status; /** */ @Argument(description = "Cancel snapshot restore operation (Command deprecated. Use '--snapshot cancel' instead)") - private boolean cancel; + boolean cancel; /** */ @Argument(description = "Start snapshot restore operation (Default action)") - private boolean start; + boolean start; /** */ public void ensureOptions() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetAllCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetAllCommandArg.java index a1714fb9b786a..fa014c3b49328 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetAllCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetAllCommandArg.java @@ -45,7 +45,7 @@ public class TracingConfigurationGetAllCommandArg extends TracingConfigurationCo "SQL scope" } ) - private Scope scope; + Scope scope; /** */ public Scope scope() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetCommandArg.java index 2e531e905201d..559c2f6e314df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationGetCommandArg.java @@ -45,11 +45,11 @@ public class TracingConfigurationGetCommandArg extends TracingConfigurationComma "SQL scope" } ) - private Scope scope; + Scope scope; /** */ @Argument(optional = true) - private String label; + String label; /** */ public Scope scope() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationSetCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationSetCommandArg.java index bcbc1137c46ae..688959a7a5c04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationSetCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tracing/TracingConfigurationSetCommandArg.java @@ -31,11 +31,11 @@ public class TracingConfigurationSetCommandArg extends TracingConfigurationGetCo /** */ @Argument(optional = true, example = "Decimal value between 0 and 1, where 0 means never and 1 means always. " + "More or less reflects the probability of sampling specific trace.") - private double samplingRate; + double samplingRate; /** */ @Argument(optional = true, example = "Set of scopes with comma as separator DISCOVERY|EXCHANGE|COMMUNICATION|TX|SQL") - private Scope[] includedScopes; + Scope[] includedScopes; /** */ public double samplingRate() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxCommandArg.java index 636c050ccd6b7..42d48d6be18e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxCommandArg.java @@ -34,35 +34,35 @@ public class TxCommandArg extends TxCommand.AbstractTxCommandArg { /** */ @Argument(example = "XID", optional = true) - private String xid; + String xid; /** */ @Argument(example = "SECONDS", optional = true) - private Long minDuration; + Long minDuration; /** */ @Argument(example = "SIZE", optional = true) - private Integer minSize; + Integer minSize; /** */ @Argument(example = "PATTERN_REGEX", optional = true) - private String label; + String label; /** */ @Argument - private boolean servers; + boolean servers; /** */ @Argument - private boolean clients; + boolean clients; /** */ @Argument(example = "consistentId1[,consistentId2,....,consistentIdN]") - private String[] nodes; + String[] nodes; /** */ @Argument(optional = true, example = "NUMBER") - private Integer limit; + Integer limit; /** */ @Argument(optional = true, description = "Output order") @@ -78,11 +78,11 @@ public class TxCommandArg extends TxCommand.AbstractTxCommandArg { "Sort by start time" } ) - private TxSortOrder order; + TxSortOrder order; /** */ @Argument(optional = true) - private boolean kill; + boolean kill; /** */ public String xid() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommandArg.java index 07ed60875feb1..d2f6dd31d6977 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfoCommandArg.java @@ -34,13 +34,13 @@ public class TxInfoCommandArg extends TxCommand.AbstractTxCommandArg { @Argument( example = "|" + "") - private String value; + String value; /** */ - private IgniteUuid uuid; + IgniteUuid uuid; /** */ - private GridCacheVersion gridCacheVersion; + GridCacheVersion gridCacheVersion; /** */ public void uuid(IgniteUuid uuid) { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommandArg.java index 11501bf863b91..da45e8f262554 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalDeleteCommandArg.java @@ -31,7 +31,7 @@ public class WalDeleteCommandArg extends IgniteDataTransferObject { /** */ @Positional @Argument(optional = true, example = "consistentId1,consistentId2,....,consistentIdN") - private String[] consistentIds; + String[] consistentIds; /** */ public String[] consistentIds() { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalStateCommandArg.java b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalStateCommandArg.java index f7b12060a6876..1042fa0547f99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalStateCommandArg.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/wal/WalStateCommandArg.java @@ -30,7 +30,7 @@ public class WalStateCommandArg extends IgniteDataTransferObject { description = "Comma-separated list of cache groups. If not set action applied to all groups", optional = true ) - private String[] groups; + String[] groups; /** */ public String[] groups() { From c78d3ec7da66af4c96edfb202e938df59fc0a41a Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 26 Jan 2026 17:20:38 +0300 Subject: [PATCH 14/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../idto/IDTOSerializerGenerator.java | 14 +++- .../IgniteDataTransferObjectProcessor.java | 81 +++++++++++-------- .../dto/IgniteDataTransferObject.java | 6 +- 3 files changed, 65 insertions(+), 36 deletions(-) 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 a7f2ebcad633f..4077bd139754f 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 @@ -39,6 +39,8 @@ import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; +import javax.lang.model.element.NestingKind; +import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; import javax.lang.model.type.ArrayType; @@ -140,7 +142,14 @@ public IDTOSerializerGenerator(ProcessingEnvironment env, TypeElement type) { /** @return Fully qualified name for generated class. */ public String serializerFQN() { - return type.getQualifiedName() + "Serializer"; + TypeElement topLevelCls = type; + + while (topLevelCls.getNestingKind() != NestingKind.TOP_LEVEL) + topLevelCls = (TypeElement)topLevelCls.getEnclosingElement(); + + PackageElement pkg = (PackageElement)topLevelCls.getEnclosingElement(); + + return pkg.getQualifiedName().toString() + "." + serializerName(); } /** @@ -188,6 +197,9 @@ private String generateSerializerCode() throws IOException { imports.add(IOException.class.getName()); imports.add("org.apache.ignite.internal.util.typedef.internal.U"); + if (type.getNestingKind() != NestingKind.TOP_LEVEL) + imports.add(type.getQualifiedName().toString()); + String simpleClsName = String.valueOf(type.getSimpleName()); List flds = fields(type); 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 59cf5649b156e..13f1d0175697c 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 @@ -37,6 +37,7 @@ import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; +import javax.lang.model.element.NestingKind; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic; @@ -75,6 +76,9 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { /** Factory class name. */ public static final String FACTORY_CLASS = "IDTOSerializerFactory"; + /** Generated classes. */ + private final Map genSerDes = new HashMap<>(); + /** * Processes all classes extending the {@code IgniteDataTransferObject} and generates corresponding serializer code. */ @@ -82,51 +86,62 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { if (roundEnv.errorRaised()) return true; - TypeMirror dtoCls = processingEnv.getElementUtils().getTypeElement(DTO_CLASS).asType(); - TypeMirror argAnnotation = processingEnv.getElementUtils().getTypeElement(ARG_ANNOTATION).asType(); + genSerDes.clear(); - Map genSerDes = new HashMap<>(); + roundEnv.getRootElements().forEach(this::generateSingle); - for (Element el: roundEnv.getRootElements()) { - if (el.getKind() != ElementKind.CLASS) - continue; + // IDE recompile only modified classes. Don't want to touch factory in the case no matching classes was recompiled. + if (genSerDes.isEmpty()) + return true; - TypeElement clazz = (TypeElement)el; + generateFactory(genSerDes); - if (!processingEnv.getTypeUtils().isAssignable(clazz.asType(), dtoCls)) - continue; + return true; + } - if (clazz.getModifiers().contains(Modifier.ABSTRACT)) - continue; + /** + * @param el Element to generate code for. + */ + private void generateSingle(Element el) { + if (el.getKind() != ElementKind.CLASS) + return; - if (!clazz.getModifiers().contains(Modifier.PUBLIC)) - continue; + TypeMirror dtoCls = processingEnv.getElementUtils().getTypeElement(DTO_CLASS).asType(); + TypeMirror argAnnotation = processingEnv.getElementUtils().getTypeElement(ARG_ANNOTATION).asType(); - if (!hasArgumentFields(clazz, argAnnotation)) - continue; + TypeElement clazz = (TypeElement)el; - try { - IDTOSerializerGenerator gen = new IDTOSerializerGenerator(processingEnv, clazz); + // Generate code for inner classes. + clazz.getEnclosedElements().forEach(this::generateSingle); - if (gen.generate()) - genSerDes.put(clazz, gen.serializerFQN()); - } - catch (Exception e) { - processingEnv.getMessager().printMessage( - Diagnostic.Kind.ERROR, - "Failed to generate a dto serializer:" + e.getMessage(), - clazz - ); - } - } + if (!processingEnv.getTypeUtils().isAssignable(clazz.asType(), dtoCls)) + return; - // IDE recompile only modified classes. Don't want to touch factory in the case no matching classes was recompiled. - if (genSerDes.isEmpty()) - return true; + if (clazz.getModifiers().contains(Modifier.ABSTRACT)) + return; - generateFactory(genSerDes); + if (!clazz.getModifiers().contains(Modifier.PUBLIC)) + return; - return true; + if (clazz.getNestingKind() != NestingKind.TOP_LEVEL && clazz.getNestingKind() != NestingKind.MEMBER) + return; + + if (!hasArgumentFields(clazz, argAnnotation)) + return; + + try { + IDTOSerializerGenerator gen = new IDTOSerializerGenerator(processingEnv, clazz); + + if (gen.generate()) + genSerDes.put(clazz, gen.serializerFQN()); + } + catch (Exception e) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.ERROR, + "Failed to generate a dto serializer:" + e.getMessage(), + clazz + ); + } } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java index d96951d53b8c9..5defeb497046a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java @@ -71,7 +71,8 @@ public abstract class IgniteDataTransferObject implements Externalizable { * @throws IOException If I/O errors occur. */ protected void writeExternalData(ObjectOutput out) throws IOException { - throw new UnsupportedOperationException("Please, implement custom method or provide support in IDTOSerializerGenerator"); + throw new UnsupportedOperationException("Please, implement custom method or provide support in " + + "IDTOSerializerGenerator for " + getClass()); } /** {@inheritDoc} */ @@ -99,7 +100,8 @@ protected void writeExternalData(ObjectOutput out) throws IOException { * @throws ClassNotFoundException If the class for an object being restored cannot be found. */ protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - throw new UnsupportedOperationException("Please, implement custom method or provide support in IDTOSerializerGenerator"); + throw new UnsupportedOperationException("Please, implement custom method or provide support in " + + "IDTOSerializerGenerator for " + getClass()); } /** {@inheritDoc} */ From bcb334f4221b478ea651b4ed0d3735685365854f Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 26 Jan 2026 23:25:38 +0300 Subject: [PATCH 15/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../management/persistence/PersistenceCommand.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 c3f726bb18cb5..6ddc1578831fa 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,6 +17,9 @@ 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; @@ -59,6 +62,16 @@ 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. + } } /** */ From 14338c194b5b638088a4644af58b8b2ad6e94ab1 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Tue, 27 Jan 2026 16:48:05 +0300 Subject: [PATCH 16/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../idto/IDTOSerializerGenerator.java | 52 +++++++++--- .../IgniteDataTransferObjectProcessor.java | 23 +++-- ...rableBackgroundCleanupIndexTreeTaskV2.java | 14 ++-- .../CheckIndexInlineSizesResult.java | 2 +- .../distribution/CacheDistributionGroup.java | 6 +- .../distribution/CacheDistributionNode.java | 8 +- .../CacheDistributionPartition.java | 10 +-- .../CacheDistributionTaskResult.java | 4 +- .../CacheResetLostPartitionsTaskResult.java | 2 +- .../dto/IgniteDataTransferObject.java | 1 + .../ClusterChangeTagTaskResult.java | 6 +- .../management/ShutdownPolicyTaskResult.java | 2 +- .../management/SystemViewTaskResult.java | 4 +- .../management/baseline/BaselineNode.java | 12 +-- .../baseline/BaselineTaskResult.java | 14 ++-- .../cache/CacheAffinityConfiguration.java | 10 +-- .../management/cache/CacheConfiguration.java | 84 +++++++++---------- .../CacheConfigurationCollectorTaskArg.java | 4 +- .../cache/CacheEvictionConfiguration.java | 6 +- .../internal/management/cache/CacheInfo.java | 26 +++--- .../management/cache/CacheJdbcType.java | 12 +-- .../management/cache/CacheJdbcTypeField.java | 8 +- .../cache/CacheNearConfiguration.java | 8 +- .../cache/CacheRebalanceConfiguration.java | 14 ++-- .../cache/CacheStoreConfiguration.java | 24 +++--- .../cache/ContentionTaskResult.java | 4 +- ...ndDeleteGarbageInPersistenceJobResult.java | 2 +- ...dDeleteGarbageInPersistenceTaskResult.java | 4 +- .../cache/IdleVerifyDumpResult.java | 2 +- .../management/cache/IdleVerifyResult.java | 14 ++-- .../cache/IndexForceRebuildTaskRes.java | 6 +- .../cache/IndexIntegrityCheckIssue.java | 4 +- .../cache/IndexListInfoContainer.java | 10 +-- .../IndexRebuildStatusInfoContainer.java | 8 +- .../cache/IndexValidationIssue.java | 8 +- .../management/cache/QueryConfiguration.java | 10 +-- .../management/cache/QueryEntity.java | 18 ++-- .../internal/management/cache/QueryIndex.java | 6 +- .../management/cache/QueryIndexField.java | 4 +- .../cache/ScheduleIndexRebuildJobRes.java | 8 +- .../cache/ScheduleIndexRebuildTaskRes.java | 2 +- .../cache/ValidateIndexesCheckSizeIssue.java | 6 +- .../cache/ValidateIndexesCheckSizeResult.java | 4 +- .../cache/ValidateIndexesJobResult.java | 8 +- .../cache/ValidateIndexesPartitionResult.java | 2 +- .../cache/ValidateIndexesTaskResult.java | 4 +- .../management/cache/ViewCacheTaskResult.java | 2 +- .../cache/scan/CacheScanTaskResult.java | 4 +- .../consistency/ConsistencyTaskResult.java | 6 +- .../DefragmentationTaskResult.java | 4 +- .../diagnostic/ConnectivityResult.java | 2 +- .../DiagnosticConnectivityCommandArg.java | 2 +- .../diagnostic/PageLocksResult.java | 2 +- .../CacheGroupEncryptionTaskResult.java | 4 +- .../management/meta/MetadataListResult.java | 2 +- .../management/meta/MetadataMarshalled.java | 4 +- .../persistence/PersistenceTaskResult.java | 10 +-- .../property/PropertiesListResult.java | 2 +- .../property/PropertyOperationResult.java | 2 +- .../RollingUpgradeStatusNode.java | 12 +-- .../RollingUpgradeTaskResult.java | 8 +- .../tracing/TracingConfigurationItem.java | 8 +- .../TracingConfigurationTaskResult.java | 2 +- .../ignite/internal/management/tx/TxInfo.java | 28 +++---- .../internal/management/tx/TxTaskResult.java | 2 +- .../internal/management/tx/TxVerboseInfo.java | 24 +++--- .../internal/management/tx/TxVerboseKey.java | 8 +- .../internal/management/wal/ClusterNode.java | 8 +- .../management/wal/WalTaskResult.java | 6 +- .../affinity/GridAffinityAssignmentV2.java | 10 +-- .../cache/ClearCachesTaskResult.java | 4 +- .../EarliestCheckpointMapSnapshot.java | 4 +- .../SnapshotPartitionsVerifyResult.java | 4 +- .../cache/verify/PartitionHashRecord.java | 26 +++--- .../cache/verify/TransactionsHashRecord.java | 6 +- .../query/aware/IndexRebuildCacheInfo.java | 4 +- .../internal/visor/VisorTaskArgument.java | 6 +- .../internal/visor/VisorTaskResult.java | 4 +- .../VisorComputeCancelSessionsTaskArg.java | 2 +- .../misc/VisorIdAndTagViewTaskResult.java | 6 +- 80 files changed, 372 insertions(+), 346 deletions(-) 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 4077bd139754f..97e356f4c378b 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,6 +27,7 @@ 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.List; @@ -56,6 +57,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. @@ -73,6 +75,10 @@ public class IDTOSerializerGenerator { " * @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();"); + /** Type name to write/read code for the type. */ private static final Map> TYPE_SERDES = new HashMap<>(); @@ -85,22 +91,31 @@ 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(), 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(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(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(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,6 +310,8 @@ private List fieldsSerdes( List flds, Function, String> lineProvider ) { + TypeMirror dtoCls = env.getElementUtils().getTypeElement(DTO_CLASS).asType(); + List code = new ArrayList<>(); for (VariableElement fld : flds) { @@ -303,7 +320,11 @@ private List fieldsSerdes( IgniteBiTuple serDes; - 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)); @@ -319,7 +340,8 @@ private List fieldsSerdes( .replaceAll("\\$\\{c}", simpleClassName(comp == null ? type : comp))); } else - throw new IllegalStateException("Unsupported type: " + type); + code.add("// Unsupported type: " + type + ", kind = " + type.getKind()); + //throw new IllegalStateException("Unsupported type: " + type); } return code; @@ -351,6 +373,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 +400,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 13f1d0175697c..23bfb6fb19521 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 @@ -63,15 +63,7 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { private static final String FACTORY_PKG_NAME = "org.apache.ignite.internal.codegen.idto"; /** Base class that every dto must extends. */ - 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"; + static final String DTO_CLASS = "org.apache.ignite.internal.dto.IgniteDataTransferObject"; /** Factory class name. */ public static final String FACTORY_CLASS = "IDTOSerializerFactory"; @@ -79,6 +71,12 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { /** Generated classes. */ private final Map genSerDes = new HashMap<>(); + /** Currently unsupported classes. */ + private final Set unsupported = Set.of( + "org.apache.ignite.internal.management.cache.ContentionJobResult", + "org.apache.ignite.internal.processors.cache.CacheMetricsSnapshot" + ); + /** * Processes all classes extending the {@code IgniteDataTransferObject} and generates corresponding serializer code. */ @@ -107,13 +105,15 @@ 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; @@ -126,9 +126,6 @@ private void generateSingle(Element el) { if (clazz.getNestingKind() != NestingKind.TOP_LEVEL && clazz.getNestingKind() != NestingKind.MEMBER) return; - if (!hasArgumentFields(clazz, argAnnotation)) - return; - try { IDTOSerializerGenerator gen = new IDTOSerializerGenerator(processingEnv, clazz); 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..153b1f5a52faf 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 @@ -76,25 +76,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; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/check_indexes_inline_size/CheckIndexInlineSizesResult.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/check_indexes_inline_size/CheckIndexInlineSizesResult.java index 0f0f326be3a03..c535fcce5bd40 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/check_indexes_inline_size/CheckIndexInlineSizesResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/check_indexes_inline_size/CheckIndexInlineSizesResult.java @@ -36,7 +36,7 @@ public class CheckIndexInlineSizesResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Index info (index name, inline size) per node. */ - private Map> nodeToIndexes = new HashMap<>(); + Map> nodeToIndexes = new HashMap<>(); /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { 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..91929f94f5adc 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 @@ -31,13 +31,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() { 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..8b6f3f0436c84 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 @@ -33,16 +33,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() { 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..0de2f30d66cab 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 @@ -32,19 +32,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() { 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..9855695b9bdb6 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 @@ -41,10 +41,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. 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..109af2cde5866 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 @@ -34,7 +34,7 @@ public class CacheResetLostPartitionsTaskResult extends IgniteDataTransferObject /** * Map group name to result execute message. */ - private Map msgMap; + Map msgMap; /** * @param groupName - Cache group name. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java index 5defeb497046a..07a8dbe5751ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java @@ -71,6 +71,7 @@ public abstract class IgniteDataTransferObject implements Externalizable { * @throws IOException If I/O errors occur. */ protected void writeExternalData(ObjectOutput out) throws IOException { + // TODO: remove me and check write/read External for custom code. throw new UnsupportedOperationException("Please, implement custom method or provide support in " + "IDTOSerializerGenerator for " + getClass()); } 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..8f38fe3a3c0d5 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 @@ -31,13 +31,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() { 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..51a1bebaa30db 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 @@ -31,7 +31,7 @@ public class ShutdownPolicyTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Shutdown policy on result. */ - private ShutdownPolicy shutdown; + ShutdownPolicy shutdown; /** * Get policy. 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..81226505481f4 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 @@ -33,10 +33,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; + Map>> rows; /** Names of the system view attributes. */ - private List attrs; + List attrs; /** Types of the system view attributes. */ List types; 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..463310fe503fb 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 @@ -39,19 +39,19 @@ public class BaselineNode extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private String consistentId; + String consistentId; /** */ - private Map attrs; + Map attrs; /** */ - private @Nullable Long order; + @Nullable Long order; /** * Resolved list of (ip, hostname) pairs * (if ip has no resolved host, hostname will be the string representation of ip). */ - private @NotNull Collection addrs = Collections.emptyList(); + @NotNull Collection addrs = Collections.emptyList(); /** * Default constructor. @@ -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. 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..72cee404cafe6 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 @@ -47,25 +47,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; + Map baseline; /** Current server nodes. */ - private Map servers; + Map 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. 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..7f4a2876c62a2 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 @@ -40,19 +40,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 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..bfe0f151006cf 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 @@ -44,130 +44,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. 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..6d33a50565a0a 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 @@ -34,10 +34,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. 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..4935c0fb283a5 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 @@ -38,13 +38,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. 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..07d916f8f275d 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 @@ -37,46 +37,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() { 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..81de349b31f25 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 @@ -39,22 +39,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. 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..0b9e1bcce0462 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 @@ -33,16 +33,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. 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..10c8b0e7cb199 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 @@ -40,16 +40,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. 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..bd25dda17c1c3 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 @@ -34,25 +34,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. 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..61c60f14de21e 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 @@ -40,40 +40,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. 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..9585ce359092c 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 @@ -37,10 +37,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. 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..eecca1f641c27 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 @@ -36,7 +36,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)). 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..5f0fefd0491bf 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 @@ -37,11 +37,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; /** * 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..e76d5e53e52f3 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 @@ -34,7 +34,7 @@ public class IdleVerifyDumpResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cluster hashes. */ - private Map> clusterHashes; + Map> clusterHashes; /** * @param clusterHashes 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..fda2329f5c1fe 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 @@ -54,31 +54,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. 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..47580eb0fae85 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 @@ -33,11 +33,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; /** * 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..16ef8d80d6fab 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 @@ -39,20 +39,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. 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..f08e3ddfdd48f 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 @@ -33,17 +33,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; /** * 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..3b3acf871e683 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 @@ -36,19 +36,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. 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..43215796c7695 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 @@ -40,31 +40,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. 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..912fc7f28a40d 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 @@ -34,13 +34,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. 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..570073e84bd8d 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 @@ -37,10 +37,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. 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..931f3d7192f0c 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 @@ -33,16 +33,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. 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..f2df87c356491 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 @@ -33,7 +33,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. 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..c241a079d42fb 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 @@ -36,14 +36,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. 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..5cf93c7c64696 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 @@ -37,11 +37,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. 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..97fd00526bcf8 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 @@ -43,19 +43,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. 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..c5e73adf99d1d 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 @@ -39,7 +39,7 @@ public class ValidateIndexesPartitionResult extends IgniteDataTransferObject { /** Issues. */ @GridToStringExclude - private List issues = new ArrayList<>(MAX_ISSUES); + List issues = new ArrayList<>(MAX_ISSUES); /** * 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..dce30fda8ed9f 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 @@ -41,10 +41,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. 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..4017887e39383 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 @@ -34,7 +34,7 @@ public class ViewCacheTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cache infos. */ - private List cacheInfos; + protected List cacheInfos; /** * @param cacheInfos Cache infos. 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..99848e1cd5a58 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 @@ -34,10 +34,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; /** * 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..611e023b676f4 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 @@ -31,13 +31,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; + boolean cancelled; /** * {@inheritDoc} 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..c9325d0893951 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 @@ -29,10 +29,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() { 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..fbc2ff02048d3 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 @@ -34,7 +34,7 @@ public class ConnectivityResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - @Nullable private Map nodeStatuses; + @Nullable Map nodeStatuses; /** * Default constructor. 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..97551c34c9cb0 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 @@ -30,7 +30,7 @@ public class DiagnosticConnectivityCommandArg extends IgniteDataTransferObject { private static final long serialVersionUID = 0; /** */ - private UUID[] nodes; + UUID[] nodes; /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { 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..eab9ad25191f5 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 @@ -31,7 +31,7 @@ public class PageLocksResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private String payload; + String payload; /** * 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..bb42374c4a2a9 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 @@ -41,11 +41,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. 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..55eacb0e6dab9 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 @@ -36,7 +36,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. 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..2cbbb099af793 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 @@ -34,10 +34,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. 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..f134230c74dfa 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 @@ -33,19 +33,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() { 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..a4373d6eec31f 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 @@ -35,7 +35,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. 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..1f8599d93c3e1 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 @@ -33,7 +33,7 @@ public class PropertyOperationResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Property value. */ - private String val; + String val; /** * Constructor for optimized marshaller. 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..90957cffff1ab 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 @@ -35,22 +35,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() { 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..68b195a72e648 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 @@ -32,16 +32,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) { 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..f33b9800af125 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 @@ -39,18 +39,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 +58,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. 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..e65718c682605 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 @@ -42,7 +42,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. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfo.java index d2ca6d25b0bc5..bff6fdd609e60 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfo.java @@ -48,48 +48,48 @@ public class TxInfo extends IgniteDataTransferObject { private static DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); /** */ - private IgniteUuid xid; + IgniteUuid xid; /** * Transaction start time. */ - private long startTime; + long startTime; /** */ - private long duration; + long duration; /** */ - private TransactionIsolation isolation; + TransactionIsolation isolation; /** */ - private TransactionConcurrency concurrency; + TransactionConcurrency concurrency; /** */ - private long timeout; + long timeout; /** */ - private String lb; + String lb; /** */ - private Collection primaryNodes; + Collection primaryNodes; /** */ - private TransactionState state; + TransactionState state; /** */ - private int size; + int size; /** */ - private IgniteUuid nearXid; + IgniteUuid nearXid; /** */ - private Collection masterNodeIds; + Collection masterNodeIds; /** */ - private AffinityTopologyVersion topVer; + AffinityTopologyVersion topVer; /** Tx verbose info. */ - private TxVerboseInfo txVerboseInfo; + TxVerboseInfo txVerboseInfo; /** * Default constructor. 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..0b008c49d5ce9 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 @@ -33,7 +33,7 @@ public class TxTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - private List infos; + List infos; /** * Default constructor. 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..7a6e7c4bf11fe 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 @@ -35,40 +35,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; + List nearOnlyTxKeys; /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { 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..e2549332f3f4d 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 @@ -32,16 +32,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. 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..e0fcd100bcd10 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 @@ -36,18 +36,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. 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..e74b10a7a0710 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 @@ -36,15 +36,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. 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..154a8dc6348e9 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 @@ -49,19 +49,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; 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..5d05ab3e833c5 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 @@ -30,10 +30,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) { 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..548add9d26d5d 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 @@ -38,10 +38,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( 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..11a6f58df72f6 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 @@ -43,10 +43,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() { 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..8cb012199e352 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 @@ -43,62 +43,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. 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..034cbf5bb76ac 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 @@ -31,15 +31,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() { 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..d481c98d761f5 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 @@ -35,13 +35,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}. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java index 4baa71d1ff157..6ec5c88aba08d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java @@ -36,13 +36,13 @@ public class VisorTaskArgument extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Node IDs task should be mapped to. */ - private List nodes; + List nodes; /** Task argument. */ - private A arg; + A arg; /** Debug flag. */ - private boolean debug; + boolean debug; /** * Default constructor. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java index 21271269c8208..53acaea1e8070 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java @@ -31,10 +31,10 @@ public class VisorTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Task result. */ - private @Nullable R res; + @Nullable R res; /** Error. */ - private @Nullable Exception err; + @Nullable Exception err; /** */ public VisorTaskResult() { 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..7a2156696af98 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 @@ -34,7 +34,7 @@ public class VisorComputeCancelSessionsTaskArg extends IgniteDataTransferObject private static final long serialVersionUID = 0L; /** Session IDs to cancel. */ - private Set sesIds; + Set sesIds; /** * Default constructor. 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..867b44da0fbfe 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 @@ -31,13 +31,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() { From 5bc0e159e5800c30b19a5a603c25844087a4d34a Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Tue, 27 Jan 2026 17:03:54 +0300 Subject: [PATCH 17/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../internal/idto/IgniteDataTransferObjectProcessor.java | 3 ++- .../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 13f1d0175697c..7d8aea0b707c8 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 @@ -203,7 +203,8 @@ private String factoryCode(Map genSerDes) throws IOExceptio writer.write("/** */"); writer.write(NL); writer.write(TAB); - writer.write("private final Map, " + simpleName(DTO_SERDES_INTERFACE) + "> serdes = new HashMap<>();"); + writer.write("private final Map, " + simpleName(DTO_SERDES_INTERFACE) + "> serdes " + + "= new HashMap<>();"); writer.write(NL); writer.write(NL); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index cab06e8525171..853d4f2bf8022 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -178,7 +178,6 @@ import org.apache.ignite.internal.binary.builder.BinaryObjectBuilderEx; import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; -import org.apache.ignite.internal.codegen.idto.IDTOSerializerFactory; import org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException; import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException; import org.apache.ignite.internal.dto.IgniteDataTransferObject; @@ -8262,7 +8261,7 @@ public void clearAllListener() { public static IgniteDataTransferObjectSerializer loadSerializer(Class cls) { try { Class cls0 = IgniteUtils.class.getClassLoader() - .loadClass(IDTOSerializerFactory.class.getPackage().getName() + "." + cls.getSimpleName() + "Serializer"); + .loadClass(cls.getPackage().getName() + "." + cls.getSimpleName() + "Serializer"); return (IgniteDataTransferObjectSerializer)cls0.getDeclaredConstructor().newInstance(); } From 2f6587477fe1d9d0b44a19afd067df6fb6f6d47c Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Tue, 27 Jan 2026 17:59:11 +0300 Subject: [PATCH 18/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../idto/IDTOSerializerGenerator.java | 1 - ...rableBackgroundCleanupIndexTreeTaskV2.java | 25 ----- .../distribution/CacheDistributionGroup.java | 18 ---- .../distribution/CacheDistributionNode.java | 21 ---- .../CacheDistributionPartition.java | 22 ----- .../CacheDistributionTaskResult.java | 15 --- .../CacheResetLostPartitionsTaskResult.java | 14 --- .../ClusterChangeTagTaskResult.java | 19 ---- .../management/SystemViewTaskResult.java | 22 ----- .../ignite/internal/management/api/NoArg.java | 13 --- .../baseline/BaselineAutoAdjustSettings.java | 26 ----- .../management/baseline/BaselineNode.java | 13 --- .../baseline/BaselineTaskResult.java | 26 ----- .../cache/CacheAffinityConfiguration.java | 22 ----- .../management/cache/CacheConfiguration.java | 97 +------------------ .../CacheConfigurationCollectorTaskArg.java | 16 --- .../cache/CacheEvictionConfiguration.java | 18 ---- .../internal/management/cache/CacheInfo.java | 40 -------- .../management/cache/CacheJdbcType.java | 23 ----- .../management/cache/CacheJdbcTypeField.java | 20 ---- .../cache/CacheNearConfiguration.java | 20 ---- .../cache/CacheRebalanceConfiguration.java | 26 ----- .../cache/CacheStoreConfiguration.java | 36 ------- .../cache/ContentionTaskResult.java | 16 --- ...ndDeleteGarbageInPersistenceJobResult.java | 14 --- ...dDeleteGarbageInPersistenceTaskResult.java | 16 --- .../cache/IdleVerifyDumpResult.java | 14 --- .../management/cache/IdleVerifyResult.java | 26 ----- .../cache/IndexForceRebuildTaskRes.java | 18 ---- .../cache/IndexIntegrityCheckIssue.java | 16 --- .../cache/IndexListInfoContainer.java | 22 ----- .../IndexRebuildStatusInfoContainer.java | 20 ---- .../cache/IndexValidationIssue.java | 20 ---- .../management/cache/QueryConfiguration.java | 22 ----- .../management/cache/QueryEntity.java | 31 ------ .../internal/management/cache/QueryIndex.java | 18 ---- .../management/cache/QueryIndexField.java | 16 --- .../cache/ScheduleIndexRebuildJobRes.java | 20 ---- .../cache/ScheduleIndexRebuildTaskRes.java | 14 --- .../cache/ValidateIndexesCheckSizeIssue.java | 20 ---- .../cache/ValidateIndexesCheckSizeResult.java | 17 ---- .../cache/ValidateIndexesJobResult.java | 23 ----- .../cache/ValidateIndexesPartitionResult.java | 14 --- .../cache/ValidateIndexesTaskResult.java | 16 --- .../management/cache/ViewCacheTaskResult.java | 14 --- .../cache/scan/CacheScanTaskResult.java | 16 --- .../consistency/ConsistencyTaskResult.java | 22 ----- .../DefragmentationCommand.java | 13 --- .../DefragmentationTaskResult.java | 18 ---- .../diagnostic/ConnectivityResult.java | 14 --- .../DiagnosticConnectivityCommandArg.java | 14 --- .../diagnostic/PageLocksResult.java | 15 --- .../CacheGroupEncryptionTaskResult.java | 16 --- .../encryption/EncryptionKeyIdsTask.java | 14 --- .../management/meta/MetadataListResult.java | 14 --- .../management/meta/MetadataMarshalled.java | 16 --- .../MetricConfigureMaxValueCommandArg.java | 17 ---- .../PerformanceStatisticsCommand.java | 12 --- .../persistence/PersistenceCommand.java | 13 --- .../persistence/PersistenceTaskResult.java | 23 ----- .../property/PropertiesListResult.java | 14 --- .../property/PropertyOperationResult.java | 14 --- .../RollingUpgradeStatusNode.java | 24 ----- .../RollingUpgradeTaskResult.java | 20 ---- .../tracing/TracingConfigurationItem.java | 31 ------ .../TracingConfigurationTaskResult.java | 15 --- .../internal/management/tx/TxTaskResult.java | 14 --- .../internal/management/tx/TxVerboseInfo.java | 36 ------- .../internal/management/tx/TxVerboseKey.java | 21 ---- .../internal/management/wal/ClusterNode.java | 21 ---- .../management/wal/WalTaskResult.java | 18 ---- .../affinity/GridAffinityAssignmentV2.java | 26 ----- .../cache/ClearCachesTaskResult.java | 16 --- .../EarliestCheckpointMapSnapshot.java | 30 ------ .../SnapshotPartitionsVerifyResult.java | 15 --- .../cache/verify/PartitionHashRecord.java | 38 -------- .../cache/verify/TransactionsHashRecord.java | 17 ---- .../DistributedMetaStorageVersion.java | 15 --- .../query/aware/IndexRebuildCacheInfo.java | 16 --- .../internal/visor/VisorTaskArgument.java | 18 ---- .../internal/visor/VisorTaskResult.java | 15 --- .../VisorComputeCancelSessionsTaskArg.java | 14 --- .../misc/VisorIdAndTagViewTaskResult.java | 17 ---- 83 files changed, 1 insertion(+), 1661 deletions(-) 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 97e356f4c378b..51112faf3e436 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 @@ -102,7 +102,6 @@ public class IDTOSerializerGenerator { 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);")); 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 153b1f5a52faf..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; @@ -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 91929f94f5adc..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 @@ -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 8b6f3f0436c84..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 @@ -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 0de2f30d66cab..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 @@ -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 9855695b9bdb6..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; @@ -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 109af2cde5866..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 @@ -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 8f38fe3a3c0d5..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; @@ -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/SystemViewTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/management/SystemViewTaskResult.java index 81226505481f4..d1ce17e047730 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,11 @@ 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.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 { @@ -71,22 +67,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 463310fe503fb..a60726f8c4568 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 @@ -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 72cee404cafe6..2566e2c7356b9 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}. @@ -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 7f4a2876c62a2..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; @@ -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 bfe0f151006cf..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; @@ -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 6d33a50565a0a..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}. @@ -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 4935c0fb283a5..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; @@ -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 07d916f8f275d..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. @@ -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 81de349b31f25..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; @@ -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 0b9e1bcce0462..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}. @@ -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 10c8b0e7cb199..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; @@ -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 bd25dda17c1c3..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. @@ -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 61c60f14de21e..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; @@ -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 9585ce359092c..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; /** * @@ -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 eecca1f641c27..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; /** @@ -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 5f0fefd0491bf..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 @@ -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 e76d5e53e52f3..03fb3c8d58fd0 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,11 @@ */ package org.apache.ignite.internal.management.cache; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; 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}. @@ -49,16 +45,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 fda2329f5c1fe..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; @@ -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 98bb2e5da213e..80beed3ccad62 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 @@ -17,12 +17,8 @@ package org.apache.ignite.internal.management.cache; -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.U; /** * Result of {@link IndexForceRebuildTask}. @@ -58,20 +54,6 @@ public IndexForceRebuildTaskRes( this.notFoundCacheNames = notFoundCacheNames; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, cachesWithStartedRebuild); - U.writeCollection(out, cachesWithRebuildInProgress); - U.writeCollection(out, notFoundCacheNames); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - cachesWithStartedRebuild = U.readSet(in); - cachesWithRebuildInProgress = U.readSet(in); - notFoundCacheNames = U.readSet(in); - } - /** */ public Set cachesWithStartedRebuild() { return cachesWithStartedRebuild; 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 47580eb0fae85..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; /** * @@ -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 16ef8d80d6fab..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. @@ -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 89bf674ed15a9..ebd9d55520d54 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 @@ -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.Comparator; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; /** * Container for index rebuild status info. @@ -68,22 +64,6 @@ public IndexRebuildStatusInfoContainer(GridCacheContext cctx) { totalPartitionsCount = cctx.topology().localPartitionsNumber(); } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeString(out, groupName); - U.writeString(out, cacheName); - out.writeInt(indexBuildPartitionsLeftCount); - out.writeInt(totalPartitionsCount); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - groupName = U.readString(in); - cacheName = U.readString(in); - indexBuildPartitionsLeftCount = in.readInt(); - totalPartitionsCount = in.readInt(); - } - /** {@inheritDoc} */ @Override public boolean equals(Object o) { if (!(o instanceof IndexRebuildStatusInfoContainer)) 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 f08e3ddfdd48f..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; /** * @@ -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 3b3acf871e683..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; @@ -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 43215796c7695..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}. @@ -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 912fc7f28a40d..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}. @@ -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 570073e84bd8d..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}. @@ -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 931f3d7192f0c..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. @@ -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 f2df87c356491..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. @@ -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 c241a079d42fb..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. */ @@ -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 5cf93c7c64696..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. @@ -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 97fd00526bcf8..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; /** * @@ -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 c5e73adf99d1d..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. @@ -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 dce30fda8ed9f..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; /** @@ -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 4017887e39383..db3caa840c1ee 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; /** * @@ -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 99848e1cd5a58..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}. @@ -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 611e023b676f4..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; /** * @@ -39,24 +35,6 @@ public class ConsistencyTaskResult extends IgniteDataTransferObject { /** Cancelled. */ 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(); - } - /** * @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 c9325d0893951..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 { @@ -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 fbc2ff02048d3..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; /** @@ -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 97551c34c9cb0..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 { @@ -32,16 +28,6 @@ public class DiagnosticConnectivityCommandArg extends IgniteDataTransferObject { /** */ 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); - } - /** */ public void nodes(UUID[] nodes) { this.nodes = 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 eab9ad25191f5..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; /** * @@ -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 bb42374c4a2a9..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. @@ -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/EncryptionKeyIdsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java index de3b9fe214118..40b65c3de39d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java @@ -17,13 +17,9 @@ package org.apache.ignite.internal.management.encryption; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.internal.processors.task.GridInternal; -import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.internal.visor.VisorJob; import org.jetbrains.annotations.Nullable; @@ -69,15 +65,5 @@ protected static class EncryptionKeyIdsResult extends SingleFieldDto 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 2cbbb099af793..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. @@ -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 f134230c74dfa..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; /** */ @@ -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 a4373d6eec31f..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. @@ -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 1f8599d93c3e1..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. @@ -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 90957cffff1ab..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; @@ -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 68b195a72e648..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; /** */ @@ -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 f33b9800af125..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; /** @@ -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 e65718c682605..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; @@ -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 0b008c49d5ce9..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}. @@ -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 7a6e7c4bf11fe..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. @@ -70,38 +66,6 @@ public class TxVerboseInfo extends IgniteDataTransferObject { /** Near only tx keys. */ 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); - } - /** * @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 e2549332f3f4d..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. @@ -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 e0fcd100bcd10..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}. @@ -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 e74b10a7a0710..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}. @@ -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/processors/affinity/GridAffinityAssignmentV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentV2.java index 154a8dc6348e9..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; @@ -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 5d05ab3e833c5..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 { @@ -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 548add9d26d5d..aa69d5fbdb018 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; /** @@ -96,18 +92,6 @@ 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 { /** Serial version UUID. */ @@ -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 11a6f58df72f6..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; @@ -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 8cb012199e352..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; /** @@ -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 034cbf5bb76ac..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; @@ -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..51ed5f3212e9a 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; @@ -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 d481c98d761f5..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. @@ -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/VisorTaskArgument.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java index 6ec5c88aba08d..7208d5895445a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java @@ -17,16 +17,12 @@ package org.apache.ignite.internal.visor; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.UUID; 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; /** * Visor tasks argument. @@ -119,20 +115,6 @@ public boolean isDebug() { return debug; } - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - U.writeCollection(out, nodes); - out.writeObject(arg); - out.writeBoolean(debug); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - nodes = U.readList(in); - arg = (A)in.readObject(); - debug = in.readBoolean(); - } - /** {@inheritDoc} */ @Override public String toString() { return S.toString(VisorTaskArgument.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java index 53acaea1e8070..c1cbd82f473d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java @@ -17,9 +17,6 @@ package org.apache.ignite.internal.visor; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.jetbrains.annotations.Nullable; @@ -60,16 +57,4 @@ public VisorTaskResult(@Nullable R res, @Nullable Exception err) { return res; } - - /** {@inheritDoc} */ - @Override protected void writeExternalData(ObjectOutput out) throws IOException { - out.writeObject(res); - out.writeObject(err); - } - - /** {@inheritDoc} */ - @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { - res = (R)in.readObject(); - err = (Exception)in.readObject(); - } } 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 7a2156696af98..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; /** @@ -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 867b44da0fbfe..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; @@ -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; From 336babe009854d91a4212654adfd019c6fec745e Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Thu, 29 Jan 2026 16:48:01 +0300 Subject: [PATCH 19/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../management/ShutdownPolicyTaskResult.java | 14 -------------- 1 file changed, 14 deletions(-) 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 51a1bebaa30db..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; @@ -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()); - - } } From 0fa3a41287bd15d748ead6e3fd1843423ab38aef Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Fri, 30 Jan 2026 12:31:44 +0300 Subject: [PATCH 20/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../apache/ignite/internal/dto/IgniteDataTransferObject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java index 07a8dbe5751ea..35db7dec50872 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java @@ -83,7 +83,7 @@ protected void writeExternalData(ObjectOutput out) throws IOException { try (IgniteDataTransferObjectOutput dtout = new IgniteDataTransferObjectOutput(out)) { IgniteDataTransferObjectSerializer serializer = IDTOSerializerFactory.getInstance().serializer(getClass()); - if (serializer == IgniteUtils.EMPTY) { + if (serializer == IgniteUtils.EMPTY_DTO_SERIALIZER) { writeExternalData(dtout); return; @@ -116,7 +116,7 @@ protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoun try (IgniteDataTransferObjectInput dtin = new IgniteDataTransferObjectInput(in)) { IgniteDataTransferObjectSerializer serializer = IDTOSerializerFactory.getInstance().serializer(getClass()); - if (serializer == IgniteUtils.EMPTY) { + if (serializer == IgniteUtils.EMPTY_DTO_SERIALIZER) { readExternalData(dtin); return; From 46ba939e53e8ed23e6bcbde4df140bfec154b7c1 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 2 Feb 2026 13:59:13 +0300 Subject: [PATCH 21/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../internal/idto/IDTOSerializerGenerator.java | 3 +-- .../idto/IgniteDataTransferObjectProcessor.java | 6 +++++- .../encryption/ReencryptionRateTask.java | 17 ++--------------- 3 files changed, 8 insertions(+), 18 deletions(-) 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 e6e6e5ce73b79..9cad561e7bf66 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 @@ -339,8 +339,7 @@ else if (type.getKind() == TypeKind.ARRAY) { .replaceAll("\\$\\{c}", simpleClassName(comp == null ? type : comp))); } else - code.add("// Unsupported type: " + type + ", kind = " + type.getKind()); - //throw new IllegalStateException("Unsupported type: " + type); + throw new IllegalStateException("Unsupported type: " + type); } return code; 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 b26c9d9491f96..d287b700bcea3 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 @@ -73,8 +73,12 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { /** Currently unsupported classes. */ private 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.cache.CacheMetricsSnapshot" + "org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageHistoryItem", + "org.apache.ignite.internal.management.tx.TxInfo" ); /** 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(); - } } } From d3b5fb80ed654091b3b5867c05886bf436b071b6 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 2 Feb 2026 14:06:19 +0300 Subject: [PATCH 22/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../check_indexes_inline_size/CheckIndexInlineSizesResult.java | 2 +- .../apache/ignite/internal/dto/IgniteDataTransferObject.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/check_indexes_inline_size/CheckIndexInlineSizesResult.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/check_indexes_inline_size/CheckIndexInlineSizesResult.java index c535fcce5bd40..0f0f326be3a03 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/check_indexes_inline_size/CheckIndexInlineSizesResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/check_indexes_inline_size/CheckIndexInlineSizesResult.java @@ -36,7 +36,7 @@ public class CheckIndexInlineSizesResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Index info (index name, inline size) per node. */ - Map> nodeToIndexes = new HashMap<>(); + private Map> nodeToIndexes = new HashMap<>(); /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { diff --git a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java index 35db7dec50872..b8af7dfc938bc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/dto/IgniteDataTransferObject.java @@ -71,7 +71,6 @@ public abstract class IgniteDataTransferObject implements Externalizable { * @throws IOException If I/O errors occur. */ protected void writeExternalData(ObjectOutput out) throws IOException { - // TODO: remove me and check write/read External for custom code. throw new UnsupportedOperationException("Please, implement custom method or provide support in " + "IDTOSerializerGenerator for " + getClass()); } From 4273d96750100c24517e9ea8a63095ebdf348067 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 2 Feb 2026 14:18:26 +0300 Subject: [PATCH 23/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../apache/ignite/internal/idto/IDTOSerializerGenerator.java | 2 ++ .../apache/ignite/internal/management/SystemViewTask.java | 5 ++--- .../ignite/internal/management/SystemViewTaskResult.java | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) 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 9cad561e7bf66..cf33c6c68741f 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 @@ -33,6 +33,7 @@ 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; @@ -111,6 +112,7 @@ public class IDTOSerializerGenerator { 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(TreeMap.class.getName(), F.t("U.writeMap(out, obj.${f});", "obj.${f} = U.readTreeMap(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);")); 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 d1ce17e047730..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 @@ -19,6 +19,7 @@ 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; @@ -29,7 +30,7 @@ public class SystemViewTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Attribute values for each row of the system view per node ID. */ - Map>> rows; + TreeMap>> rows; /** Names of the system view attributes. */ List attrs; @@ -47,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; From daf82fbd51d26baff2495f021021e5fa0d5393e1 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 2 Feb 2026 14:21:27 +0300 Subject: [PATCH 24/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../management/baseline/BaselineTaskResult.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 2566e2c7356b9..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 @@ -49,10 +49,10 @@ public class BaselineTaskResult extends IgniteDataTransferObject { long topVer; /** Current baseline nodes. */ - Map baseline; + TreeMap baseline; /** Current server nodes. */ - Map servers; + TreeMap servers; /** Baseline autoadjustment settings. */ BaselineAutoAdjustSettings autoAdjustSettings; @@ -74,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()); @@ -93,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<>(); From 51be989f98795faee2b81be9a9b3e03c60388a56 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 2 Feb 2026 14:48:33 +0300 Subject: [PATCH 25/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../internal/idto/IDTOSerializerGenerator.java | 15 ++++++++++++--- .../management/baseline/BaselineNode.java | 8 ++++---- 2 files changed, 16 insertions(+), 7 deletions(-) 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 cf33c6c68741f..2779cd58de9d6 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 @@ -111,6 +111,8 @@ public class IDTOSerializerGenerator { 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(Map.class.getName(), F.t("U.writeMap(out, obj.${f});", "obj.${f} = U.readMap(in);")); @@ -328,10 +330,17 @@ else if (type.getKind() == TypeKind.TYPEVAR) 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 { + 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); 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 a60726f8c4568..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 @@ -39,19 +39,19 @@ public class BaselineNode extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** */ - String consistentId; + private String consistentId; /** */ - Map attrs; + private Map attrs; /** */ - @Nullable Long order; + private @Nullable Long order; /** * Resolved list of (ip, hostname) pairs * (if ip has no resolved host, hostname will be the string representation of ip). */ - @NotNull Collection addrs = Collections.emptyList(); + private @NotNull Collection addrs = Collections.emptyList(); /** * Default constructor. From 5fd25f7a236e69f2766134aaf3a7b3a405fa69d4 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 2 Feb 2026 15:14:00 +0300 Subject: [PATCH 26/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../idto/IDTOSerializerGenerator.java | 5 ++++ .../cache/IdleVerifyDumpResult.java | 5 ++-- .../ignite/internal/management/tx/TxInfo.java | 28 +++++++++---------- 3 files changed, 22 insertions(+), 16 deletions(-) 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 2779cd58de9d6..ea55b97bbb533 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 @@ -30,6 +30,7 @@ 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; @@ -114,7 +115,11 @@ public class IDTOSerializerGenerator { TYPE_SERDES.put("org.apache.ignite.cache.CacheMode", F.t("out.writeByte(CacheMode.toCode(obj.${f}));", "obj.${f} = CacheMode.fromCode(in.readByte());")); + + // TODO: support string, string map + 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);")); 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 03fb3c8d58fd0..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,6 +16,7 @@ */ package org.apache.ignite.internal.management.cache; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import org.apache.ignite.internal.dto.IgniteDataTransferObject; @@ -30,12 +31,12 @@ public class IdleVerifyDumpResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cluster hashes. */ - Map> clusterHashes; + LinkedHashMap> clusterHashes; /** * @param clusterHashes Cluster hashes. */ - public IdleVerifyDumpResult(Map> clusterHashes) { + public IdleVerifyDumpResult(LinkedHashMap> clusterHashes) { this.clusterHashes = clusterHashes; } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfo.java index bff6fdd609e60..d2ca6d25b0bc5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/tx/TxInfo.java @@ -48,48 +48,48 @@ public class TxInfo extends IgniteDataTransferObject { private static DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); /** */ - IgniteUuid xid; + private IgniteUuid xid; /** * Transaction start time. */ - long startTime; + private long startTime; /** */ - long duration; + private long duration; /** */ - TransactionIsolation isolation; + private TransactionIsolation isolation; /** */ - TransactionConcurrency concurrency; + private TransactionConcurrency concurrency; /** */ - long timeout; + private long timeout; /** */ - String lb; + private String lb; /** */ - Collection primaryNodes; + private Collection primaryNodes; /** */ - TransactionState state; + private TransactionState state; /** */ - int size; + private int size; /** */ - IgniteUuid nearXid; + private IgniteUuid nearXid; /** */ - Collection masterNodeIds; + private Collection masterNodeIds; /** */ - AffinityTopologyVersion topVer; + private AffinityTopologyVersion topVer; /** Tx verbose info. */ - TxVerboseInfo txVerboseInfo; + private TxVerboseInfo txVerboseInfo; /** * Default constructor. From 132bcc29e95e86f6dd0b444b80e73899279dd7e8 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 2 Feb 2026 15:57:39 +0300 Subject: [PATCH 27/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../idto/IDTOSerializerGenerator.java | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) 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 ea55b97bbb533..35252fa6079c9 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 @@ -47,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; @@ -81,6 +82,10 @@ public class IDTOSerializerGenerator { 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<>(); @@ -115,9 +120,6 @@ public class IDTOSerializerGenerator { TYPE_SERDES.put("org.apache.ignite.cache.CacheMode", F.t("out.writeByte(CacheMode.toCode(obj.${f}));", "obj.${f} = CacheMode.fromCode(in.readByte());")); - - // TODO: support string, string map - 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);")); @@ -326,7 +328,7 @@ private List fieldsSerdes( TypeMirror type = fld.asType(); TypeMirror comp = null; - IgniteBiTuple serDes; + IgniteBiTuple serDes = null; if (env.getTypeUtils().isAssignable(type, dtoCls)) serDes = OBJECT_SERDES; @@ -341,10 +343,26 @@ else if (type.getKind() == TypeKind.ARRAY) { serDes = OBJ_ARRAY_SERDES; } else { - serDes = TYPE_SERDES.get(className(type)); + 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; + if (serDes == null && enumType(env, type)) + serDes = ENUM_SERDES; + } } if (serDes != null) { From fc043fd092ce705f56fe527e1ee310052947542f Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Mon, 2 Feb 2026 17:26:04 +0300 Subject: [PATCH 28/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../internal/idto/IDTOSerializerGenerator.java | 2 +- .../idto/IgniteDataTransferObjectProcessor.java | 7 +++++-- .../encryption/EncryptionKeyIdsTask.java | 14 ++++++++++++++ .../checkpoint/EarliestCheckpointMapSnapshot.java | 8 ++++---- .../persistence/DistributedMetaStorageVersion.java | 6 +++--- 5 files changed, 27 insertions(+), 10 deletions(-) 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 35252fa6079c9..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 @@ -71,7 +71,7 @@ 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 + 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 d287b700bcea3..383b3aa7f09a9 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 @@ -78,7 +78,10 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { "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.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" ); /** @@ -124,7 +127,7 @@ private void generateSingle(Element el) { 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) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java index 40b65c3de39d6..de3b9fe214118 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/management/encryption/EncryptionKeyIdsTask.java @@ -17,9 +17,13 @@ package org.apache.ignite.internal.management.encryption; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import java.util.List; import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.internal.visor.VisorJob; import org.jetbrains.annotations.Nullable; @@ -65,5 +69,15 @@ protected static class EncryptionKeyIdsResult extends SingleFieldDto Date: Tue, 3 Feb 2026 10:49:52 +0300 Subject: [PATCH 29/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../ignite/internal/management/cache/ViewCacheTaskResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 db3caa840c1ee..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 @@ -30,7 +30,7 @@ public class ViewCacheTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Cache infos. */ - protected List cacheInfos; + List cacheInfos; /** * @param cacheInfos Cache infos. From 7a4c42591605f17f136a75cf6a27fd9e949092cc Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Tue, 3 Feb 2026 11:35:34 +0300 Subject: [PATCH 30/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../IgniteDataTransferObjectProcessor.java | 6 ++++- .../cache/IndexForceRebuildTaskRes.java | 18 ++++++++++++++ .../IndexRebuildStatusInfoContainer.java | 20 ++++++++++++++++ .../internal/visor/VisorTaskArgument.java | 24 ++++++++++++++++--- .../internal/visor/VisorTaskResult.java | 19 +++++++++++++-- 5 files changed, 81 insertions(+), 6 deletions(-) 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 383b3aa7f09a9..f29c47f28308f 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 @@ -81,7 +81,11 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { "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.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" ); /** 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 80beed3ccad62..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 @@ -17,8 +17,12 @@ package org.apache.ignite.internal.management.cache; +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.U; /** * Result of {@link IndexForceRebuildTask}. @@ -54,6 +58,20 @@ public IndexForceRebuildTaskRes( this.notFoundCacheNames = notFoundCacheNames; } + /** {@inheritDoc} */ + @Override protected void writeExternalData(ObjectOutput out) throws IOException { + U.writeCollection(out, cachesWithStartedRebuild); + U.writeCollection(out, cachesWithRebuildInProgress); + U.writeCollection(out, notFoundCacheNames); + } + + /** {@inheritDoc} */ + @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { + cachesWithStartedRebuild = U.readSet(in); + cachesWithRebuildInProgress = U.readSet(in); + notFoundCacheNames = U.readSet(in); + } + /** */ public Set cachesWithStartedRebuild() { return cachesWithStartedRebuild; 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 ebd9d55520d54..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 @@ -17,11 +17,15 @@ package org.apache.ignite.internal.management.cache; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import java.util.Comparator; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Container for index rebuild status info. @@ -64,6 +68,22 @@ public IndexRebuildStatusInfoContainer(GridCacheContext cctx) { totalPartitionsCount = cctx.topology().localPartitionsNumber(); } + /** {@inheritDoc} */ + @Override protected void writeExternalData(ObjectOutput out) throws IOException { + U.writeString(out, groupName); + U.writeString(out, cacheName); + out.writeInt(indexBuildPartitionsLeftCount); + out.writeInt(totalPartitionsCount); + } + + /** {@inheritDoc} */ + @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { + groupName = U.readString(in); + cacheName = U.readString(in); + indexBuildPartitionsLeftCount = in.readInt(); + totalPartitionsCount = in.readInt(); + } + /** {@inheritDoc} */ @Override public boolean equals(Object o) { if (!(o instanceof IndexRebuildStatusInfoContainer)) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java index 7208d5895445a..4baa71d1ff157 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskArgument.java @@ -17,12 +17,16 @@ package org.apache.ignite.internal.visor; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.UUID; 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; /** * Visor tasks argument. @@ -32,13 +36,13 @@ public class VisorTaskArgument extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Node IDs task should be mapped to. */ - List nodes; + private List nodes; /** Task argument. */ - A arg; + private A arg; /** Debug flag. */ - boolean debug; + private boolean debug; /** * Default constructor. @@ -115,6 +119,20 @@ public boolean isDebug() { return debug; } + /** {@inheritDoc} */ + @Override protected void writeExternalData(ObjectOutput out) throws IOException { + U.writeCollection(out, nodes); + out.writeObject(arg); + out.writeBoolean(debug); + } + + /** {@inheritDoc} */ + @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { + nodes = U.readList(in); + arg = (A)in.readObject(); + debug = in.readBoolean(); + } + /** {@inheritDoc} */ @Override public String toString() { return S.toString(VisorTaskArgument.class, this); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java index c1cbd82f473d7..21271269c8208 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/VisorTaskResult.java @@ -17,6 +17,9 @@ package org.apache.ignite.internal.visor; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import org.apache.ignite.internal.dto.IgniteDataTransferObject; import org.jetbrains.annotations.Nullable; @@ -28,10 +31,10 @@ public class VisorTaskResult extends IgniteDataTransferObject { private static final long serialVersionUID = 0L; /** Task result. */ - @Nullable R res; + private @Nullable R res; /** Error. */ - @Nullable Exception err; + private @Nullable Exception err; /** */ public VisorTaskResult() { @@ -57,4 +60,16 @@ public VisorTaskResult(@Nullable R res, @Nullable Exception err) { return res; } + + /** {@inheritDoc} */ + @Override protected void writeExternalData(ObjectOutput out) throws IOException { + out.writeObject(res); + out.writeObject(err); + } + + /** {@inheritDoc} */ + @Override protected void readExternalData(ObjectInput in) throws IOException, ClassNotFoundException { + res = (R)in.readObject(); + err = (Exception)in.readObject(); + } } From 52f1619884d07cc8ee5716ff2a456cda7a990774 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Tue, 3 Feb 2026 16:06:27 +0300 Subject: [PATCH 31/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../IgniteDataTransferObjectProcessor.java | 28 ++----------------- .../util/tostring/GridToStringBuilder.java | 2 +- 2 files changed, 3 insertions(+), 27 deletions(-) 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 f29c47f28308f..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; @@ -72,7 +71,7 @@ public class IgniteDataTransferObjectProcessor extends AbstractProcessor { private final Map genSerDes = new HashMap<>(); /** Currently unsupported classes. */ - private final Set unsupported = Set.of( + 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", @@ -122,7 +121,7 @@ private void generateSingle(Element el) { // Generate code for inner classes. clazz.getEnclosedElements().forEach(this::generateSingle); - if (unsupported.contains(clazz.getQualifiedName().toString())) + if (UNSUPPORTED.contains(clazz.getQualifiedName().toString())) return; if (!processingEnv.getTypeUtils().isAssignable(clazz.asType(), dtoCls)) @@ -372,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 && From aa5fe15222665df8eed182c6d7445defae35aed1 Mon Sep 17 00:00:00 2001 From: Nikolay Izhikov Date: Tue, 3 Feb 2026 21:33:24 +0300 Subject: [PATCH 32/32] IGNITE-27641 Generate serdes code for IgniteDataTransferObject --- .../ignite/internal/pagemem/wal/record/DataEntry.java | 2 ++ .../ignite/development/utils/IgniteWalConverter.java | 2 +- .../utils/IgniteWalConverterSensitiveDataTest.java | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) 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/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);