This is an automated email from the ASF dual-hosted git repository. sk0x50 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push: new 220b6a442e IGNITE-19183 Fixed LogicalNode.toString method (#2086) 220b6a442e is described below commit 220b6a442e4703fb78a8940faf62b8676180ae50 Author: Slava Koptilin <slava.kopti...@gmail.com> AuthorDate: Thu May 18 17:07:07 2023 +0300 IGNITE-19183 Fixed LogicalNode.toString method (#2086) --- .../cluster/management/topology/api/LogicalNode.java | 13 ++++++++----- .../org/apache/ignite/internal/hlc/HybridTimestamp.java | 2 +- .../ignite/internal/placementdriver/leases/Lease.java | 9 ++------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/topology/api/LogicalNode.java b/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/topology/api/LogicalNode.java index b7ee05adf6..ce808d4a50 100644 --- a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/topology/api/LogicalNode.java +++ b/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/topology/api/LogicalNode.java @@ -19,6 +19,8 @@ package org.apache.ignite.internal.cluster.management.topology.api; import java.util.Collections; import java.util.Map; +import org.apache.ignite.internal.tostring.IgniteToStringInclude; +import org.apache.ignite.internal.tostring.S; import org.apache.ignite.network.ClusterNode; import org.apache.ignite.network.NetworkAddress; @@ -27,6 +29,7 @@ import org.apache.ignite.network.NetworkAddress; */ public class LogicalNode extends ClusterNode { /** Node's attributes. */ + @IgniteToStringInclude private final Map<String, String> nodeAttributes; /** @@ -78,9 +81,9 @@ public class LogicalNode extends ClusterNode { return nodeAttributes; } - // TODO: S.toString for inherited classes do not work properly https://issues.apache.org/jira/browse/IGNITE-19183 - // @Override - // public String toString() { - // return S.toString(LogicalNode.class, this); - // } + /** {@inheritDoc} */ + @Override + public String toString() { + return S.toString(LogicalNode.class, this, super.toString()); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/hlc/HybridTimestamp.java b/modules/core/src/main/java/org/apache/ignite/internal/hlc/HybridTimestamp.java index 72900366d6..5cdcebdcd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/hlc/HybridTimestamp.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/hlc/HybridTimestamp.java @@ -225,7 +225,7 @@ public final class HybridTimestamp implements Comparable<HybridTimestamp>, Seria @Override public String toString() { - return S.toString(HybridTimestamp.class, this); + return S.toString(HybridTimestamp.class, this, "physical", getPhysical(), "logical", getLogical()); } /** diff --git a/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/leases/Lease.java b/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/leases/Lease.java index 4f7404d0e4..dc72c0e522 100644 --- a/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/leases/Lease.java +++ b/modules/placement-driver/src/main/java/org/apache/ignite/internal/placementdriver/leases/Lease.java @@ -24,6 +24,7 @@ import static org.apache.ignite.internal.hlc.HybridTimestamp.hybridTimestamp; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import org.apache.ignite.internal.hlc.HybridTimestamp; +import org.apache.ignite.internal.tostring.S; /** * A lease representation in memory. @@ -226,12 +227,6 @@ public class Lease { @Override public String toString() { - return "Lease{" - + "leaseholder=" + leaseholder - + ", accepted=" + accepted - + ", startTime=" + startTime - + ", expirationTime=" + expirationTime - + ", prolongable=" + prolongable - + '}'; + return S.toString(Lease.class, this); } }