Merge pull request #212 from georgekankava/staging/string-literals-should-not-be-duplicated-fix-2

wumpz · wumpz · commit dac9d8d1d3cc · 2016-01-28T23:15:43.000+01:00
squid:S1192 - String literals should not be duplicated
diff --git a/src/main/java/net/sf/jsqlparser/util/AddAliasesVisitor.java b/src/main/java/net/sf/jsqlparser/util/AddAliasesVisitor.java
@@ -37,6 +37,7 @@
  */
 public class AddAliasesVisitor implements SelectVisitor, SelectItemVisitor {
 
+	private static final String NOT_SUPPORTED_YET = "Not supported yet.";
 	private List<String> aliases = new LinkedList<String>();
 	private boolean firstRun = true;
 	private int counter = 0;
@@ -65,7 +66,7 @@ public void visit(SetOperationList setOpList) {
 
 	@Override
 	public void visit(AllTableColumns allTableColumns) {
-		throw new UnsupportedOperationException("Not supported yet.");
+		throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
 	}
 
 	@Override
@@ -110,11 +111,11 @@ public void setPrefix(String prefix) {
 
 	@Override
 	public void visit(WithItem withItem) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
 	}
 
 	@Override
 	public void visit(AllColumns allColumns) {
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
 	}
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/SelectUtils.java b/src/main/java/net/sf/jsqlparser/util/SelectUtils.java
@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
@@ -46,6 +47,8 @@
  */
 public final class SelectUtils {
 
+	private static final String NOT_SUPPORTED_YET = "Not supported yet.";
+
 	private SelectUtils() {
 	}
 	
@@ -113,12 +116,12 @@ public void visit(PlainSelect plainSelect) {
 
 			@Override
 			public void visit(SetOperationList setOpList) {
-				throw new UnsupportedOperationException("Not supported yet.");
+				throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
 			}
 
 			@Override
 			public void visit(WithItem withItem) {
-				throw new UnsupportedOperationException("Not supported yet.");
+				throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
 			}
 		});
 	}
@@ -145,7 +148,7 @@ public static Join addJoin(Select select, final Table table, final Expression on
 			joins.add(join);
 			return join;
 		}
-		throw new UnsupportedOperationException("Not supported yet.");
+		throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
 	}
     
     /**
@@ -163,12 +166,12 @@ public void visit(PlainSelect plainSelect) {
 
 			@Override
 			public void visit(SetOperationList setOpList) {
-				throw new UnsupportedOperationException("Not supported yet.");
+				throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
 			}
 
 			@Override
 			public void visit(WithItem withItem) {
-				throw new UnsupportedOperationException("Not supported yet.");
+				throw new UnsupportedOperationException(NOT_SUPPORTED_YET);
 			}
 		});
     }
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -36,6 +36,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import net.sf.jsqlparser.statement.SetStatement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.Statements;
@@ -53,7 +54,8 @@
  */
 public class TablesNamesFinder implements SelectVisitor, FromItemVisitor, ExpressionVisitor, ItemsListVisitor, SelectItemVisitor, StatementVisitor {
 
-    private List<String> tables;
+    private static final String NOT_SUPPORTED_YET = "Not supported yet.";
+	private List<String> tables;
     /**
      * There are special names, that are not table names but are parsed as
      * tables. These names are collected here and are not included in the tables
@@ -573,17 +575,17 @@ public void visit(Replace replace) {
 
     @Override
     public void visit(Drop drop) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
     }
 
     @Override
     public void visit(Truncate truncate) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
     }
 
     @Override
     public void visit(CreateIndex createIndex) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
     }
 
     @Override
@@ -596,27 +598,27 @@ public void visit(CreateTable create) {
 
     @Override
     public void visit(CreateView createView) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
     }
 
     @Override
     public void visit(Alter alter) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
     }
 
     @Override
     public void visit(Statements stmts) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
     }
 
     @Override
     public void visit(Execute execute) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
     }
 
     @Override
     public void visit(SetStatement set) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
     }
 
     @Override
@@ -633,7 +635,7 @@ public void visit(HexValue hexValue) {
 
     @Override
     public void visit(Merge merge) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools | Templates.
     }
 
     @Override
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
@@ -38,7 +38,8 @@
  */
 public class ExpressionDeParser implements ExpressionVisitor, ItemsListVisitor {
 
-    private StringBuilder buffer;
+    private static final String NOT = " NOT ";
+	private StringBuilder buffer;
     private SelectVisitor selectVisitor;
     private boolean useBracketsInExprList = true;
 
@@ -119,7 +120,7 @@ public void visit(HexValue hexValue) {
 
     public void visitOldOracleJoinBinaryExpression(OldOracleJoinBinaryExpression expression, String operator) {
         if (expression.isNot()) {
-            buffer.append(" NOT ");
+            buffer.append(NOT);
         }
         expression.getLeftExpression().accept(this);
         if (expression.getOldOracleJoinSyntax() == EqualsTo.ORACLE_JOIN_RIGHT) {
@@ -250,7 +251,7 @@ public void visit(OrExpression orExpression) {
     @Override
     public void visit(Parenthesis parenthesis) {
         if (parenthesis.isNot()) {
-            buffer.append(" NOT ");
+            buffer.append(NOT);
         }
 
         buffer.append("(");
@@ -273,7 +274,7 @@ public void visit(Subtraction subtraction) {
 
     private void visitBinaryExpression(BinaryExpression binaryExpression, String operator) {
         if (binaryExpression.isNot()) {
-            buffer.append(" NOT ");
+            buffer.append(NOT);
         }
         binaryExpression.getLeftExpression().accept(this);
         buffer.append(operator);

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`*/`
`38`	`38`	`public class AddAliasesVisitor implements SelectVisitor, SelectItemVisitor {`
`39`	`39`
	`40`	`+ private static final String NOT_SUPPORTED_YET = "Not supported yet.";`
`40`	`41`	`private List<String> aliases = new LinkedList<String>();`
`41`	`42`	`private boolean firstRun = true;`
`42`	`43`	`private int counter = 0;`
`@@ -65,7 +66,7 @@ public void visit(SetOperationList setOpList) {`
`65`	`66`
`66`	`67`	`@Override`
`67`	`68`	`public void visit(AllTableColumns allTableColumns) {`
`68`		`- throw new UnsupportedOperationException("Not supported yet.");`
	`69`	`+ throw new UnsupportedOperationException(NOT_SUPPORTED_YET);`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`@Override`
`@@ -110,11 +111,11 @@ public void setPrefix(String prefix) {`
`110`	`111`
`111`	`112`	`@Override`
`112`	`113`	`public void visit(WithItem withItem) {`
`113`		`- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools \| Templates.`
	`114`	`+ throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools \| Templates.`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`@Override`
`117`	`118`	`public void visit(AllColumns allColumns) {`
`118`		`- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools \| Templates.`
	`119`	`+ throw new UnsupportedOperationException(NOT_SUPPORTED_YET); //To change body of generated methods, choose Tools \| Templates.`
`119`	`120`	`}`
`120`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import java.util.ArrayList;`
`25`	`25`	`import java.util.Arrays;`
`26`	`26`	`import java.util.List;`
	`27`	`+`
`27`	`28`	`import net.sf.jsqlparser.JSQLParserException;`
`28`	`29`	`import net.sf.jsqlparser.expression.Expression;`
`29`	`30`	`import net.sf.jsqlparser.parser.CCJSqlParserUtil;`
`@@ -46,6 +47,8 @@`
`46`	`47`	`*/`
`47`	`48`	`public final class SelectUtils {`
`48`	`49`
	`50`	`+ private static final String NOT_SUPPORTED_YET = "Not supported yet.";`
	`51`	`+`
`49`	`52`	`private SelectUtils() {`
`50`	`53`	`}`
`51`	`54`
`@@ -113,12 +116,12 @@ public void visit(PlainSelect plainSelect) {`
`113`	`116`
`114`	`117`	`@Override`
`115`	`118`	`public void visit(SetOperationList setOpList) {`
`116`		`- throw new UnsupportedOperationException("Not supported yet.");`
	`119`	`+ throw new UnsupportedOperationException(NOT_SUPPORTED_YET);`
`117`	`120`	`}`
`118`	`121`
`119`	`122`	`@Override`
`120`	`123`	`public void visit(WithItem withItem) {`
`121`		`- throw new UnsupportedOperationException("Not supported yet.");`
	`124`	`+ throw new UnsupportedOperationException(NOT_SUPPORTED_YET);`
`122`	`125`	`}`
`123`	`126`	`});`
`124`	`127`	`}`
`@@ -145,7 +148,7 @@ public static Join addJoin(Select select, final Table table, final Expression on`
`145`	`148`	`joins.add(join);`
`146`	`149`	`return join;`
`147`	`150`	`}`
`148`		`- throw new UnsupportedOperationException("Not supported yet.");`
	`151`	`+ throw new UnsupportedOperationException(NOT_SUPPORTED_YET);`
`149`	`152`	`}`
`150`	`153`
`151`	`154`	`/**`
`@@ -163,12 +166,12 @@ public void visit(PlainSelect plainSelect) {`
`163`	`166`
`164`	`167`	`@Override`
`165`	`168`	`public void visit(SetOperationList setOpList) {`
`166`		`- throw new UnsupportedOperationException("Not supported yet.");`
	`169`	`+ throw new UnsupportedOperationException(NOT_SUPPORTED_YET);`
`167`	`170`	`}`
`168`	`171`
`169`	`172`	`@Override`
`170`	`173`	`public void visit(WithItem withItem) {`
`171`		`- throw new UnsupportedOperationException("Not supported yet.");`
	`174`	`+ throw new UnsupportedOperationException(NOT_SUPPORTED_YET);`
`172`	`175`	`}`
`173`	`176`	`});`
`174`	`177`	`}`