Skip to content
This repository was archived by the owner on Jan 18, 2024. It is now read-only.

Commit 9593edd

Browse files
JohannesRabauerJohannesRabauer
committed
Cleanup
1 parent bdc126d commit 9593edd

10 files changed

+224
-284
lines changed

‎src/main/java/xdev/db/sqlite/jdbc/SQLiteConnectionInformation.java

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,83 +17,80 @@
1717
*/
1818
package xdev.db.sqlite.jdbc;
1919

20-
21-
22-
2320
import java.io.File;
2421

2522
import com.xdev.jadoth.sqlengine.dbms.DbmsConnectionInformation;
2623

2724
import xdev.db.ConnectionInformation;
2825

26+
2927
public class SQLiteConnectionInformation extends ConnectionInformation<SQLiteDbms>
3028
{
3129
// /////////////////////////////////////////////////////////////////////////
3230
// constructors //
3331
// ///////////////////
3432

35-
public SQLiteConnectionInformation(final String database, final String urlExtension,
36-
final SQLiteDbms dbmsAdaptor)
33+
public SQLiteConnectionInformation(
34+
final String database, final String urlExtension,
35+
final SQLiteDbms dbmsAdaptor)
3736
{
38-
super("",0,"","",database,urlExtension,dbmsAdaptor);
37+
super("", 0, "", "", database, urlExtension, dbmsAdaptor);
3938
}
4039

41-
4240
// /////////////////////////////////////////////////////////////////////////
4341
// getters //
4442
// ///////////////////
43+
4544
/**
4645
* Gets the database.
47-
*
46+
*
4847
* @return the database
4948
*/
5049
public String getDatabase()
5150
{
5251
return this.getCatalog();
5352
}
5453

55-
5654
// /////////////////////////////////////////////////////////////////////////
5755
// setters //
5856
// ///////////////////
57+
5958
/**
6059
* Sets the database.
61-
*
62-
* @param database
63-
* the database to set
60+
*
61+
* @param database the database to set
6462
*/
6563
public void setDatabase(final String database)
6664
{
6765
this.setCatalog(database);
6866
}
6967

70-
7168
// /////////////////////////////////////////////////////////////////////////
7269
// override methods //
7370
// ///////////////////
71+
7472
/**
7573
* @see DbmsConnectionInformation#createJdbcConnectionUrl()
7674
*/
7775
@Override
7876
public String createJdbcConnectionUrl()
7977
{
80-
String db = getDatabase();
78+
String db = this.getDatabase();
8179
File file = new File(db).getAbsoluteFile();
8280
if(!file.exists())
8381
{
84-
String projectHome = System.getProperty("project.home",null);
82+
final String projectHome = System.getProperty("project.home", null);
8583
if(projectHome != null && projectHome.length() > 0)
8684
{
87-
file = new File(new File(projectHome),db);
85+
file = new File(new File(projectHome), db);
8886
db = file.getAbsolutePath();
8987
}
9088
}
9189

92-
String url = "jdbc:sqlite:" + db;
93-
return appendUrlExtension(url);
90+
final String url = "jdbc:sqlite:" + db;
91+
return this.appendUrlExtension(url);
9492
}
9593

96-
9794
/**
9895
* @see com.xdev.jadoth.sqlengine.dbms.DbmsConnectionInformation#getJdbcDriverClassName()
9996
*/

‎src/main/java/xdev/db/sqlite/jdbc/SQLiteDDLMapper.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
*/
1818
package xdev.db.sqlite.jdbc;
1919

20-
21-
22-
2320
import com.xdev.jadoth.sqlengine.dbms.standard.StandardDDLMapper;
2421

2522

‎src/main/java/xdev/db/sqlite/jdbc/SQLiteDMLAssembler.java

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
*/
1818
package xdev.db.sqlite.jdbc;
1919

20-
21-
22-
2320
import static com.xdev.jadoth.sqlengine.internal.QueryPart.ASEXPRESSION;
2421
import static com.xdev.jadoth.sqlengine.internal.QueryPart.indent;
2522
import static com.xdev.jadoth.sqlengine.internal.QueryPart.isSingleLine;
@@ -29,44 +26,46 @@
2926
import com.xdev.jadoth.sqlengine.internal.SqlExpression;
3027
import com.xdev.jadoth.sqlengine.internal.SqlFunctionMOD;
3128

29+
3230
public class SQLiteDMLAssembler extends StandardDMLAssembler<SQLiteDbms>
3331
{
3432
public SQLiteDMLAssembler(final SQLiteDbms dbms)
3533
{
3634
super(dbms);
3735
}
3836

39-
4037
// /////////////////////////////////////////////////////////////////////////
4138
// override methods //
4239
// ///////////////////
40+
4341
/**
4442
* @see StandardDMLAssembler#assembleSELECT(SELECT, StringBuilder, int, int, String, String)
4543
*/
4644
@Override
47-
protected StringBuilder assembleSELECT(final SELECT query, final StringBuilder sb,
48-
final int indentLevel, final int flags, final String clauseSeperator,
49-
final String newLine)
45+
protected StringBuilder assembleSELECT(
46+
final SELECT query, final StringBuilder sb,
47+
final int indentLevel, final int flags, final String clauseSeperator,
48+
final String newLine)
5049
{
51-
indent(sb,indentLevel,isSingleLine(flags)).append(query.keyword());
50+
indent(sb, indentLevel, isSingleLine(flags)).append(query.keyword());
5251

53-
this.assembleSelectDISTINCT(query,sb,indentLevel,flags);
54-
this.assembleSelectItems(query,sb,flags,indentLevel,newLine);
55-
this.assembleSelectSqlClauses(query,sb,indentLevel,flags | ASEXPRESSION,clauseSeperator, newLine);
56-
this.assembleAppendSELECTs(query,sb,indentLevel,flags,clauseSeperator,newLine);
57-
this.assembleSelectRowLimit(query,sb,flags,clauseSeperator,newLine,indentLevel);
52+
this.assembleSelectDISTINCT(query, sb, indentLevel, flags);
53+
this.assembleSelectItems(query, sb, flags, indentLevel, newLine);
54+
this.assembleSelectSqlClauses(query, sb, indentLevel, flags | ASEXPRESSION, clauseSeperator, newLine);
55+
this.assembleAppendSELECTs(query, sb, indentLevel, flags, clauseSeperator, newLine);
56+
this.assembleSelectRowLimit(query, sb, flags, clauseSeperator, newLine, indentLevel);
5857

5958
return sb;
6059
}
6160

62-
6361
/**
6462
* @see StandardDMLAssembler#assembleSelectRowLimit(SELECT, StringBuilder, int, String, String, int)
6563
*/
6664
@Override
67-
protected StringBuilder assembleSelectRowLimit(final SELECT query, final StringBuilder sb,
68-
final int flags, final String clauseSeperator, final String newLine,
69-
final int indentLevel)
65+
protected StringBuilder assembleSelectRowLimit(
66+
final SELECT query, final StringBuilder sb,
67+
final int flags, final String clauseSeperator, final String newLine,
68+
final int indentLevel)
7069
{
7170
final Integer offset = query.getOffsetSkipCount();
7271
final Integer limit = query.getFetchFirstRowCount();
@@ -90,10 +89,10 @@ else if(limit != null)
9089
return sb;
9190
}
9291

93-
9492
@Override
95-
public void assembleExpression(final SqlExpression expression, final StringBuilder sb,
96-
final int indentLevel, final int flags)
93+
public void assembleExpression(
94+
final SqlExpression expression, final StringBuilder sb,
95+
final int indentLevel, final int flags)
9796
{
9897

9998
if(expression instanceof SqlFunctionMOD)
@@ -104,8 +103,7 @@ public void assembleExpression(final SqlExpression expression, final StringBuild
104103
}
105104
else
106105
{
107-
super.assembleExpression(expression,sb,indentLevel,flags);
106+
super.assembleExpression(expression, sb, indentLevel, flags);
108107
}
109108
}
110-
111109
}

‎src/main/java/xdev/db/sqlite/jdbc/SQLiteDbms.java

Lines changed: 17 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,27 @@
1717
*/
1818
package xdev.db.sqlite.jdbc;
1919

20-
21-
2220
import com.xdev.jadoth.sqlengine.dbms.DbmsAdaptor;
2321
import com.xdev.jadoth.sqlengine.dbms.SQLExceptionParser;
2422
import com.xdev.jadoth.sqlengine.internal.DatabaseGateway;
2523
import com.xdev.jadoth.sqlengine.internal.tables.SqlTableIdentity;
2624

25+
2726
public class SQLiteDbms
28-
extends
29-
DbmsAdaptor.Implementation<SQLiteDbms, SQLiteDMLAssembler, SQLiteDDLMapper, SQLiteRetrospectionAccessor, SQLiteSyntax>
27+
extends
28+
DbmsAdaptor.Implementation<SQLiteDbms, SQLiteDMLAssembler, SQLiteDDLMapper, SQLiteRetrospectionAccessor,
29+
SQLiteSyntax>
3030
{
3131
// /////////////////////////////////////////////////////////////////////////
3232
// constants //
3333
// ///////////////////
3434

35-
/** The Constant MAX_VARCHAR_LENGTH. */
36-
protected static final int MAX_VARCHAR_LENGTH = Integer.MAX_VALUE;
37-
38-
protected static final char IDENTIFIER_DELIMITER = '"';
39-
40-
public static final SQLiteSyntax SYNTAX = new SQLiteSyntax();
41-
35+
public static final SQLiteSyntax SYNTAX = new SQLiteSyntax();
36+
/**
37+
* The Constant MAX_VARCHAR_LENGTH.
38+
*/
39+
protected static final int MAX_VARCHAR_LENGTH = Integer.MAX_VALUE;
40+
protected static final char IDENTIFIER_DELIMITER = '"';
4241

4342
// /////////////////////////////////////////////////////////////////////////
4443
// constructors //
@@ -49,42 +48,37 @@ public SQLiteDbms()
4948
this(new SQLExceptionParser.Body());
5049
}
5150

52-
5351
/**
54-
* @param sqlExceptionParser
55-
* the sql exception parser
52+
* @param sqlExceptionParser the sql exception parser
5653
*/
5754
public SQLiteDbms(final SQLExceptionParser sqlExceptionParser)
5855
{
59-
super(sqlExceptionParser,false);
56+
super(sqlExceptionParser, false);
6057
this.setRetrospectionAccessor(new SQLiteRetrospectionAccessor(this));
6158
this.setDMLAssembler(new SQLiteDMLAssembler(this));
6259
this.setSyntax(SYNTAX);
6360
}
6461

65-
6662
/**
6763
* @see DbmsAdaptor#createConnectionInformation(String, int, String, String, String, String)
6864
*/
6965
@Override
70-
public SQLiteConnectionInformation createConnectionInformation(final String host,
71-
final int port, final String user, final String password, final String catalog, final String properties)
66+
public SQLiteConnectionInformation createConnectionInformation(
67+
final String host,
68+
final int port, final String user, final String password, final String catalog, final String properties)
7269
{
73-
return new SQLiteConnectionInformation(catalog,properties, this);
70+
return new SQLiteConnectionInformation(catalog, properties, this);
7471
}
7572

76-
7773
/**
78-
* HSQL does not support any means of calculating table columns selectivity
79-
* as far as it is known.
74+
* HSQL does not support any means of calculating table columns selectivity as far as it is known.
8075
*/
8176
@Override
8277
public Object updateSelectivity(final SqlTableIdentity table)
8378
{
8479
return null;
8580
}
8681

87-
8882
/**
8983
* @see DbmsAdaptor#assembleTransformBytes(byte[], StringBuilder)
9084
*/
@@ -94,7 +88,6 @@ public StringBuilder assembleTransformBytes(final byte[] bytes, final StringBuil
9488
return null;
9589
}
9690

97-
9891
/**
9992
* @see com.xdev.jadoth.sqlengine.dbms.DbmsAdaptor.Implementation#getRetrospectionAccessor()
10093
*/
@@ -104,7 +97,6 @@ public SQLiteRetrospectionAccessor getRetrospectionAccessor()
10497
throw new RuntimeException("HSQL Retrospection not implemented yet!");
10598
}
10699

107-
108100
/**
109101
* @see com.xdev.jadoth.sqlengine.dbms.DbmsAdaptor#initialize(com.xdev.jadoth.sqlengine.internal.DatabaseGateway)
110102
*/
@@ -113,7 +105,6 @@ public void initialize(final DatabaseGateway<SQLiteDbms> dbc)
113105
{
114106
}
115107

116-
117108
/**
118109
* @see com.xdev.jadoth.sqlengine.dbms.DbmsAdaptor#rebuildAllIndices(java.lang.String)
119110
*/
@@ -123,14 +114,12 @@ public Object rebuildAllIndices(final String fullQualifiedTableName)
123114
return null;
124115
}
125116

126-
127117
@Override
128118
public boolean supportsOFFSET_ROWS()
129119
{
130120
return true;
131121
}
132122

133-
134123
/**
135124
* @see com.xdev.jadoth.sqlengine.dbms.DbmsAdaptor#getMaxVARCHARlength()
136125
*/
@@ -140,7 +129,6 @@ public int getMaxVARCHARlength()
140129
return MAX_VARCHAR_LENGTH;
141130
}
142131

143-
144132
@Override
145133
public char getIdentifierDelimiter()
146134
{

‎src/main/java/xdev/db/sqlite/jdbc/SQLiteExceptionParser.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,17 @@
1717
*/
1818
package xdev.db.sqlite.jdbc;
1919

20-
21-
22-
2320
import java.sql.SQLException;
2421

2522
import com.xdev.jadoth.sqlengine.dbms.SQLExceptionParser;
2623
import com.xdev.jadoth.sqlengine.exceptions.SQLEngineException;
2724

2825

29-
3026
public class SQLiteExceptionParser implements SQLExceptionParser
3127
{
3228
@Override
33-
public SQLEngineException parseSQLException(SQLException e)
29+
public SQLEngineException parseSQLException(final SQLException e)
3430
{
3531
return new SQLEngineException(e);
3632
}
37-
3833
}

0 commit comments

Comments
 (0)