(ranger) branch RANGER-5199_ck updated: RANGER-5199 : Fixing checkstyle issue

[dhavalshah9131]

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

dhavalshah9131 pushed a commit to branch RANGER-5199_ck
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/RANGER-5199_ck by this push:
     new 4a3afeb20 RANGER-5199 : Fixing checkstyle issue
4a3afeb20 is described below

commit 4a3afeb20e72b0578c2ff48cf043d2e6f10589f3
Author: dhavalshah9131 <dhavalshah9...@gmail.com>
AuthorDate: Tue May 13 16:21:44 2025 +0530

    RANGER-5199 : Fixing checkstyle issue
---
 .../org/apache/hadoop/crypto/key/RangerKMSDB.java  | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java 
b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
index 7fa19e723..3467b97d3 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKMSDB.java
@@ -35,15 +35,13 @@
 import java.util.Map;
 
 public class RangerKMSDB {
-    private static final Logger logger = 
LoggerFactory.getLogger(RangerKMSDB.class);
-
     public static final int DB_FLAVOR_UNKNOWN     = 0;
     public static final int DB_FLAVOR_MYSQL       = 1;
     public static final int DB_FLAVOR_ORACLE      = 2;
     public static final int DB_FLAVOR_POSTGRES    = 3;
     public static final int DB_FLAVOR_SQLSERVER   = 4;
     public static final int DB_FLAVOR_SQLANYWHERE = 5;
-
+    private static final Logger logger = 
LoggerFactory.getLogger(RangerKMSDB.class);
     private static final String PROPERTY_PREFIX                = "ranger.ks.";
     private static final String DB_DIALECT                     = 
"jpa.jdbc.dialect";
     private static final String DB_DRIVER                      = 
"jpa.jdbc.driver";
@@ -126,7 +124,7 @@ private EntityManager getEntityManager() {
     }
 
     private int getDBFlavor(Configuration newConfig) {
-        String[] propertyNames = new String[] {PROPERTY_PREFIX + DB_DIALECT, 
PROPERTY_PREFIX + DB_DRIVER, PROPERTY_PREFIX + DB_URL };
+        String[] propertyNames = new String[] {PROPERTY_PREFIX + DB_DIALECT, 
PROPERTY_PREFIX + DB_DRIVER, PROPERTY_PREFIX + DB_URL};
 
         for (String propertyName : propertyNames) {
             String propertyValue = newConfig.get(propertyName);
@@ -161,9 +159,9 @@ private int getDBFlavor(Configuration newConfig) {
 
     private void updateDBSSLURL() {
         if (conf != null && conf.get(PROPERTY_PREFIX + DB_SSL_ENABLED) != 
null) {
-            final String dbSslEnabled = normalize(conf.get(PROPERTY_PREFIX + 
DB_SSL_ENABLED));
-            String rangerJpaJdbcUrl = conf.get(PROPERTY_PREFIX + DB_URL);
-            int dbFlavor = getDBFlavor(conf);
+            final String dbSslEnabled     = normalize(conf.get(PROPERTY_PREFIX 
+ DB_SSL_ENABLED));
+            String       rangerJpaJdbcUrl = conf.get(PROPERTY_PREFIX + DB_URL);
+            int          dbFlavor         = getDBFlavor(conf);
             if ("true".equalsIgnoreCase(dbSslEnabled)) {
                 final String dbSslRequired                = 
normalize(conf.get(PROPERTY_PREFIX + DB_SSL_REQUIRED));
                 final String dbSslVerifyServerCertificate = 
normalize(conf.get(PROPERTY_PREFIX + DB_SSL_VerifyServerCertificate));
@@ -242,14 +240,14 @@ private void updateDBSSLURL() {
                     }
                 }
             } else {
-                if(dbFlavor == DB_FLAVOR_MYSQL){
-                   if(StringUtils.isNotEmpty(rangerJpaJdbcUrl) && 
!rangerJpaJdbcUrl.contains("?")) {
-                       rangerJpaJdbcUrl = rangerJpaJdbcUrl + "?useSSL=" + 
dbSslEnabled;
-                       conf.set(PROPERTY_PREFIX + DB_URL, rangerJpaJdbcUrl);
+                if (dbFlavor == DB_FLAVOR_MYSQL) {
+                    if (StringUtils.isNotEmpty(rangerJpaJdbcUrl) && 
!rangerJpaJdbcUrl.contains("?")) {
+                        rangerJpaJdbcUrl = rangerJpaJdbcUrl + "?useSSL=" + 
dbSslEnabled;
+                        conf.set(PROPERTY_PREFIX + DB_URL, rangerJpaJdbcUrl);
                         jpaProperties.put(JPA_DB_URL, conf.get(PROPERTY_PREFIX 
+ DB_URL));
-                   }
+                    }
                 }
-                
logger.info(PROPERTY_PREFIX+DB_URL+"="+conf.get(PROPERTY_PREFIX + DB_URL));
+                logger.info(PROPERTY_PREFIX + DB_URL + "=" + 
conf.get(PROPERTY_PREFIX + DB_URL));
             }
         }
     }