dbeaver#22963 Fix Codacy Static Code Analysis suggestion

longhaseng52 · Apr 2, 2024 · 303be27 · 303be27
1 parent b3fa7bd
commit 303be27
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/...rg.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/edit/CubridTableManager.java b/...rg.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/edit/CubridTableManager.java
@@ -89,10 +89,10 @@ protected void appendTableModifiers(
         CubridTable table = (CubridTable) genericTable;
         String suffix = alter ? "," : "\n";
         query.append("\n");
-        if (table.isReuseOID() == false && alter == false) {
+        if (!table.isReuseOID() && !alter) {
             query.append("DONT_REUSE_OID").append(suffix);
         }
-        if ((command.getProperty("charset") != null || command.getProperty("collation") != null) && table.getCollation().getName() != null) {
+        if (command.getProperty("charset") != null || command.getProperty("collation") != null) {
             query.append("COLLATE ").append(table.getCollation().getName()).append(suffix);
         }
         if (command.getProperty("autoIncrement") != null && table.getAutoIncrement() != 0) {

diff --git a/...ns/org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridCharset.java b/...ns/org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridCharset.java
@@ -53,12 +53,9 @@ public List<CubridCollation> getCollations() {
         return collations;
     }
 
-    @Nullable
+    @NotNull
     public CubridCollation getDefaultCollation() {
-        for (CubridCollation collation : collations) {
-            return collation;
-        }
-        return null;
+        return collations.get(0);
     }
 
     @Nullable

diff --git a/.../org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridProcedure.java b/.../org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridProcedure.java
@@ -51,7 +51,6 @@ public CubridProcedure(
             @NotNull String procedureName,
             @Nullable String description,
             @NotNull DBSProcedureType procedureType,
-            @NotNull String target,
             @NotNull String returnType) {
         super(container, procedureName, description, procedureType, null, true);
         this.returnType = returnType;

diff --git a/plugins/org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridUser.java b/plugins/org.jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/CubridUser.java
@@ -199,10 +199,9 @@ protected GenericTableColumn fetchChild(
             try (JDBCPreparedStatement dbStat = session.prepareStatement(sql)) {
                 dbStat.setString(1, columnName);
                 try (JDBCResultSet result = dbStat.executeQuery()) {
-                    while (result.next()) {
+                    if (result.next()) {
                         dataType = JDBCUtils.safeGetString(result, "Type");
                         autoIncrement = JDBCUtils.safeGetString(result, "Extra").equals("auto_increment");
-                        break;
                     }
                 }
             }

diff --git a/...jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/meta/CubridMetaModel.java b/...jkiss.dbeaver.ext.cubrid/src/org/jkiss/dbeaver/ext/cubrid/model/meta/CubridMetaModel.java
@@ -370,7 +370,6 @@ public void loadProcedures(
                         String procedureName = JDBCUtils.safeGetString(dbResult, "sp_name");
                         String description = JDBCUtils.safeGetString(dbResult, CubridConstants.COMMENT);
                         String type = JDBCUtils.safeGetString(dbResult, "sp_type");
-                        String target = JDBCUtils.safeGetString(dbResult, "target");
                         String returnType = JDBCUtils.safeGetString(dbResult, "return_type");
                         DBSProcedureType procedureType;
                         if (type.equalsIgnoreCase(CubridConstants.TERM_PROCEDURE)) {
@@ -380,7 +379,7 @@ public void loadProcedures(
                         } else {
                             procedureType = DBSProcedureType.UNKNOWN;
                         }
-                        container.addProcedure(new CubridProcedure(container, procedureName, description, procedureType, target, returnType));
+                        container.addProcedure(new CubridProcedure(container, procedureName, description, procedureType, returnType));
                     }
                 }
             }
@@ -395,11 +394,11 @@ public String getViewDDL(@NotNull DBRProgressMonitor monitor, @Nullable GenericV
         String ddl = "-- View definition not available";
         try (JDBCSession session = DBUtils.openMetaSession(monitor, object, "Load view ddl")) {
             String sql = String.format("show create view %s", ((CubridView) object).getUniqueName());
-            try(JDBCPreparedStatement dbStat = session.prepareStatement(sql)) {
+            try (JDBCPreparedStatement dbStat = session.prepareStatement(sql)) {
                 try (JDBCResultSet dbResult = dbStat.executeQuery()) {
-                    while(dbResult.next()) {
+                    if (dbResult.next()) {
                         ddl = "create or replace view \"" + dbResult.getString("View") + "\" as " + dbResult.getString("Create View");
-                        return SQLFormatUtils.formatSQL(object.getDataSource(), ddl);
+                        ddl = SQLFormatUtils.formatSQL(object.getDataSource(), ddl);
                     }
                 }
             }