Skip to content
This repository was archived by the owner on Jun 27, 2023. It is now read-only.

Commit 542ea61

Browse files
rfichtnerrfichtner
committed
code cleanup
1 parent a58f11c commit 542ea61

11 files changed

+299
-295
lines changed

‎src/main/java/xdev/db/mysql/jdbc/MySQLConnectionInformation.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class MySQLConnectionInformation extends ConnectionInformation<MySQLDbms>
3030
{
3131
// /////////////////////////////////////////////////////////////////////////
3232
// constructors //
33-
// ///////////////////
33+
// ///////////////////
3434

3535
/**
3636
* @param host
@@ -93,19 +93,19 @@ public void setDatabase(final String database)
9393

9494
/**
9595
* @return
96-
* @see net.jadoth.sqlengine.dbmsAdaptor.DbmsConnectionInformation#createJdbcConnectionUrl(java.lang.String)
96+
* @see com.xdev.jadoth.sqlengine.dbms.DbmsConnectionInformation#createJdbcConnectionUrl()
9797
*/
9898
@Override
9999
public String createJdbcConnectionUrl()
100100
{
101-
String url = "jdbc:mysql://" + getHost() + ":" + getPort() + "/" + getCatalog();
101+
final String url = "jdbc:mysql://" + getHost() + ":" + getPort() + "/" + getCatalog();
102102
return appendUrlExtension(url);
103103
}
104104

105105

106106
/**
107107
* @return
108-
* @see net.jadoth.sqlengine.dbmsAdaptor.DbmsConnectionInformation#getJdbcDriverClassName()
108+
* @see com.xdev.jadoth.sqlengine.dbms.DbmsConnectionInformation#getJdbcDriverClassName()
109109
*/
110110
@Override
111111
public String getJdbcDriverClassName()

‎src/main/java/xdev/db/mysql/jdbc/MySQLDDLMapper.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class MySQLDDLMapper extends StandardDDLMapper<MySQLDbms>
3939
// /////////////////////////////////////////////////////////////////////////
4040
// constants //
4141
// ///////////////////
42-
42+
4343
/** The Constant DATATYPE_BIT. */
4444
public static final String DATATYPE_BIT = "BIT";
4545

@@ -63,7 +63,7 @@ public class MySQLDDLMapper extends StandardDDLMapper<MySQLDbms>
6363
*/
6464
private static final Hashtable<String, DATATYPE> createDataTypeStrings()
6565
{
66-
final Hashtable<String, DATATYPE> c = new Hashtable<String, DATATYPE>(10);
66+
final Hashtable<String, DATATYPE> c = new Hashtable<>(10);
6767

6868
c.put(DATATYPE_BIT,SQL.DATATYPE.BOOLEAN);
6969

@@ -75,7 +75,7 @@ private static final Hashtable<String, DATATYPE> createDataTypeStrings()
7575
c.put(SQL.DATATYPE.FLOAT.name(),SQL.DATATYPE.DOUBLE);
7676

7777
// replicate the whole stuff for lower case, just in case
78-
for(String s : c.keySet().toArray(new String[c.size()]))
78+
for(final String s : c.keySet().toArray(new String[c.size()]))
7979
{
8080
c.put(s.toLowerCase(),c.get(s));
8181
}
@@ -111,7 +111,7 @@ protected MySQLDDLMapper(final MySQLDbms dbmsAdaptor)
111111
* the data type string
112112
* @return the dATATYPE
113113
* @return
114-
* @see net.jadoth.sqlengine.dbmsAdaptor.DbmsDDLMapper.AbstractBody#mapDataType(java.lang.String)
114+
* @see com.xdev.jadoth.sqlengine.dbms.DbmsDDLMapper.AbstractBody#mapDataType(java.lang.String)
115115
*/
116116
@Override
117117
public DATATYPE mapDataType(final String dataTypeString)
@@ -135,7 +135,7 @@ public DATATYPE mapDataType(final String dataTypeString)
135135
* the index type string
136136
* @return the iNDEXTYPE
137137
* @return
138-
* @see net.jadoth.sqlengine.dbmsAdaptor.DbmsDDLMapper.AbstractBody#mapIndexType(java.lang.String)
138+
* @see com.xdev.jadoth.sqlengine.dbms.DbmsDDLMapper.AbstractBody#mapIndexType(java.lang.String)
139139
*/
140140
@Override
141141
public INDEXTYPE mapIndexType(final String indexTypeString)
@@ -163,7 +163,7 @@ public INDEXTYPE mapIndexType(final String indexTypeString)
163163
* the table
164164
* @return the string
165165
* @return
166-
* @see net.jadoth.sqlengine.dbmsAdaptor.DbmsDDLMapper.AbstractBody#lookupDdbmsDataTypeMapping(com.xdev.jadoth.sqlengine.SQL.DATATYPE,
166+
* @see com.xdev.jadoth.sqlengine.dbms.DbmsDDLMapper.AbstractBody#lookupDdbmsDataTypeMapping(com.xdev.jadoth.sqlengine.SQL.DATATYPE,
167167
* com.xdev.jadoth.sqlengine.internal.tables.SqlTableIdentity)
168168
*/
169169
@Override

‎src/main/java/xdev/db/mysql/jdbc/MySQLDMLAssembler.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class MySQLDMLAssembler extends StandardDMLAssembler<MySQLDbms>
5454
{
5555
protected static final char DELIM = '`';
5656

57-
57+
5858
// /////////////////////////////////////////////////////////////////////////
5959
// constructors //
6060
// ///////////////////
@@ -66,15 +66,15 @@ public MySQLDMLAssembler(final MySQLDbms dbms)
6666

6767

6868
@Override
69-
public StringBuilder assembleColumnQualifier(SqlColumn column, StringBuilder sb, int flags)
69+
public StringBuilder assembleColumnQualifier(final SqlColumn column, final StringBuilder sb, final int flags)
7070
{
7171
final TableExpression owner = column.getOwner();
7272
String qualifier = getAlias(owner);
7373
if(qualifier == null || QueryPart.isQualifyByTable(flags))
7474
{
7575
qualifier = owner.toString();
7676
}
77-
boolean delim = needsDelimiter(qualifier);
77+
final boolean delim = needsDelimiter(qualifier);
7878
if(delim)
7979
{
8080
sb.append(DELIM);
@@ -90,7 +90,7 @@ public StringBuilder assembleColumnQualifier(SqlColumn column, StringBuilder sb,
9090

9191

9292
@Override
93-
public StringBuilder assembleColumn(SqlColumn column, StringBuilder sb, int indentLevel,
93+
public StringBuilder assembleColumn(final SqlColumn column, final StringBuilder sb, final int indentLevel,
9494
int flags)
9595
{
9696
final TableExpression owner = column.getOwner();
@@ -125,8 +125,8 @@ public StringBuilder assembleColumn(SqlColumn column, StringBuilder sb, int inde
125125

126126

127127
@Override
128-
public StringBuilder assembleTableIdentifier(SqlTableIdentity table, StringBuilder sb,
129-
int indentLevel, int flags)
128+
public StringBuilder assembleTableIdentifier(final SqlTableIdentity table, final StringBuilder sb,
129+
final int indentLevel, final int flags)
130130
{
131131
final DbmsAdaptor<?> dbms = this.getDbmsAdaptor();
132132
final DbmsSyntax<?> syntax = dbms.getSyntax();
@@ -138,7 +138,7 @@ public StringBuilder assembleTableIdentifier(SqlTableIdentity table, StringBuild
138138

139139
if(schema != null)
140140
{
141-
boolean delim = needsDelimiter(schema);
141+
final boolean delim = needsDelimiter(schema);
142142
if(delim)
143143
{
144144
sb.append(DELIM);
@@ -151,7 +151,7 @@ public StringBuilder assembleTableIdentifier(SqlTableIdentity table, StringBuild
151151
sb.append(dot);
152152
}
153153

154-
boolean delim = needsDelimiter(name);
154+
final boolean delim = needsDelimiter(name);
155155
if(delim)
156156
{
157157
sb.append(DELIM);
@@ -183,7 +183,7 @@ public StringBuilder assembleTableIdentifier(SqlTableIdentity table, StringBuild
183183
}
184184

185185

186-
private boolean needsDelimiter(String name)
186+
private boolean needsDelimiter(final String name)
187187
{
188188
if(MySQLDbms.SYNTAX.isKeyword(name))
189189
{
@@ -195,7 +195,7 @@ private boolean needsDelimiter(String name)
195195
SqlIdentifier.validateIdentifierString(name);
196196
return false;
197197
}
198-
catch(SQLEngineInvalidIdentifier e)
198+
catch(final SQLEngineInvalidIdentifier e)
199199
{
200200
return true;
201201
}
@@ -213,7 +213,7 @@ private boolean needsDelimiter(String name)
213213
* @param clauseSeperator
214214
* @param newLine
215215
* @return
216-
* @see net.jadoth.sqlengine.dbmsAdaptor.standard.StandardDMLAssembler#assembleSELECT(com.xdev.jadoth.sqlengine.SELECT,
216+
* @see com.xdev.jadoth.sqlengine.dbms.standard.StandardDMLAssembler#assembleSELECT(com.xdev.jadoth.sqlengine.SELECT,
217217
* java.lang.StringBuilder, int, int, java.lang.String,
218218
* java.lang.String)
219219
*/
@@ -241,7 +241,7 @@ protected StringBuilder assembleSELECT(final SELECT query, final StringBuilder s
241241
* @param newLine
242242
* @param indentLevel
243243
* @return
244-
* @see net.jadoth.sqlengine.dbmsAdaptor.standard.StandardDMLAssembler#assembleSelectRowLimit(com.xdev.jadoth.sqlengine.SELECT,
244+
* @see com.xdev.jadoth.sqlengine.dbms.standard.StandardDMLAssembler#assembleSelectRowLimit(com.xdev.jadoth.sqlengine.SELECT,
245245
* java.lang.StringBuilder, int, java.lang.String, java.lang.String,
246246
* int)
247247
*/
@@ -267,8 +267,8 @@ else if(limit != null)
267267

268268

269269
@Override
270-
protected StringBuilder assembleINSERT(INSERT query, StringBuilder sb, int flags,
271-
String clauseSeperator, String newLine, int indentLevel)
270+
protected StringBuilder assembleINSERT(final INSERT query, final StringBuilder sb, final int flags,
271+
final String clauseSeperator, final String newLine, final int indentLevel)
272272
{
273273
indent(sb,indentLevel,isSingleLine(flags)).append(query.keyword()).append(_INTO_);
274274

0 commit comments

Comments
 (0)