Skip to content

Commit

Permalink
Merge pull request #2815 from hazendaz/copyright
Browse files Browse the repository at this point in the history
[ci] Fix end of line markers at end of file per git standards (ie emp…
  • Loading branch information
hazendaz authored Feb 20, 2023
2 parents 3505cc1 + 0183bad commit a99d783
Show file tree
Hide file tree
Showing 90 changed files with 174 additions and 174 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto
* text=auto
4 changes: 2 additions & 2 deletions src/main/java/org/apache/ibatis/builder/CacheRefResolver.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,4 +32,4 @@ public CacheRefResolver(MapperBuilderAssistant assistant, String cacheRefNamespa
public Cache resolveCacheRef() {
return assistant.useCacheRef(cacheRefNamespace);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -33,4 +33,4 @@ public void resolve() {
annotationBuilder.parseStatement(method);
}

}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -22,4 +22,4 @@ public interface ReflectorFactory {
void setClassCacheEnabled(boolean classCacheEnabled);

Reflector findForClass(Class<?> type);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -31,4 +31,4 @@ public boolean apply(DynamicContext context) {
return true;
}

}
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/type/BlobTypeHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ public byte[] getNullableResult(CallableStatement cs, int columnIndex) throws SQ
}
return returnValue;
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/org/apache/ibatis/type/EnumTypeHandler.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -60,4 +60,4 @@ public E getNullableResult(CallableStatement cs, int columnIndex) throws SQLExce
String s = cs.getString(columnIndex);
return s == null ? null : Enum.valueOf(type, s);
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/org/apache/ibatis/type/NClobTypeHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ private String toString(Clob clob) throws SQLException {
return clob == null ? null : clob.getSubString(1, (int) clob.length());
}

}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!--
Copyright 2009-2022 the original author or authors.
Copyright 2009-2023 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -114,4 +114,4 @@ class CDATA #IMPLIED
<!ELEMENT package EMPTY>
<!ATTLIST package
name CDATA #REQUIRED
>
>
4 changes: 2 additions & 2 deletions src/site/site.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2022 the original author or authors.
Copyright 2009-2023 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -53,4 +53,4 @@

<menu ref="reports"/>
</body>
</project>
</project>
4 changes: 2 additions & 2 deletions src/site/site_es.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2022 the original author or authors.
Copyright 2009-2023 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -55,4 +55,4 @@

<menu ref="reports"/>
</body>
</project>
</project>
4 changes: 2 additions & 2 deletions src/site/site_ja.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2022 the original author or authors.
Copyright 2009-2023 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -56,4 +56,4 @@

<menu ref="reports"/>
</body>
</project>
</project>
4 changes: 2 additions & 2 deletions src/site/site_ko.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2022 the original author or authors.
Copyright 2009-2023 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -53,4 +53,4 @@
</menu>
<menu ref="reports"/>
</body>
</project>
</project>
4 changes: 2 additions & 2 deletions src/site/site_zh.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2009-2022 the original author or authors.
Copyright 2009-2023 the original author or authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -53,4 +53,4 @@

<menu ref="reports"/>
</body>
</project>
</project>
4 changes: 2 additions & 2 deletions src/test/java/org/apache/ibatis/binding/WrongMapperTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,4 +29,4 @@ void shouldFailForBothOneAndMany() {
});
}

}
}
2 changes: 1 addition & 1 deletion src/test/java/org/apache/ibatis/domain/blog/Author.java
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,4 @@ public int hashCode() {
public String toString() {
return "Author : " + id + " : " + username + " : " + email;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,4 +29,4 @@ protected Executor createExecutor(Transaction transaction) {
return new CachingExecutor(new BatchExecutor(config, transaction));
}

}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,4 +29,4 @@ protected Executor createExecutor(Transaction transaction) {
return new CachingExecutor(new ReuseExecutor(config, transaction));
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -143,4 +143,4 @@ public void setActive(boolean active) {
this.active = active;
}

}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -28,4 +28,4 @@ public interface AwfulTableMapper {
int updateByPrimaryKeySelective(AwfulTable record);

int updateByPrimaryKey(AwfulTable record);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,4 +32,4 @@ public SimpleObject getSimpleObject() {
return parentSimpleObject;
}

}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -27,4 +27,4 @@ public interface MultiDbMapper {
void insert(User user);

void insert2(User user);
}
}
4 changes: 2 additions & 2 deletions src/test/java/org/apache/ibatis/submitted/multidb/User.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,4 +40,4 @@ public String getName() {
public void setName(String name) {
this.name = name;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,4 +37,4 @@ public List<Principal> getPrincipals() {
public void setPrincipals(List<Principal> principals) {
this.Principals = principals;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ public int getId() {
public void setId(final int id) {
this.id = id;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,4 +19,4 @@

public interface Mapper {
List<Person> findAll();
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -36,4 +36,4 @@ public List<Address> getAddresses() {
public void setAddresses(final List<Address> addresses) {
this.addresses = addresses;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -72,4 +72,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
// Unnecessary
}

}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -75,4 +75,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
assertNull(TYPE_HANDLER.getResult(cs, 1));
}

}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2022 the original author or authors.
* Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -72,4 +72,4 @@ public void shouldGetResultNullFromCallableStatement() throws Exception {
// Unnecessary
}

}
}
Loading

0 comments on commit a99d783

Please sign in to comment.