Skip to content

Commit 5233ec0

Browse files
committed
[ci] Remove trailing spaces and fix obvious indentation issues
1 parent d9cf83c commit 5233ec0

File tree

116 files changed

+493
-496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+493
-496
lines changed

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ConnectionFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.Properties;
2121

2222
public interface ConnectionFactory {
23+
2324
/**
2425
* Should return a connection to the database in use for this context.
2526
* The generator will call this method only one time for each context.

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/DAOMethodNameCalculator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*
2424
*/
2525
public interface DAOMethodNameCalculator {
26-
26+
2727
/**
2828
* Calculates and returns a name for the insert method.
2929
*

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/FullyQualifiedTable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public FullyQualifiedTable(String introspectedCatalog,
9999
this.runtimeCatalog = runtimeCatalog;
100100
this.runtimeSchema = runtimeSchema;
101101
this.runtimeTableName = runtimeTableName;
102-
102+
103103
if (stringHasValue(domainObjectName)) {
104104
int index = domainObjectName.lastIndexOf('.');
105105
if (index == -1) {
@@ -331,7 +331,7 @@ public String getSubPackageForClientOrSqlMap(boolean isSubPackagesEnabled) {
331331
sb.append(introspectedSchema.toLowerCase());
332332
}
333333
}
334-
334+
335335
// TODO - strip characters that are not valid in package names
336336
return sb.toString();
337337
}
@@ -351,7 +351,7 @@ public String getSubPackageForClientOrSqlMap(boolean isSubPackagesEnabled) {
351351
public String getSubPackageForModel(boolean isSubPackagesEnabled) {
352352
StringBuilder sb = new StringBuilder();
353353
sb.append(getSubPackageForClientOrSqlMap(isSubPackagesEnabled));
354-
354+
355355
if (stringHasValue(domainObjectSubPackage)) {
356356
sb.append('.');
357357
sb.append(domainObjectSubPackage);

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/GeneratedFile.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
*/
1616
package org.mybatis.generator.api;
1717

18-
1918
/**
2019
* Abstract class that holds information common to all generated files.
2120
*
2221
* @author Jeff Butler
2322
*/
2423
public abstract class GeneratedFile {
25-
24+
2625
/** The target project. */
2726
protected String targetProject;
2827

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/GeneratedJavaFile.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
* @author Jeff Butler
2424
*/
2525
public class GeneratedJavaFile extends GeneratedFile {
26-
26+
2727
/** The compilation unit. */
2828
private CompilationUnit compilationUnit;
29-
29+
3030
/** The file encoding. */
3131
private String fileEncoding;
32-
32+
3333
/** The java formatter. */
3434
private JavaFormatter javaFormatter;
3535

@@ -70,7 +70,7 @@ public GeneratedJavaFile(CompilationUnit compilationUnit,
7070
JavaFormatter javaFormatter) {
7171
this(compilationUnit, targetProject, null, javaFormatter);
7272
}
73-
73+
7474
/* (non-Javadoc)
7575
* @see org.mybatis.generator.api.GeneratedFile#getFormattedContent()
7676
*/

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/GeneratedXmlFile.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @author Jeff Butler
2424
*/
2525
public class GeneratedXmlFile extends GeneratedFile {
26-
26+
2727
/** The document. */
2828
private Document document;
2929

@@ -35,7 +35,7 @@ public class GeneratedXmlFile extends GeneratedFile {
3535

3636
/** The is mergeable. */
3737
private boolean isMergeable;
38-
38+
3939
/** The xml formatter. */
4040
private XmlFormatter xmlFormatter;
4141

@@ -101,7 +101,7 @@ public String getTargetPackage() {
101101
public boolean isMergeable() {
102102
return isMergeable;
103103
}
104-
104+
105105
public void setMergeable(boolean isMergeable) {
106106
this.isMergeable = isMergeable;
107107
}

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedColumn.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class IntrospectedColumn {
4242
protected int scale;
4343

4444
protected boolean identity;
45-
45+
4646
protected boolean isSequenceColumn;
4747

4848
protected String javaProperty;
@@ -65,17 +65,17 @@ public class IntrospectedColumn {
6565
protected String remarks;
6666

6767
protected String defaultValue;
68-
68+
6969
/**
7070
* true if the JDBC driver reports that this column is auto-increment.
7171
*/
7272
protected boolean isAutoIncrement;
73-
73+
7474
/**
7575
* true if the JDBC driver reports that this column is generated.
7676
*/
7777
protected boolean isGeneratedColumn;
78-
78+
7979
/**
8080
* True if there is a column override that defines this column as GENERATED ALWAYS.
8181
*/

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/IntrospectedTable.java

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,13 @@
4848
*
4949
*/
5050
public abstract class IntrospectedTable {
51-
51+
5252
public enum TargetRuntime {
5353
IBATIS2,
5454
MYBATIS3
5555
}
5656

5757
protected enum InternalAttribute {
58-
5958
ATTR_DAO_IMPLEMENTATION_TYPE,
6059
ATTR_DAO_INTERFACE_TYPE,
6160
ATTR_PRIMARY_KEY_TYPE,
@@ -98,19 +97,19 @@ protected enum InternalAttribute {
9897
}
9998

10099
protected TableConfiguration tableConfiguration;
101-
100+
102101
protected FullyQualifiedTable fullyQualifiedTable;
103-
102+
104103
protected Context context;
105-
104+
106105
protected Rules rules;
107-
106+
108107
protected List<IntrospectedColumn> primaryKeyColumns;
109-
108+
110109
protected List<IntrospectedColumn> baseColumns;
111-
110+
112111
protected List<IntrospectedColumn> blobColumns;
113-
112+
114113
protected TargetRuntime targetRuntime;
115114

116115
/**
@@ -121,12 +120,12 @@ protected enum InternalAttribute {
121120

122121
/** Internal attributes are used to store commonly accessed items by all code generators. */
123122
protected Map<IntrospectedTable.InternalAttribute, String> internalAttributes;
124-
123+
125124
/**
126125
* Table remarks retrieved from database metadata.
127126
*/
128127
protected String remarks;
129-
128+
130129
/**
131130
* Table type retrieved from database metadata.
132131
*/
@@ -402,15 +401,15 @@ public String getMyBatis3SqlMapNamespace() {
402401
if (namespace == null) {
403402
namespace = getMyBatis3FallbackSqlMapNamespace();
404403
}
405-
404+
406405
return namespace;
407406
}
408-
407+
409408
public String getMyBatis3FallbackSqlMapNamespace() {
410409
return internalAttributes
411410
.get(InternalAttribute.ATTR_MYBATIS3_FALLBACK_SQL_MAP_NAMESPACE);
412411
}
413-
412+
414413
/**
415414
* Calculates the package for the current table.
416415
*
@@ -523,7 +522,7 @@ protected void calculateXmlAttributes() {
523522

524523
setIbatis2SqlMapNamespace(calculateIbatis2SqlMapNamespace());
525524
setMyBatis3FallbackSqlMapNamespace(calculateMyBatis3FallbackSqlMapNamespace());
526-
525+
527526
setSqlMapFullyQualifiedRuntimeTableName(calculateSqlMapFullyQualifiedRuntimeTableName());
528527
setSqlMapAliasedFullyQualifiedRuntimeTableName(calculateSqlMapAliasedFullyQualifiedRuntimeTableName());
529528

@@ -783,7 +782,7 @@ protected String calculateJavaClientImplementationPackage() {
783782

784783
return sb.toString();
785784
}
786-
785+
787786
private boolean isSubPackagesEnabled(PropertyHolder propertyHolder) {
788787
return isTrue(propertyHolder.getProperty(PropertyRegistry.ANY_ENABLE_SUB_PACKAGES));
789788
}
@@ -936,7 +935,7 @@ protected String calculateMyBatis3XmlMapperFileName() {
936935
protected String calculateIbatis2SqlMapNamespace() {
937936
return fullyQualifiedTable.getIbatis2SqlMapNamespace();
938937
}
939-
938+
940939
protected String calculateMyBatis3FallbackSqlMapNamespace() {
941940
StringBuilder sb = new StringBuilder();
942941
sb.append(calculateSqlMapPackage());
@@ -1076,7 +1075,7 @@ public void setIbatis2SqlMapNamespace(String sqlMapNamespace) {
10761075
InternalAttribute.ATTR_IBATIS2_SQL_MAP_NAMESPACE,
10771076
sqlMapNamespace);
10781077
}
1079-
1078+
10801079
public void setMyBatis3FallbackSqlMapNamespace(String sqlMapNamespace) {
10811080
internalAttributes.put(
10821081
InternalAttribute.ATTR_MYBATIS3_FALLBACK_SQL_MAP_NAMESPACE,
@@ -1148,29 +1147,29 @@ public TargetRuntime getTargetRuntime() {
11481147

11491148
public boolean isImmutable() {
11501149
Properties properties;
1151-
1150+
11521151
if (tableConfiguration.getProperties().containsKey(PropertyRegistry.ANY_IMMUTABLE)) {
11531152
properties = tableConfiguration.getProperties();
11541153
} else {
11551154
properties = context.getJavaModelGeneratorConfiguration().getProperties();
11561155
}
1157-
1156+
11581157
return isTrue(properties.getProperty(PropertyRegistry.ANY_IMMUTABLE));
11591158
}
1160-
1159+
11611160
public boolean isConstructorBased() {
11621161
if (isImmutable()) {
11631162
return true;
11641163
}
1165-
1164+
11661165
Properties properties;
1167-
1166+
11681167
if (tableConfiguration.getProperties().containsKey(PropertyRegistry.ANY_CONSTRUCTOR_BASED)) {
11691168
properties = tableConfiguration.getProperties();
11701169
} else {
11711170
properties = context.getJavaModelGeneratorConfiguration().getProperties();
11721171
}
1173-
1172+
11741173
return isTrue(properties.getProperty(PropertyRegistry.ANY_CONSTRUCTOR_BASED));
11751174
}
11761175

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/MyBatisGenerator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ private void writeGeneratedXmlFile(GeneratedXmlFile gxf, ProgressCallback callba
366366
warnings.add(e.getMessage());
367367
}
368368
}
369-
369+
370370
/**
371371
* Writes, or overwrites, the contents of the specified file.
372372
*
@@ -387,7 +387,7 @@ private void writeFile(File file, String content, String fileEncoding) throws IO
387387
} else {
388388
osw = new OutputStreamWriter(fos, fileEncoding);
389389
}
390-
390+
391391
BufferedWriter bw = new BufferedWriter(osw);
392392
bw.write(content);
393393
bw.close();

core/mybatis-generator-core/src/main/java/org/mybatis/generator/api/ShellCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @author Jeff Butler
3434
*/
3535
public interface ShellCallback {
36-
36+
3737
/**
3838
* This method is called to ask the shell to resolve a project/package combination into a directory on the file
3939
* system. This method is called repeatedly (once for each generated file), so it would be wise for an implementing

0 commit comments

Comments
 (0)