You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2024/04/25 15:59:55 UTC
(hbase) branch branch-2 updated: HBASE-28436 Addendum fix naming issue (#5855)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 5fa80805c5a HBASE-28436 Addendum fix naming issue (#5855)
5fa80805c5a is described below
commit 5fa80805c5a0d5b402dba41a67937c95028896fc
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Thu Apr 25 23:38:18 2024 +0800
HBASE-28436 Addendum fix naming issue (#5855)
(cherry picked from commit 4b49e53a91b21875e10ad819656c6856a060c81f)
---
.../hadoop/hbase/client/ConnectionRegistryFactory.java | 12 ++++++------
...stryCreator.java => RpcConnectionRegistryURIFactory.java} | 4 ++--
...istryCreator.java => ZKConnectionRegistryURIFactory.java} | 4 ++--
...g.apache.hadoop.hbase.client.ConnectionRegistryURIFactory | 4 ++--
...UriParsing.java => TestConnectionRegistryUriParsing.java} | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionRegistryFactory.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionRegistryFactory.java
index e82b551ad28..859d3d91b8d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionRegistryFactory.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionRegistryFactory.java
@@ -39,7 +39,7 @@ final class ConnectionRegistryFactory {
private static final Logger LOG = LoggerFactory.getLogger(ConnectionRegistryFactory.class);
- private static final ImmutableMap<String, ConnectionRegistryURIFactory> CREATORS;
+ private static final ImmutableMap<String, ConnectionRegistryURIFactory> FACTORIES;
static {
ImmutableMap.Builder<String, ConnectionRegistryURIFactory> builder = ImmutableMap.builder();
for (ConnectionRegistryURIFactory factory : ServiceLoader
@@ -47,7 +47,7 @@ final class ConnectionRegistryFactory {
builder.put(factory.getScheme().toLowerCase(), factory);
}
// throw IllegalArgumentException if there are duplicated keys
- CREATORS = builder.buildOrThrow();
+ FACTORIES = builder.buildOrThrow();
}
private ConnectionRegistryFactory() {
@@ -69,12 +69,12 @@ final class ConnectionRegistryFactory {
LOG.warn("No scheme specified for {}, fallback to use old way", uri);
return create(conf, user);
}
- ConnectionRegistryURIFactory creator = CREATORS.get(uri.getScheme().toLowerCase());
- if (creator == null) {
- LOG.warn("No creator registered for {}, fallback to use old way", uri);
+ ConnectionRegistryURIFactory factory = FACTORIES.get(uri.getScheme().toLowerCase());
+ if (factory == null) {
+ LOG.warn("No factory registered for {}, fallback to use old way", uri);
return create(conf, user);
}
- return creator.create(uri, conf, user);
+ return factory.create(uri, conf, user);
}
/**
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistryCreator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistryURIFactory.java
similarity index 93%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistryCreator.java
rename to hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistryURIFactory.java
index cb2338b1429..79081ee6c64 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistryCreator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcConnectionRegistryURIFactory.java
@@ -29,9 +29,9 @@ import org.slf4j.LoggerFactory;
* Connection registry creator implementation for creating {@link RpcConnectionRegistry}.
*/
@InterfaceAudience.Private
-public class RpcConnectionRegistryCreator implements ConnectionRegistryURIFactory {
+public class RpcConnectionRegistryURIFactory implements ConnectionRegistryURIFactory {
- private static final Logger LOG = LoggerFactory.getLogger(RpcConnectionRegistryCreator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RpcConnectionRegistryURIFactory.class);
@Override
public ConnectionRegistry create(URI uri, Configuration conf, User user) throws IOException {
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistryCreator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistryURIFactory.java
similarity index 94%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistryCreator.java
rename to hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistryURIFactory.java
index 8aa51e04fe4..939adab23b7 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistryCreator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistryURIFactory.java
@@ -30,9 +30,9 @@ import org.slf4j.LoggerFactory;
* Connection registry creator implementation for creating {@link ZKConnectionRegistry}.
*/
@InterfaceAudience.Private
-public class ZKConnectionRegistryCreator implements ConnectionRegistryURIFactory {
+public class ZKConnectionRegistryURIFactory implements ConnectionRegistryURIFactory {
- private static final Logger LOG = LoggerFactory.getLogger(ZKConnectionRegistryCreator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ZKConnectionRegistryURIFactory.class);
@Override
public ConnectionRegistry create(URI uri, Configuration conf, User user) throws IOException {
diff --git a/hbase-client/src/main/resources/META-INF/services/org.apache.hadoop.hbase.client.ConnectionRegistryURIFactory b/hbase-client/src/main/resources/META-INF/services/org.apache.hadoop.hbase.client.ConnectionRegistryURIFactory
index b25a569776f..229119c6635 100644
--- a/hbase-client/src/main/resources/META-INF/services/org.apache.hadoop.hbase.client.ConnectionRegistryURIFactory
+++ b/hbase-client/src/main/resources/META-INF/services/org.apache.hadoop.hbase.client.ConnectionRegistryURIFactory
@@ -13,5 +13,5 @@
# 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.
-org.apache.hadoop.hbase.client.RpcConnectionRegistryCreator
-org.apache.hadoop.hbase.client.ZKConnectionRegistryCreator
\ No newline at end of file
+org.apache.hadoop.hbase.client.RpcConnectionRegistryURIFactory
+org.apache.hadoop.hbase.client.ZKConnectionRegistryURIFactory
\ No newline at end of file
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestConnectionRegistryCreatorUriParsing.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestConnectionRegistryUriParsing.java
similarity index 97%
rename from hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestConnectionRegistryCreatorUriParsing.java
rename to hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestConnectionRegistryUriParsing.java
index 4dabd894b5b..c841346e810 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestConnectionRegistryCreatorUriParsing.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestConnectionRegistryUriParsing.java
@@ -46,11 +46,11 @@ import org.mockito.MockedStatic;
* Make sure we can successfully parse the URI component
*/
@Category({ ClientTests.class, SmallTests.class })
-public class TestConnectionRegistryCreatorUriParsing {
+public class TestConnectionRegistryUriParsing {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestConnectionRegistryCreatorUriParsing.class);
+ HBaseClassTestRule.forClass(TestConnectionRegistryUriParsing.class);
private Configuration conf;