diff --git a/.mvn/.gradle-enterprise/gradle-enterprise-workspace-id b/.mvn/.gradle-enterprise/gradle-enterprise-workspace-id
new file mode 100644
index 00000000000000..25cff8aee78644
--- /dev/null
+++ b/.mvn/.gradle-enterprise/gradle-enterprise-workspace-id
@@ -0,0 +1 @@
+xbv4mcpg3fcgvd7kjlocsbnx3y
\ No newline at end of file
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index da983d7a0704c7..7cf7f9da08f7dc 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -1687,20 +1687,20 @@ private CompletableFuture<ManagedLedgerConfig> getManagedLedgerConfig(@Nonnull T
                 managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyClassName(
                         IsolatedBookieEnsemblePlacementPolicy.class);
                 if (localPolicies.isPresent() && localPolicies.get().bookieAffinityGroup != null) {
-                    Map<String, Object> properties = new HashMap<>();
+                    Map<String, Object> properties = Maps.newHashMap();
                     properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS,
                             localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupPrimary());
                     properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS,
                             localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupSecondary());
                     managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
                 } else if (isSystemTopic(topicName)) {
-                    Map<String, Object> properties = new HashMap<>();
+                    Map<String, Object> properties = Maps.newHashMap();
                     properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS, "*");
                     properties.put(IsolatedBookieEnsemblePlacementPolicy
                             .SECONDARY_ISOLATION_BOOKIE_GROUPS, "*");
                     managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
                 } else {
-                    Map<String, Object> properties = new HashMap<>();
+                    Map<String, Object> properties = Maps.newHashMap();
                     properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS, "");
                     properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS, "");
                     managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyProperties(properties);
@@ -1709,7 +1709,7 @@ private CompletableFuture<ManagedLedgerConfig> getManagedLedgerConfig(@Nonnull T
                 if (localPolicies.isPresent() && localPolicies.get().bookieAffinityGroup != null) {
                     managedLedgerConfig.setBookKeeperEnsemblePlacementPolicyClassName(
                             IsolatedBookieEnsemblePlacementPolicy.class);
-                    Map<String, Object> properties = new HashMap<>();
+                    Map<String, Object> properties = Maps.newHashMap();
                     properties.put(IsolatedBookieEnsemblePlacementPolicy.ISOLATION_BOOKIE_GROUPS,
                             localPolicies.get().bookieAffinityGroup.getBookkeeperAffinityGroupPrimary());
                     properties.put(IsolatedBookieEnsemblePlacementPolicy.SECONDARY_ISOLATION_BOOKIE_GROUPS,