Skip to content

Commit 648935b

Browse files
committed
[ci] Run whitespace-maven-plugin to trim excessive space
no-op action. This trims all trailing space which results in little to see on git. This is another attempt at aligning code for future locking of formatting into builds. This plugin can do more than simply java files so it has cleared issues in xml and some deeper issues in at least two of the site pages which seemed to cause license header to post twice.
1 parent efa1805 commit 648935b

File tree

265 files changed

+1755
-1757
lines changed

Some content is hidden

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

265 files changed

+1755
-1757
lines changed

src/main/java/org/apache/ibatis/annotations/CacheNamespace.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2016 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -41,13 +41,13 @@
4141
int size() default 1024;
4242

4343
boolean readWrite() default true;
44-
44+
4545
boolean blocking() default false;
4646

4747
/**
4848
* Property values for a implementation object.
4949
* @since 3.4.2
5050
*/
5151
Property[] properties() default {};
52-
52+
5353
}

src/main/java/org/apache/ibatis/annotations/Mapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2018 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
2525

2626
/**
2727
* Marker interface for MyBatis mappers
28-
*
28+
*
2929
* @author Frank David Martínez
3030
*/
3131
@Documented

src/main/java/org/apache/ibatis/annotations/Options.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2018 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -61,6 +61,6 @@ enum FlushCachePolicy {
6161
String keyProperty() default "";
6262

6363
String keyColumn() default "";
64-
64+
6565
String resultSets() default "";
6666
}

src/main/java/org/apache/ibatis/annotations/ResultType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2016 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
2626
* ResultHandler. Those methods must have void return type, so
2727
* this annotation can be used to tell MyBatis what kind of object
2828
* it should build for each row.
29-
*
29+
*
3030
* @since 3.2.0
3131
* @author Jeff Butler
3232
*/

src/main/java/org/apache/ibatis/binding/MapperMethod.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2018 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ public Object execute(SqlSession sqlSession, Object[] args) {
9595
throw new BindingException("Unknown execution method for: " + command.getName());
9696
}
9797
if (result == null && method.getReturnType().isPrimitive() && !method.returnsVoid()) {
98-
throw new BindingException("Mapper method '" + command.getName()
98+
throw new BindingException("Mapper method '" + command.getName()
9999
+ " attempted to return null from a method with a primitive return type (" + method.getReturnType() + ").");
100100
}
101101
return result;
@@ -121,8 +121,8 @@ private void executeWithResultHandler(SqlSession sqlSession, Object[] args) {
121121
MappedStatement ms = sqlSession.getConfiguration().getMappedStatement(command.getName());
122122
if (!StatementType.CALLABLE.equals(ms.getStatementType())
123123
&& void.class.equals(ms.getResultMaps().get(0).getType())) {
124-
throw new BindingException("method " + command.getName()
125-
+ " needs either a @ResultMap annotation, a @ResultType annotation,"
124+
throw new BindingException("method " + command.getName()
125+
+ " needs either a @ResultMap annotation, a @ResultType annotation,"
126126
+ " or a resultType attribute in XML so a ResultHandler can be used as a parameter.");
127127
}
128128
Object param = method.convertArgsToSqlCommandParam(args);

src/main/java/org/apache/ibatis/binding/MapperRegistry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2018 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public <T> T getMapper(Class<T> type, SqlSession sqlSession) {
5252
throw new BindingException("Error getting mapper instance. Cause: " + e, e);
5353
}
5454
}
55-
55+
5656
public <T> boolean hasMapper(Class<T> type) {
5757
return knownMappers.containsKey(type);
5858
}
@@ -104,5 +104,5 @@ public void addMappers(String packageName, Class<?> superType) {
104104
public void addMappers(String packageName) {
105105
addMappers(packageName, Object.class);
106106
}
107-
107+
108108
}

src/main/java/org/apache/ibatis/builder/ParameterExpression.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2016 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919

2020
/**
2121
* Inline parameter expression parser. Supported grammar (simplified):
22-
*
22+
*
2323
* <pre>
2424
* inline-parameter = (propertyName | expression) oldJdbcType attributes
2525
* propertyName = /expression language's property navigation path/

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2018 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -170,7 +170,7 @@ private void loadXmlResource() {
170170
// #1347
171171
InputStream inputStream = type.getResourceAsStream("/" + xmlResource);
172172
if (inputStream == null) {
173-
// Search XML mapper that is not in the module but in the classpath.
173+
// Search XML mapper that is not in the module but in the classpath.
174174
try {
175175
inputStream = Resources.getResourceAsStream(type.getClassLoader(), xmlResource);
176176
} catch (IOException e2) {
@@ -388,7 +388,7 @@ void parseStatement(Method method) {
388388
options != null ? nullOrEmpty(options.resultSets()) : null);
389389
}
390390
}
391-
391+
392392
private LanguageDriver getLanguageDriver(Method method) {
393393
Lang lang = method.getAnnotation(Lang.class);
394394
Class<? extends LanguageDriver> langClass = null;
@@ -570,7 +570,7 @@ private void applyResults(Result[] results, Class<?> resultType, List<ResultMapp
570570
resultMappings.add(resultMapping);
571571
}
572572
}
573-
573+
574574
private String nestedSelectId(Result result) {
575575
String nestedSelect = result.one().select();
576576
if (nestedSelect.length() < 1) {
@@ -591,12 +591,12 @@ private boolean isLazy(Result result) {
591591
}
592592
return isLazy;
593593
}
594-
594+
595595
private boolean hasNestedSelect(Result result) {
596596
if (result.one().select().length() > 0 && result.many().select().length() > 0) {
597597
throw new BuilderException("Cannot use both @One and @Many annotations in the same @Result");
598598
}
599-
return result.one().select().length() > 0 || result.many().select().length() > 0;
599+
return result.one().select().length() > 0 || result.many().select().length() > 0;
600600
}
601601

602602
private void applyConstructorArgs(Arg[] args, Class<?> resultType, List<ResultMapping> resultMappings) {

src/main/java/org/apache/ibatis/builder/xml/XMLIncludeTransformer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2009-2018 the original author or authors.
2+
* Copyright 2009-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -105,7 +105,7 @@ private String getStringAttribute(Node node, String name) {
105105
}
106106

107107
/**
108-
* Read placeholders and their values from include node definition.
108+
* Read placeholders and their values from include node definition.
109109
* @param node Include node instance
110110
* @param inheritedVariablesContext Current context used for replace variables in new variables values
111111
* @return variables context from include instance (no inherited values)

src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ private void sqlElement(List<XNode> list, String requiredDatabaseId) {
352352
}
353353
}
354354
}
355-
355+
356356
private boolean databaseIdMatchesCurrent(String id, String databaseId, String requiredDatabaseId) {
357357
if (requiredDatabaseId != null) {
358358
if (!requiredDatabaseId.equals(databaseId)) {

0 commit comments

Comments
 (0)