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

Commit d962b2b

Browse files
JohannesRabauerJohannesRabauer
committed
Cleanup
1 parent 14df1d9 commit d962b2b

11 files changed

+632
-691
lines changed

‎pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/POM/4.0.0"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

@@ -10,13 +10,13 @@
1010
<packaging>jar</packaging>
1111

1212
<name>SqlEngine Database Adapter Ingres</name>
13-
<description>XAPI SqlEngine Database Adapter for Ingres</description>
14-
<url>https://github.com/xdev-software/xapi-db-ingres</url>
13+
<description>XAPI SqlEngine Database Adapter for Ingres</description>
14+
<url>https://github.com/xdev-software/xapi-db-ingres</url>
1515

1616
<scm>
17-
<url>https://github.com/xdev-software/xapi-db-ingres</url>
18-
<connection>https://github.com/xdev-software/xapi-db-ingres.git</connection>
19-
</scm>
17+
<url>https://github.com/xdev-software/xapi-db-ingres</url>
18+
<connection>https://github.com/xdev-software/xapi-db-ingres.git</connection>
19+
</scm>
2020

2121
<inceptionYear>2003</inceptionYear>
2222

@@ -48,7 +48,7 @@
4848

4949
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5050
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
51-
51+
5252
<xdev.xapi.version>6.0.1</xdev.xapi.version>
5353
</properties>
5454

‎src/main/java/xdev/db/ingres/jdbc/IngresConnectionInformation.java‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
*/
1818
package xdev.db.ingres.jdbc;
1919

20-
21-
22-
2320
import com.xdev.jadoth.sqlengine.dbms.DbmsConnectionInformation;
21+
2422
import xdev.db.ConnectionInformation;
2523

2624

@@ -30,45 +28,42 @@ public class IngresConnectionInformation extends ConnectionInformation<IngresDbm
3028
// constructors //
3129
// ///////////////////
3230

33-
public IngresConnectionInformation(final String host, final int port, final String user,
34-
final String password, final String database, final String urlExtension,
35-
final IngresDbms dbmsAdaptor)
31+
public IngresConnectionInformation(
32+
final String host, final int port, final String user,
33+
final String password, final String database, final String urlExtension,
34+
final IngresDbms dbmsAdaptor)
3635
{
37-
super(host,port,user,password,database,urlExtension,dbmsAdaptor);
36+
super(host, port, user, password, database, urlExtension, dbmsAdaptor);
3837
}
3938

40-
4139
// /////////////////////////////////////////////////////////////////////////
4240
// getters //
4341
// ///////////////////
4442

4543
/**
4644
* Gets the database.
47-
*
45+
*
4846
* @return the database
4947
*/
5048
public String getDatabase()
5149
{
5250
return this.getCatalog();
5351
}
5452

55-
5653
// /////////////////////////////////////////////////////////////////////////
5754
// setters //
5855
// ///////////////////
5956

6057
/**
6158
* Sets the database.
62-
*
63-
* @param database
64-
* the database to set
59+
*
60+
* @param database the database to set
6561
*/
6662
public void setDatabase(final String database)
6763
{
68-
setCatalog(database);
64+
this.setCatalog(database);
6965
}
7066

71-
7267
// /////////////////////////////////////////////////////////////////////////
7368
// override methods //
7469
// ///////////////////
@@ -79,22 +74,21 @@ public void setDatabase(final String database)
7974
@Override
8075
public String createJdbcConnectionUrl()
8176
{
82-
String user = getUser();
83-
String pwd = getPassword();
84-
String url;
77+
final String user = this.getUser();
78+
final String pwd = this.getPassword();
79+
final String url;
8580
if((user == null || user.length() == 0) && (pwd == null || pwd.length() == 0))
8681
{
87-
url = "jdbc:ingres://" + getHost() + ":" + getPort() + "/" + getCatalog();
82+
url = "jdbc:ingres://" + this.getHost() + ":" + this.getPort() + "/" + this.getCatalog();
8883
}
8984
else
9085
{
91-
url = "jdbc:ingres://" + getHost() + ":" + getPort() + "/" + getCatalog() + ";UID="
92-
+ user + ";PWD=" + pwd;
86+
url = "jdbc:ingres://" + this.getHost() + ":" + this.getPort() + "/" + this.getCatalog() + ";UID="
87+
+ user + ";PWD=" + pwd;
9388
}
94-
return appendUrlExtension(url);
89+
return this.appendUrlExtension(url);
9590
}
9691

97-
9892
/**
9993
* @return
10094
* @see DbmsConnectionInformation#getJdbcDriverClassName()

‎src/main/java/xdev/db/ingres/jdbc/IngresDDLMapper.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,14 @@
1717
*/
1818
package xdev.db.ingres.jdbc;
1919

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

2522

2623
public class IngresDDLMapper extends StandardDDLMapper<IngresDbms>
2724
{
28-
29-
public IngresDDLMapper(IngresDbms dbmsAdaptor)
25+
26+
public IngresDDLMapper(final IngresDbms dbmsAdaptor)
3027
{
3128
super(dbmsAdaptor);
3229
}
33-
3430
}

‎src/main/java/xdev/db/ingres/jdbc/IngresDMLAssembler.java‎

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
package xdev.db.ingres.jdbc;
2020

21-
22-
23-
2421
import static com.xdev.jadoth.sqlengine.SQL.LANG.DEFAULT_VALUES;
2522
import static com.xdev.jadoth.sqlengine.SQL.Punctuation._;
2623
import static com.xdev.jadoth.sqlengine.SQL.Punctuation.dot;
@@ -42,6 +39,7 @@
4239
import com.xdev.jadoth.sqlengine.internal.interfaces.TableExpression;
4340
import com.xdev.jadoth.sqlengine.internal.tables.SqlTableIdentity;
4441

42+
4543
public class IngresDMLAssembler extends StandardDMLAssembler<IngresDbms>
4644
{
4745
// /////////////////////////////////////////////////////////////////////////
@@ -52,65 +50,65 @@ public IngresDMLAssembler(final IngresDbms dbms)
5250
super(dbms);
5351
}
5452

55-
5653
@Override
57-
public StringBuilder assembleColumn(final SqlColumn column, final StringBuilder sb,
58-
final int indentLevel, int flags)
54+
public StringBuilder assembleColumn(
55+
final SqlColumn column, final StringBuilder sb,
56+
final int indentLevel, int flags)
5957
{
6058
final TableExpression owner = column.getOwner();
6159

6260
final DbmsAdaptor<?> dbms = this.getDbmsAdaptor();
6361
final String columnName = column.getColumnName();
6462
final boolean delimColumn = (dbms.getConfiguration().isDelimitColumnIdentifiers() || QueryPart
65-
.isDelimitColumnIdentifiers(flags))
66-
&& (columnName != null && !"*".equals(columnName));
63+
.isDelimitColumnIdentifiers(flags))
64+
&& (columnName != null && !"*".equals(columnName));
6765
final char delimiter = dbms.getIdentifierDelimiter();
6866

6967
flags |= QueryPart.bitDelimitColumnIdentifiers(this.getDbmsAdaptor().getConfiguration()
70-
.isDelimitColumnIdentifiers());
68+
.isDelimitColumnIdentifiers());
7169

7270
if(owner != null && !QueryPart.isUnqualified(flags))
7371
{
74-
this.assembleColumnQualifier(column,sb,flags);
72+
this.assembleColumnQualifier(column, sb, flags);
7573
}
7674
if(delimColumn)
7775
{
7876
sb.append(delimiter);
7977
}
80-
QueryPart.assembleObject(column.getExpressionObject(),this,sb,indentLevel,flags);
78+
QueryPart.assembleObject(column.getExpressionObject(), this, sb, indentLevel, flags);
8179
if(delimColumn)
8280
{
8381
sb.append(delimiter);
8482
}
8583
return sb;
8684
}
8785

88-
8986
@Override
90-
public StringBuilder assembleColumnQualifier(final SqlColumn column, final StringBuilder sb,
91-
final int flags)
87+
public StringBuilder assembleColumnQualifier(
88+
final SqlColumn column, final StringBuilder sb,
89+
final int flags)
9290
{
9391
final TableExpression owner = column.getOwner();
9492
String qualifier = getAlias(owner);
9593
if(qualifier == null || QueryPart.isQualifyByTable(flags))
9694
{
9795
if(owner instanceof SqlTableIdentity)
9896
{
99-
return assembleTableIdentifier((SqlTableIdentity)owner,sb,0,flags).append(dot);
97+
return this.assembleTableIdentifier((SqlTableIdentity)owner, sb, 0, flags).append(dot);
10098
}
10199
else
102100
{
103101
qualifier = owner.toString();
104102
}
105103
}
106-
final char delimiter = getDbmsAdaptor().getIdentifierDelimiter();
104+
final char delimiter = this.getDbmsAdaptor().getIdentifierDelimiter();
107105
return sb.append(delimiter).append(qualifier).append(delimiter).append(dot);
108106
}
109107

110-
111108
@Override
112-
public StringBuilder assembleTableIdentifier(SqlTableIdentity table, StringBuilder sb,
113-
int indentLevel, int flags)
109+
public StringBuilder assembleTableIdentifier(
110+
final SqlTableIdentity table, final StringBuilder sb,
111+
final int indentLevel, final int flags)
114112
{
115113
final DbmsAdaptor<?> dbms = this.getDbmsAdaptor();
116114

@@ -122,9 +120,9 @@ public StringBuilder assembleTableIdentifier(SqlTableIdentity table, StringBuild
122120
if(schema != null)
123121
{
124122
sb.append(delimiter)
125-
.append(schema)
126-
.append(delimiter)
127-
.append(dot);
123+
.append(schema)
124+
.append(delimiter)
125+
.append(dot);
128126
}
129127
sb.append(delimiter)
130128
.append(name)
@@ -144,10 +142,10 @@ public StringBuilder assembleTableIdentifier(SqlTableIdentity table, StringBuild
144142
return sb;
145143
}
146144

147-
148145
// /////////////////////////////////////////////////////////////////////////
149146
// override methods //
150147
// ///////////////////
148+
151149
/**
152150
* @see StandardDMLAssembler#assembleSELECT(SELECT, StringBuilder, int, int, String, String)
153151
*/
@@ -160,17 +158,16 @@ protected StringBuilder assembleSELECT(
160158
final String clauseSeperator,
161159
final String newLine)
162160
{
163-
indent(sb,indentLevel,isSingleLine(flags)).append(query.keyword());
164-
this.assembleSelectDISTINCT(query,sb,indentLevel,flags);
165-
this.assembleSelectItems(query,sb,flags,indentLevel,newLine);
166-
this.assembleSelectSqlClauses(query,sb,indentLevel,flags | ASEXPRESSION,clauseSeperator,
167-
newLine);
168-
this.assembleAppendSELECTs(query,sb,indentLevel,flags,clauseSeperator,newLine);
169-
this.assembleSelectRowLimit(query,sb,flags,clauseSeperator,newLine,indentLevel);
161+
indent(sb, indentLevel, isSingleLine(flags)).append(query.keyword());
162+
this.assembleSelectDISTINCT(query, sb, indentLevel, flags);
163+
this.assembleSelectItems(query, sb, flags, indentLevel, newLine);
164+
this.assembleSelectSqlClauses(query, sb, indentLevel, flags | ASEXPRESSION, clauseSeperator,
165+
newLine);
166+
this.assembleAppendSELECTs(query, sb, indentLevel, flags, clauseSeperator, newLine);
167+
this.assembleSelectRowLimit(query, sb, flags, clauseSeperator, newLine, indentLevel);
170168
return sb;
171169
}
172170

173-
174171
/**
175172
* @see StandardDMLAssembler#assembleSelectRowLimit(SELECT, StringBuilder, int, String, String, int)
176173
*/
@@ -215,36 +212,36 @@ else if(offset != null)
215212
return sb;
216213
}
217214

218-
219215
@Override
220-
protected StringBuilder assembleINSERT(INSERT query, StringBuilder sb, int flags,
221-
String clauseSeperator, String newLine, int indentLevel)
216+
protected StringBuilder assembleINSERT(
217+
final INSERT query, final StringBuilder sb, final int flags,
218+
final String clauseSeperator, final String newLine, final int indentLevel)
222219
{
223-
indent(sb,indentLevel,isSingleLine(flags)).append(query.keyword()).append(_INTO_);
220+
indent(sb, indentLevel, isSingleLine(flags)).append(query.keyword()).append(_INTO_);
224221

225-
this.assembleTableIdentifier(query.getTable(),sb,indentLevel,flags | OMITALIAS);
222+
this.assembleTableIdentifier(query.getTable(), sb, indentLevel, flags | OMITALIAS);
226223
sb.append(newLine);
227224

228-
this.assembleAssignmentColumnsClause(query,query.getColumnsClause(),sb,indentLevel,flags
229-
| UNQUALIFIED);
225+
this.assembleAssignmentColumnsClause(query, query.getColumnsClause(), sb, indentLevel, flags
226+
| UNQUALIFIED);
230227
sb.append(newLine);
231228

232229
final SELECT valueSelect = query.filterSelect();
233230
if(valueSelect != null)
234231
{
235232
sb.append(clauseSeperator);
236-
QueryPart.assembleObject(valueSelect,this,sb,indentLevel,flags);
233+
QueryPart.assembleObject(valueSelect, this, sb, indentLevel, flags);
237234
}
238235
else
239236
{
240237
final AssignmentValuesClause values = query.getValuesClause();
241238
if(values != null)
242239
{
243-
this.assembleAssignmentValuesClause(query,values,sb,indentLevel,flags);
240+
this.assembleAssignmentValuesClause(query, values, sb, indentLevel, flags);
244241
}
245242
else
246243
{
247-
indent(sb,indentLevel,isSingleLine(flags)).append(DEFAULT_VALUES);
244+
indent(sb, indentLevel, isSingleLine(flags)).append(DEFAULT_VALUES);
248245
}
249246
}
250247

0 commit comments

Comments
 (0)