(pulsar-manager) branch master updated: fix: remove circular dep in admin svc, adjusts default superuser env flag name and default (#572)

[lhotari]

This is an automated email from the ASF dual-hosted git repository.

lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-manager.git


The following commit(s) were added to refs/heads/master by this push:
     new f302f45  fix: remove circular dep in admin svc, adjusts default 
superuser env flag name and default   (#572)
f302f45 is described below

commit f302f456b7200ce854d7497ae2872734bc28860a
Author: Marko Urh <urh.ma...@gmail.com>
AuthorDate: Sat May 11 09:44:07 2024 +0200

    fix: remove circular dep in admin svc, adjusts default superuser env flag 
name and default   (#572)
    
    * fix: adjust env var name, default in application.properties vs code and 
redefine log
    
    * fix: remove circular ref
---
 .../java/org/apache/pulsar/manager/PulsarApplicationListener.java | 8 ++++----
 .../pulsar/manager/service/impl/PulsarAdminServiceImpl.java       | 3 ---
 src/main/resources/application.properties                         | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/apache/pulsar/manager/PulsarApplicationListener.java 
b/src/main/java/org/apache/pulsar/manager/PulsarApplicationListener.java
index 912061e..de0fac9 100644
--- a/src/main/java/org/apache/pulsar/manager/PulsarApplicationListener.java
+++ b/src/main/java/org/apache/pulsar/manager/PulsarApplicationListener.java
@@ -60,8 +60,8 @@ public class PulsarApplicationListener implements 
ApplicationListener<ContextRef
     @Value("${default.environment.bookie_url}")
     private String defaultEnvironmentBookieUrl;
 
-    @Value("${default.superuser.enable}")
-    private Boolean defaultSuperuserEnable = false;
+    @Value("${default.superuser.enabled}")
+    private Boolean defaultSuperuserEnabled;
 
     @Value("${default.superuser.name}")
     private String defaultSuperuserName;
@@ -94,8 +94,8 @@ public class PulsarApplicationListener implements 
ApplicationListener<ContextRef
     }
 
     private void seedDefaultSuperuser() {
-        if(defaultSuperuserEnable == false) {
-            log.debug("Superuser seed disabled");
+        if(defaultSuperuserEnabled == false) {
+            log.info("Superuser seed via application.properties is disabled");
             return;
         }
         
diff --git 
a/src/main/java/org/apache/pulsar/manager/service/impl/PulsarAdminServiceImpl.java
 
b/src/main/java/org/apache/pulsar/manager/service/impl/PulsarAdminServiceImpl.java
index da9ad9f..458bdf0 100644
--- 
a/src/main/java/org/apache/pulsar/manager/service/impl/PulsarAdminServiceImpl.java
+++ 
b/src/main/java/org/apache/pulsar/manager/service/impl/PulsarAdminServiceImpl.java
@@ -71,9 +71,6 @@ public class PulsarAdminServiceImpl implements 
PulsarAdminService {
     @Autowired
     private EnvironmentsRepository environmentsRepository;
 
-    @Autowired
-    private EnvironmentCacheService environmentCacheService;
-
     @PreDestroy
     public void destroy() {
         pulsarAdmins.values().forEach(value -> value.close());
diff --git a/src/main/resources/application.properties 
b/src/main/resources/application.properties
index 1ae3a96..d2c9048 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -134,7 +134,7 @@ default.environment.service_url=
 default.environment.bookie_url=
 
 # default superuser configuration
-default.superuser.enable=
+default.superuser.enabled=false
 default.superuser.name=
 default.superuser.password=
 default.superuser.email=