From 21423a0eda0b86579f1a0d026d28d9fdfc9aad3e Mon Sep 17 00:00:00 2001 From: liudezhi <33149602+liudezhi2098@users.noreply.github.com> Date: Sun, 16 Jan 2022 14:58:30 +0800 Subject: [PATCH 1/2] fix checkstyle bookieRackAffinityMapping error --- .../bookie/rackawareness/BookieRackAffinityMapping.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java index 8790e0ad15708..dc5d5446e1dc3 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java @@ -18,7 +18,6 @@ */ package org.apache.pulsar.bookie.rackawareness; -import com.google.api.client.util.Strings; import java.net.InetAddress; import java.util.ArrayList; import java.util.Collections; @@ -131,6 +130,7 @@ public List resolve(List bookieAddressList) { return racks; } + @SuppressWarnings("checkstyle:RegexpSinglelineJava") private String getRack(String bookieAddress) { try { // Trigger load of z-node in case it didn't exist @@ -161,7 +161,7 @@ private String getRack(String bookieAddress) { } if (bi != null - && !Strings.isNullOrEmpty(bi.getRack()) + && !com.google.api.client.util.Strings.isNullOrEmpty(bi.getRack()) && !bi.getRack().trim().equals("/")) { String rack = bi.getRack(); if (!rack.startsWith("/")) { From 40d07cc0d1472e6dec0c6fc61cb36b10ee60b55f Mon Sep 17 00:00:00 2001 From: liudezhi <33149602+liudezhi2098@users.noreply.github.com> Date: Mon, 17 Jan 2022 11:29:50 +0800 Subject: [PATCH 2/2] chang com.google.api.client.util.Strings#isNullOrEmpty to org.apache.commons.lang3.StringUtils#isEmpty --- .../bookie/rackawareness/BookieRackAffinityMapping.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java index dc5d5446e1dc3..7015c747d103a 100644 --- a/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java +++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/bookie/rackawareness/BookieRackAffinityMapping.java @@ -34,6 +34,7 @@ import org.apache.bookkeeper.net.BookieSocketAddress; import org.apache.bookkeeper.proto.BookieAddressResolver; import org.apache.commons.configuration.Configuration; +import org.apache.commons.lang3.StringUtils; import org.apache.pulsar.common.policies.data.BookieInfo; import org.apache.pulsar.common.policies.data.BookiesRackConfiguration; import org.apache.pulsar.metadata.api.MetadataCache; @@ -130,7 +131,6 @@ public List resolve(List bookieAddressList) { return racks; } - @SuppressWarnings("checkstyle:RegexpSinglelineJava") private String getRack(String bookieAddress) { try { // Trigger load of z-node in case it didn't exist @@ -161,7 +161,7 @@ private String getRack(String bookieAddress) { } if (bi != null - && !com.google.api.client.util.Strings.isNullOrEmpty(bi.getRack()) + && !StringUtils.isEmpty(bi.getRack()) && !bi.getRack().trim().equals("/")) { String rack = bi.getRack(); if (!rack.startsWith("/")) {