Skip to content

Commit 799093f

Browse files
karenc-bqkarenc-bq
authored
fix: update copyright license and fix failing checkstyle tasksayl (#12)
1 parent 1c572bf commit 799093f

File tree

116 files changed

+1166
-1385
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

+1166
-1385
lines changed

‎.github/workflows/main.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ jobs:
3939
uses: actions/upload-artifact@v3
4040
with:
4141
name: 'junit-report'
42-
path: ./driver-proxy/build/reports/tests/test/
42+
path: ./wrapper/build/reports/tests/test/
4343
retention-days: 3
4444

4545
- name: 'Archive Coverage Report'
4646
if: always()
4747
uses: actions/upload-artifact@v3
4848
with:
4949
name: 'coverage-report'
50-
path: ./driver-proxy/build/reports/jacoco/test/
50+
path: ./wrapper/build/reports/jacoco/test/
5151
retention-days: 3
5252

5353
aurora-postgres-integration-tests:
@@ -98,7 +98,7 @@ jobs:
9898
uses: actions/upload-artifact@v2
9999
with:
100100
name: 'junit-report'
101-
path: ./driver-proxy/build/reports/tests/
101+
path: ./wrapper/build/reports/tests/
102102
retention-days: 5
103103

104104
standard-postgres-integration-tests:
@@ -125,5 +125,5 @@ jobs:
125125
uses: actions/upload-artifact@v2
126126
with:
127127
name: 'junit-report'
128-
path: ./driver-proxy/build/reports/tests/
128+
path: ./wrapper/build/reports/tests/
129129
retention-days: 5

‎config/checkstyle/amazon.header‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
23
*
3-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
47
*
5-
* Licensed under the Apache License, Version 2.0 (the "License").
6-
* You may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8+
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
*
17-
*/
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/

‎config/checkstyle/google_checks.xml‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
1717
-->
1818

19-
<module name = "Checker">
19+
<module name="Checker">
2020
<property name="charset" value="UTF-8"/>
2121

2222
<property name="severity" value="warning"/>
@@ -48,6 +48,11 @@
4848

4949
<module name="SuppressWarningsFilter"/>
5050

51+
<module name="Header">
52+
<property name="headerFile" value="${config_loc}/amazon.header"/>
53+
<property name="fileExtensions" value="java"/>
54+
</module>
55+
5156
<module name="TreeWalker">
5257
<module name="SuppressWarningsHolder"/>
5358

@@ -261,14 +266,6 @@
261266
<property name="lineWrappingIndentation" value="4"/>
262267
<property name="arrayInitIndent" value="2"/>
263268
</module>
264-
<!-- <module name="AbbreviationAsWordInName">-->
265-
<!-- <property name="ignoreFinal" value="false"/>-->
266-
<!-- <property name="allowedAbbreviationLength" value="0"/>-->
267-
<!-- <property name="tokens"-->
268-
<!-- value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,-->
269-
<!-- PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,-->
270-
<!-- RECORD_COMPONENT_DEF"/>-->
271-
<!-- </module>-->
272269
<module name="NoWhitespaceBeforeCaseDefaultColon"/>
273270
<module name="OverloadMethodsDeclarationOrder"/>
274271
<module name="VariableDeclarationUsageDistance"/>
@@ -336,20 +333,6 @@
336333
<property name="allowedAnnotations" value="Override, Test"/>
337334
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
338335
</module>
339-
<!-- <module name="MissingJavadocMethod">-->
340-
<!-- <property name="scope" value="public"/>-->
341-
<!-- <property name="minLineCount" value="2"/>-->
342-
<!-- <property name="allowedAnnotations" value="Override, Test"/>-->
343-
<!-- <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,-->
344-
<!-- COMPACT_CTOR_DEF"/>-->
345-
<!-- </module>-->
346-
<!-- <module name="MissingJavadocType">-->
347-
<!-- <property name="scope" value="protected"/>-->
348-
<!-- <property name="tokens"-->
349-
<!-- value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,-->
350-
<!-- RECORD_DEF, ANNOTATION_DEF"/>-->
351-
<!-- <property name="excludeScope" value="nothing"/>-->
352-
<!-- </module>-->
353336
<module name="MethodName">
354337
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
355338
<message key="name.invalidPattern"
@@ -369,8 +352,4 @@
369352
<property name="optional" value="true"/>
370353
</module>
371354
</module>
372-
<module name="Header">
373-
<property name="headerFile" value="config/checkstyle/amazon.header"/>
374-
<property name="fileExtensions" value="java"/>
375-
</module>
376355
</module>

‎wrapper/src/main/java/com/amazon/awslabs/jdbc/ConnectionPlugin.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
23
*
3-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
47
*
5-
* Licensed under the Apache License, Version 2.0 (the "License").
6-
* You may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
8+
* http://www.apache.org/licenses/LICENSE-2.0
169
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1715
*/
1816

1917
package com.amazon.awslabs.jdbc;

‎wrapper/src/main/java/com/amazon/awslabs/jdbc/ConnectionPluginFactory.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
23
*
3-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
47
*
5-
* Licensed under the Apache License, Version 2.0 (the "License").
6-
* You may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8+
* http://www.apache.org/licenses/LICENSE-2.0
89
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1715
*/
1816

1917
package com.amazon.awslabs.jdbc;

‎wrapper/src/main/java/com/amazon/awslabs/jdbc/ConnectionPluginManager.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
23
*
3-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
47
*
5-
* Licensed under the Apache License, Version 2.0 (the "License").
6-
* You may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
8+
* http://www.apache.org/licenses/LICENSE-2.0
169
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1715
*/
1816

1917
package com.amazon.awslabs.jdbc;

‎wrapper/src/main/java/com/amazon/awslabs/jdbc/ConnectionPropertyNames.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
23
*
3-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
47
*
5-
* Licensed under the Apache License, Version 2.0 (the "License").
6-
* You may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
8+
* http://www.apache.org/licenses/LICENSE-2.0
169
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1715
*/
1816

1917
package com.amazon.awslabs.jdbc;

‎wrapper/src/main/java/com/amazon/awslabs/jdbc/ConnectionProvider.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
23
*
3-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
47
*
5-
* Licensed under the Apache License, Version 2.0 (the "License").
6-
* You may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
8+
* http://www.apache.org/licenses/LICENSE-2.0
169
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1715
*/
1816

1917
package com.amazon.awslabs.jdbc;

‎wrapper/src/main/java/com/amazon/awslabs/jdbc/DataSourceConnectionProvider.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
23
*
3-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
47
*
5-
* Licensed under the Apache License, Version 2.0 (the "License").
6-
* You may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
8+
* http://www.apache.org/licenses/LICENSE-2.0
169
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1715
*/
1816

1917
package com.amazon.awslabs.jdbc;

‎wrapper/src/main/java/com/amazon/awslabs/jdbc/Driver.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/*
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
23
*
3-
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License").
5+
* You may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
47
*
5-
* Licensed under the Apache License, Version 2.0 (the "License").
6-
* You may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
8+
* http://www.apache.org/licenses/LICENSE-2.0
169
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1715
*/
1816

1917
package com.amazon.awslabs.jdbc;

0 commit comments

Comments
 (0)