updated according to codeclimate 2.0

anasasiia · Jun 19, 2023 · d7a37e9 · d7a37e9
1 parent a9bc763
commit d7a37e9
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 44 deletions.
diff --git a/src/main/java/org/example/ToGetFrom.java b/src/main/java/org/example/ToGetFrom.java
@@ -10,15 +10,10 @@ public static List<Source> run(String[] arg) {
         List<Source> fromSources = new ArrayList<>();
         List<Integer> indexOfComma = Utils.findIndexesOfComma(arg);
 
-        if (arg.length == 2) {
-            indexOfComma.add(arg.length - 1);
-        } else {
-            indexOfComma.add(arg.length);
-        }
-
         int start = 0;
         for (Integer stop: indexOfComma) {
             Source source = new Source();
+
             if (!arg[start + 1].equals("(")) {
                 if (stop - (start + 1) == 2) {
                     source.setAlias(arg[start + 2]);

diff --git a/src/main/java/org/example/ToGetWhere.java b/src/main/java/org/example/ToGetWhere.java
@@ -24,19 +24,7 @@ public static List<WhereClause> run(String[] arg) {
         for (Integer stop : indexOfAnd) {
             WhereClause whereClause = new WhereClause();
             whereClause.setObject(arg[start + 1]);
-
-            List<String> clauses = new ArrayList<>();
-
-            if (arg[start + 2].equals("NOT")) {
-                String clause = arg[start + 2] + " " + arg[start + 3];
-                clauses.add(clause);
-            } else if (arg[start + 2].equals("BETWEEN")) {
-                clauses.add(arg[start + 2]);
-                clauses.add(arg[start + 4]);
-            } else {
-                clauses.add(arg[start + 2]);
-            }
-            whereClause.setClause(clauses);
+            setClauses(whereClause, arg, start);
 
             List<String> values = new ArrayList<>();
             for (int j = start + 3; j < stop; j++) {
@@ -52,6 +40,21 @@ public static List<WhereClause> run(String[] arg) {
         return whereClauses;
     }
 
+    private static void setClauses(WhereClause whereClause, String[] arg, int start) {
+        List<String> clauses = new ArrayList<>();
+
+        if (arg[start + 2].equals("NOT")) {
+            String clause = arg[start + 2] + " " + arg[start + 3];
+            clauses.add(clause);
+        } else if (arg[start + 2].equals("BETWEEN")) {
+            clauses.add(arg[start + 2]);
+            clauses.add(arg[start + 4]);
+        } else {
+            clauses.add(arg[start + 2]);
+        }
+        whereClause.setClause(clauses);
+    }
+
     public static List<String> getNonValues() {
         return nonValues;
     }

diff --git a/src/main/java/org/example/ToSelect.java b/src/main/java/org/example/ToSelect.java
@@ -17,38 +17,42 @@ public static List<Column> run(String[] arg) {
         int start = 0;
 
         for (Integer stop : indexOfComma) {
-            Column column = new Column();
-            String alias = null;
-            Map<String, String> tableAndColumnName = new HashMap<>();
-
             int indexOfOpenBracket = Utils.findIndexOfSymbol(arg, start, stop, "(");
-
-            if (stop - (start + 1) == 3) {
-                alias = arg[start + 3];
-                tableAndColumnName.put(arg[start + 1], "");
-            }
-
-            if (stop - start == 2 || indexOfOpenBracket - start > 1) {
-                int delimiterIndex = Utils.findIndexOfSymbolInString(arg, start + 1, List.of(".", "_"));
-
-                if (delimiterIndex == -1) {
-                    tableAndColumnName.put(arg[start + 1], "");
-                } else {
-                    tableAndColumnName.put(arg[start + 1].substring(delimiterIndex + 1),
-                            arg[start + 1].substring(0, delimiterIndex));
-                }
-            }
-            column.setAlias(alias);
-            column.setTableAndColumnName(tableAndColumnName);
-            columns.add(column);
+            Column column1 = setColumn(arg, start, stop, indexOfOpenBracket);
+            columns.add(column1);
 
             if (stop - (start + 1) > 3 || arg[start + 1].equals("(")) {
-                Column column1 = (Column) Utils.prepareColumnSourceWithNestedQuery(arg, indexOfOpenBracket, arg.length);
-                columns.add(column1);
+                Column column2 = (Column) Utils.prepareColumnSourceWithNestedQuery(arg, indexOfOpenBracket, arg.length);
+                columns.add(column2);
                 break;
             }
             start = stop;
         }
         return columns;
     }
+
+    private static Column setColumn(String[] arg, int start, int stop, int indexOfOpenBracket) {
+        Column column = new Column();
+        String alias = null;
+        Map<String, String> tableAndColumnName = new HashMap<>();
+
+        if (stop - (start + 1) == 3) {
+            alias = arg[start + 3];
+            tableAndColumnName.put(arg[start + 1], "");
+        }
+
+        if (stop - start == 2 || indexOfOpenBracket - start > 1) {
+            int delimiterIndex = Utils.findIndexOfSymbolInString(arg, start + 1, List.of(".", "_"));
+
+            if (delimiterIndex == -1) {
+                tableAndColumnName.put(arg[start + 1], "");
+            } else {
+                tableAndColumnName.put(arg[start + 1].substring(delimiterIndex + 1),
+                        arg[start + 1].substring(0, delimiterIndex));
+            }
+        }
+        column.setAlias(alias);
+        column.setTableAndColumnName(tableAndColumnName);
+        return column;
+    }
 }
diff --git a/src/main/java/org/example/Utils.java b/src/main/java/org/example/Utils.java
@@ -34,6 +34,7 @@ public static List<Integer> findIndexesOfComma(String[] arg) {
                 indexOfComma.add(i);
             }
         }
+        indexOfComma.add(arg.length);
         return indexOfComma;
     }