Skip to content

Commit b175c22

Browse files
authored
Merge pull request #2826 from hazendaz/copyright
More Eclipse based cleanups
2 parents 501db6e + 6c5c478 commit b175c22

Some content is hidden

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

47 files changed

+52
-87
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 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,6 @@ public class BindingException extends PersistenceException {
2525
private static final long serialVersionUID = 4300802238789381562L;
2626

2727
public BindingException() {
28-
super();
2928
}
3029

3130
public BindingException(String message) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ private static class PlainMethodInvoker implements MapperMethodInvoker {
134134
private final MapperMethod mapperMethod;
135135

136136
public PlainMethodInvoker(MapperMethod mapperMethod) {
137-
super();
138137
this.mapperMethod = mapperMethod;
139138
}
140139

@@ -148,7 +147,6 @@ private static class DefaultMethodInvoker implements MapperMethodInvoker {
148147
private final MethodHandle methodHandle;
149148

150149
public DefaultMethodInvoker(MethodHandle methodHandle) {
151-
super();
152150
this.methodHandle = methodHandle;
153151
}
154152

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 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,6 @@ public class BuilderException extends PersistenceException {
2525
private static final long serialVersionUID = -3885164021020443281L;
2626

2727
public BuilderException() {
28-
super();
2928
}
3029

3130
public BuilderException(String message) {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 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.
@@ -22,7 +22,6 @@ public class IncompleteElementException extends BuilderException {
2222
private static final long serialVersionUID = -3697292286890900315L;
2323

2424
public IncompleteElementException() {
25-
super();
2625
}
2726

2827
public IncompleteElementException(String message, Throwable cause) {

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ private void parseCacheRef() {
215215
if (refType != void.class && !refName.isEmpty()) {
216216
throw new BuilderException("Cannot use both value() and name() attribute in the @CacheNamespaceRef");
217217
}
218-
String namespace = (refType != void.class) ? refType.getName() : refName;
218+
String namespace = refType != void.class ? refType.getName() : refName;
219219
try {
220220
assistant.useCacheRef(namespace);
221221
} catch (IncompleteElementException e) {
@@ -462,8 +462,8 @@ private void applyResults(Result[] results, Class<?> resultType, List<ResultMapp
462462
flags.add(ResultFlag.ID);
463463
}
464464
@SuppressWarnings("unchecked")
465-
Class<? extends TypeHandler<?>> typeHandler = (Class<? extends TypeHandler<?>>) ((result
466-
.typeHandler() == UnknownTypeHandler.class) ? null : result.typeHandler());
465+
Class<? extends TypeHandler<?>> typeHandler = (Class<? extends TypeHandler<?>>) (result
466+
.typeHandler() == UnknownTypeHandler.class ? null : result.typeHandler());
467467
boolean hasNestedResultMap = hasNestedResultMap(result);
468468
ResultMapping resultMapping = assistant.buildResultMapping(resultType, nullOrEmpty(result.property()),
469469
nullOrEmpty(result.column()), result.javaType() == void.class ? null : result.javaType(),
@@ -657,14 +657,13 @@ public static Class<?> getMethodReturnType(String mapperFqn, String localStateme
657657
return null;
658658
}
659659

660-
private class AnnotationWrapper {
660+
private static class AnnotationWrapper {
661661
private final Annotation annotation;
662662
private final String databaseId;
663663
private final SqlCommandType sqlCommandType;
664664
private boolean dirtySelect;
665665

666666
AnnotationWrapper(Annotation annotation) {
667-
super();
668667
this.annotation = annotation;
669668
if (annotation instanceof Select) {
670669
databaseId = ((Select) annotation).databaseId();

src/main/java/org/apache/ibatis/cache/CacheException.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 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,6 @@ public class CacheException extends PersistenceException {
2525
private static final long serialVersionUID = -193202262468464650L;
2626

2727
public CacheException() {
28-
super();
2928
}
3029

3130
public CacheException(String message) {

src/main/java/org/apache/ibatis/cache/CacheKey.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ public class CacheKey implements Cloneable, Serializable {
3131

3232
public static final CacheKey NULL_CACHE_KEY = new CacheKey() {
3333

34+
private static final long serialVersionUID = 1L;
35+
3436
@Override
3537
public void update(Object object) {
3638
throw new CacheException("Not allowed to update a null cache key instance.");

src/main/java/org/apache/ibatis/cache/NullCacheKey.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public final class NullCacheKey extends CacheKey {
2626
private static final long serialVersionUID = 3704229911977019465L;
2727

2828
public NullCacheKey() {
29-
super();
3029
}
3130

3231
@Override

src/main/java/org/apache/ibatis/cache/decorators/LruCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 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.

src/main/java/org/apache/ibatis/datasource/DataSourceException.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2009-2022 the original author or authors.
2+
* Copyright 2009-2023 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,6 @@ public class DataSourceException extends PersistenceException {
2525
private static final long serialVersionUID = -5251396250407091334L;
2626

2727
public DataSourceException() {
28-
super();
2928
}
3029

3130
public DataSourceException(String message) {

0 commit comments

Comments
 (0)