From b59800fedf2b80eb5302b57219f04079f24b0b77 Mon Sep 17 00:00:00 2001 From: Anton Potemkin Date: Sun, 31 Mar 2024 09:59:41 +0700 Subject: [PATCH 1/3] IGNITE-15735 improve igniteConfiguration string representation --- .../ignite/configuration/EncryptionConfiguration.java | 6 ++++++ .../apache/ignite/configuration/IgniteConfiguration.java | 4 +++- .../configuration/SystemDataRegionConfiguration.java | 6 ++++++ .../cache/persistence/file/AsyncFileIOFactory.java | 9 +++++++++ .../cache/persistence/file/EncryptedFileIOFactory.java | 6 ++++++ .../persistence/file/RandomAccessFileIOFactory.java | 7 +++++++ .../cache/persistence/file/UnzipFileIOFactory.java | 7 +++++++ .../persistence/snapshot/dump/BufferedFileIOFactory.java | 6 ++++++ .../snapshot/dump/WriteOnlyZipFileIOFactory.java | 7 +++++++ .../spi/communication/tcp/internal/ConnectGateway.java | 6 ++++++ .../spi/encryption/keystore/KeystoreEncryptionSpi.java | 8 ++++++++ .../ignite/spi/encryption/noop/NoopEncryptionSpi.java | 6 ++++++ .../ignite/spi/eventstorage/NoopEventStorageSpi.java | 6 ++++++ .../apache/ignite/spi/indexing/noop/NoopIndexingSpi.java | 6 ++++++ .../org/apache/ignite/spi/tracing/NoopTracingSpi.java | 6 ++++++ .../file/AlignedBuffersDirectFileIOFactory.java | 6 ++++++ .../spi/tracing/opencensus/OpenCensusTracingSpi.java | 9 +++++++++ 17 files changed, 110 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/EncryptionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/EncryptionConfiguration.java index 6b9345d4c7550..789bec3f34df0 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/EncryptionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/EncryptionConfiguration.java @@ -19,6 +19,7 @@ import java.io.Serializable; import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; /** * Encryption configuration. @@ -105,4 +106,9 @@ public EncryptionConfiguration setReencryptionBatchSize(int reencryptionBatchSiz return this; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(EncryptionConfiguration.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index abaa32f90f579..06580917389e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -49,6 +49,7 @@ import org.apache.ignite.failure.FailureHandler; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; import org.apache.ignite.internal.processors.odbc.ClientListenerProcessor; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.internal.A; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; @@ -327,6 +328,7 @@ public class IgniteConfiguration { private String igniteWorkDir; /** MBean server. */ + @GridToStringExclude private MBeanServer mbeanSrv; /** Local node ID. */ @@ -3601,6 +3603,6 @@ public IgniteConfiguration setAsyncContinuationExecutor(Executor asyncContinuati /** {@inheritDoc} */ @Override public String toString() { - return S.toString(IgniteConfiguration.class, this); + return S.toString(IgniteConfiguration.class, this, "mbeanSrvCls", mbeanSrv.getClass().getName()); } } diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/SystemDataRegionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/SystemDataRegionConfiguration.java index bfa20048a7d6e..76b2b1e3a0a59 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/SystemDataRegionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/SystemDataRegionConfiguration.java @@ -18,6 +18,7 @@ import java.io.Serializable; import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; /** * This class allows defining system data region configuration with various parameters for Apache Ignite @@ -90,4 +91,9 @@ public SystemDataRegionConfiguration setMaxSize(long maxSize) { return this; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(SystemDataRegionConfiguration.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIOFactory.java index 4e132b7e110b7..fcd16ef444a48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIOFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIOFactory.java @@ -17,6 +17,9 @@ package org.apache.ignite.internal.processors.cache.persistence.file; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.S; + import java.io.File; import java.io.IOException; import java.nio.channels.AsynchronousFileChannel; @@ -30,6 +33,7 @@ public class AsyncFileIOFactory implements FileIOFactory { private static final long serialVersionUID = 0L; /** Thread local channel future holder. */ + @GridToStringExclude private transient volatile ThreadLocal holder = initHolder(); /** {@inheritDoc} */ @@ -54,4 +58,9 @@ private ThreadLocal initHolder() { } }; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(AsyncFileIOFactory.class, this, "holder", holder.get()); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptedFileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptedFileIOFactory.java index c02bb652146be..f46dff5307aa3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptedFileIOFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/EncryptedFileIOFactory.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.OpenOption; import org.apache.ignite.internal.managers.encryption.EncryptionCacheKeyProvider; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.encryption.EncryptionSpi; /** @@ -91,4 +92,9 @@ public class EncryptedFileIOFactory implements FileIOFactory { void headerSize(int headerSize) { this.headerSize = headerSize; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(EncryptedFileIOFactory.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/RandomAccessFileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/RandomAccessFileIOFactory.java index 3fa3e2dded52d..4c0624fc03ef4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/RandomAccessFileIOFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/RandomAccessFileIOFactory.java @@ -17,6 +17,8 @@ package org.apache.ignite.internal.processors.cache.persistence.file; +import org.apache.ignite.internal.util.typedef.internal.S; + import java.io.File; import java.io.IOException; import java.nio.file.OpenOption; @@ -32,4 +34,9 @@ public class RandomAccessFileIOFactory implements FileIOFactory { @Override public FileIO create(File file, OpenOption... modes) throws IOException { return new RandomAccessFileIO(file, modes); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(RandomAccessFileIOFactory.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java index 674ba29194914..08f6d7039de2f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java @@ -17,6 +17,8 @@ package org.apache.ignite.internal.processors.cache.persistence.file; +import org.apache.ignite.internal.util.typedef.internal.S; + import java.io.File; import java.io.IOException; import java.nio.file.OpenOption; @@ -32,4 +34,9 @@ public class UnzipFileIOFactory implements FileIOFactory { @Override public UnzipFileIO create(File file, OpenOption... modes) throws IOException { return new UnzipFileIO(file); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(UnzipFileIOFactory.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/BufferedFileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/BufferedFileIOFactory.java index f141b7168fbc4..2ed40da09bfb8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/BufferedFileIOFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/BufferedFileIOFactory.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.nio.file.OpenOption; import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory; +import org.apache.ignite.internal.util.typedef.internal.S; /** * File I/O factory which provides {@link BufferedFileIO} implementation of FileIO. @@ -41,4 +42,9 @@ public BufferedFileIOFactory(FileIOFactory factory) { @Override public BufferedFileIO create(File file, OpenOption... modes) throws IOException { return new BufferedFileIO(factory.create(file, modes)); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(BufferedFileIOFactory.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/WriteOnlyZipFileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/WriteOnlyZipFileIOFactory.java index 4842ab8cbf19b..2f69137169f7d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/WriteOnlyZipFileIOFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/WriteOnlyZipFileIOFactory.java @@ -22,6 +22,7 @@ import java.nio.file.OpenOption; import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory; import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.internal.util.typedef.internal.S; import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.ZIP_SUFFIX; @@ -45,4 +46,10 @@ public WriteOnlyZipFileIOFactory(FileIOFactory factory) { return new WriteOnlyZipFileIO(factory.create(file, modes), entryName); } + + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(WriteOnlyZipFileIOFactory.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectGateway.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectGateway.java index f96eeaf9f8403..6fd939c171703 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectGateway.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/internal/ConnectGateway.java @@ -21,6 +21,7 @@ import org.apache.ignite.IgniteClientDisconnectedException; import org.apache.ignite.IgniteException; import org.apache.ignite.internal.util.GridSpinReadWriteLock; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteFuture; /** @@ -106,4 +107,9 @@ public void stopped() { lock.readUnlock(); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(ConnectGateway.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java index effe8bf3439d1..8045f0dd82f11 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java @@ -44,7 +44,9 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; 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.apache.ignite.resources.LoggerResource; import org.apache.ignite.spi.IgniteSpiAdapter; @@ -113,6 +115,7 @@ public class KeystoreEncryptionSpi extends IgniteSpiAdapter implements Encryptio private int keySize = DEFAULT_KEY_SIZE; /** Master key. */ + @GridToStringExclude private volatile KeystoreEncryptionKey masterKey; /** Master key name. */ @@ -526,4 +529,9 @@ private KeystoreEncryptionKey loadMasterKey(String masterKeyName) { throw new IgniteSpiException(e); } } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(KeystoreEncryptionSpi.class, this, "keyStorePwd", keyStorePwd != null ? "*" : null, "masterKey", masterKey != null ? "*" : null ); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/encryption/noop/NoopEncryptionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/encryption/noop/NoopEncryptionSpi.java index 31e52498b32c8..8e823aa8916c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/encryption/noop/NoopEncryptionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/encryption/noop/NoopEncryptionSpi.java @@ -20,6 +20,7 @@ import java.io.Serializable; import java.nio.ByteBuffer; import org.apache.ignite.IgniteException; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiNoop; @@ -124,4 +125,9 @@ public class NoopEncryptionSpi extends IgniteSpiAdapter implements EncryptionSpi @Override public void spiStop() throws IgniteSpiException { // No-op. } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(NoopEncryptionSpi.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/NoopEventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/NoopEventStorageSpi.java index 41cf7f6a9aee9..a799056fa5e52 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/NoopEventStorageSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/NoopEventStorageSpi.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.Collections; import org.apache.ignite.events.Event; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.IgniteSpiException; @@ -50,4 +51,9 @@ public class NoopEventStorageSpi extends IgniteSpiAdapter implements EventStorag @Override public void spiStop() throws IgniteSpiException { // No-op. } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(NoopEventStorageSpi.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java index 05fd5ec04fba4..7153566ce3fa1 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/indexing/noop/NoopIndexingSpi.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.Iterator; import javax.cache.Cache; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiNoop; @@ -65,4 +66,9 @@ public class NoopIndexingSpi extends IgniteSpiAdapter implements IndexingSpi { return this; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(NoopIndexingSpi.class, this); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopTracingSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopTracingSpi.java index c12714bc5e60d..e95883c9ebce1 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopTracingSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/tracing/NoopTracingSpi.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.tracing; import org.apache.ignite.internal.tracing.TracingSpiType; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.IgniteSpiConsistencyChecked; import org.apache.ignite.spi.IgniteSpiException; @@ -67,4 +68,9 @@ public class NoopTracingSpi extends IgniteSpiAdapter implements TracingSpi managedAlignedBuffers() { return managedAlignedBuffers; } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(AlignedBuffersDirectFileIOFactory.class, this); + } } diff --git a/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusTracingSpi.java b/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusTracingSpi.java index 1e3a8611483fb..f047e5e83be74 100644 --- a/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusTracingSpi.java +++ b/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusTracingSpi.java @@ -24,10 +24,13 @@ import io.opencensus.trace.export.SpanExporter; import io.opencensus.trace.samplers.Samplers; import org.apache.ignite.internal.tracing.TracingSpiType; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; +import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.IgniteSpiConsistencyChecked; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport; +import org.apache.ignite.spi.encryption.noop.NoopEncryptionSpi; import org.apache.ignite.spi.tracing.TracingSpi; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -54,6 +57,7 @@ @IgniteSpiConsistencyChecked(optional = true) public class OpenCensusTracingSpi extends IgniteSpiAdapter implements TracingSpi { /** Configured exporters. */ + @GridToStringInclude private final List exporters; /** Flag indicates that external Tracing is used in environment. In this case no exporters will be started. */ @@ -151,4 +155,9 @@ public OpenCensusTracingSpi(SpanExporter.Handler... exporters) { @Override public byte type() { return TracingSpiType.OPEN_CENSUS_TRACING_SPI.index(); } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(OpenCensusTracingSpi.class, this); + } } From 8f3b51573b1d8aeeb57eb6a992e70deb7650bd5d Mon Sep 17 00:00:00 2001 From: Anton Potemkin Date: Sun, 31 Mar 2024 20:17:39 +0700 Subject: [PATCH 2/3] IGNITE-15735 fix checkstyle --- .../cache/persistence/file/AsyncFileIOFactory.java | 5 ++--- .../cache/persistence/file/RandomAccessFileIOFactory.java | 3 +-- .../cache/persistence/file/UnzipFileIOFactory.java | 3 +-- .../spi/encryption/keystore/KeystoreEncryptionSpi.java | 4 +++- .../ignite/spi/tracing/opencensus/OpenCensusTracingSpi.java | 1 - 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIOFactory.java index fcd16ef444a48..9b4b55389a8be 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIOFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/AsyncFileIOFactory.java @@ -17,13 +17,12 @@ package org.apache.ignite.internal.processors.cache.persistence.file; -import org.apache.ignite.internal.util.tostring.GridToStringExclude; -import org.apache.ignite.internal.util.typedef.internal.S; - import java.io.File; import java.io.IOException; import java.nio.channels.AsynchronousFileChannel; import java.nio.file.OpenOption; +import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.internal.S; /** * File I/O factory which uses {@link AsynchronousFileChannel} based implementation of FileIO. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/RandomAccessFileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/RandomAccessFileIOFactory.java index 4c0624fc03ef4..320e2d0915725 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/RandomAccessFileIOFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/RandomAccessFileIOFactory.java @@ -17,11 +17,10 @@ package org.apache.ignite.internal.processors.cache.persistence.file; -import org.apache.ignite.internal.util.typedef.internal.S; - import java.io.File; import java.io.IOException; import java.nio.file.OpenOption; +import org.apache.ignite.internal.util.typedef.internal.S; /** * File I/O factory which provides RandomAccessFileIO implementation of FileIO. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java index 08f6d7039de2f..522c9c117ee9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java @@ -17,11 +17,10 @@ package org.apache.ignite.internal.processors.cache.persistence.file; -import org.apache.ignite.internal.util.typedef.internal.S; - import java.io.File; import java.io.IOException; import java.nio.file.OpenOption; +import org.apache.ignite.internal.util.typedef.internal.S; /** * File I/O factory which provides {@link UnzipFileIO} implementation of FileIO. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java index 8045f0dd82f11..0b49a6626d040 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java @@ -532,6 +532,8 @@ private KeystoreEncryptionKey loadMasterKey(String masterKeyName) { /** {@inheritDoc} */ @Override public String toString() { - return S.toString(KeystoreEncryptionSpi.class, this, "keyStorePwd", keyStorePwd != null ? "*" : null, "masterKey", masterKey != null ? "*" : null ); + return S.toString(KeystoreEncryptionSpi.class, this, + "keyStorePwd", keyStorePwd != null ? "*" : null, + "masterKey", masterKey != null ? "*" : null); } } diff --git a/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusTracingSpi.java b/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusTracingSpi.java index f047e5e83be74..4a3585c966980 100644 --- a/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusTracingSpi.java +++ b/modules/opencensus/src/main/java/org/apache/ignite/spi/tracing/opencensus/OpenCensusTracingSpi.java @@ -30,7 +30,6 @@ import org.apache.ignite.spi.IgniteSpiConsistencyChecked; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport; -import org.apache.ignite.spi.encryption.noop.NoopEncryptionSpi; import org.apache.ignite.spi.tracing.TracingSpi; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; From fc140027fede211eacf77d9bfa3995c92d7228a8 Mon Sep 17 00:00:00 2001 From: Anton Potemkin Date: Mon, 1 Apr 2024 20:40:04 +0700 Subject: [PATCH 3/3] IGNITE-15735 fix npe --- .../org/apache/ignite/configuration/IgniteConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 06580917389e2..09acd2cfe45cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -3603,6 +3603,7 @@ public IgniteConfiguration setAsyncContinuationExecutor(Executor asyncContinuati /** {@inheritDoc} */ @Override public String toString() { - return S.toString(IgniteConfiguration.class, this, "mbeanSrvCls", mbeanSrv.getClass().getName()); + return S.toString(IgniteConfiguration.class, this, + "mbeanSrvCls", mbeanSrv != null ? mbeanSrv.getClass().getName() : null); } }