[java-plugin-storage-jdbc] branch main updated: GEN-269 - Replace code header
Scott Cantor
cantor.2 at osu.edu
Tue Aug 1 18:52:52 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-plugin-storage-jdbc.
View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-storage-jdbc.git;a=commit;h=52257e1aa504d967c4f7cc2934b3d34bf624d86c
The following commit(s) were added to refs/heads/main by this push:
new 52257e1 GEN-269 - Replace code header
52257e1 is described below
commit 52257e1aa504d967c4f7cc2934b3d34bf624d86c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 1 14:52:49 2023 -0400
GEN-269 - Replace code header
https://shibboleth.atlassian.net/browse/GEN-269
---
.gitignore | 12 +++++-------
jdbc-storage-impl/.checkstyle | 2 +-
.../plugin/storage/jdbc/impl/JDBCStoragePlugin.java | 10 ++++------
.../plugin/storage/jdbc/impl/JDBCStorageRecord.java | 9 +++------
.../plugin/storage/jdbc/impl/JDBCStorageService.java | 12 +++++-------
.../plugin/storage/jdbc/impl/package-info.java | 9 +++------
.../plugin/storage/jdbc/impl/JDBCStorageServiceTest.java | 9 +++------
checkstyle.xml => resources/checkstyle/checkstyle.xml | 16 +++++++++++-----
8 files changed, 35 insertions(+), 44 deletions(-)
diff --git a/.gitignore b/.gitignore
index 077f53d..492fde9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
-*/target
-*/test-output
+test-output
*~
-*/.classpath
-*/.settings
-/.settings
-/target
-*/.project
+.classpath
+.settings
+target
.project
+.vscode
diff --git a/jdbc-storage-impl/.checkstyle b/jdbc-storage-impl/.checkstyle
index a59b3a3..d0f5d84 100644
--- a/jdbc-storage-impl/.checkstyle
+++ b/jdbc-storage-impl/.checkstyle
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/jdbc-storage-parent/checkstyle.xml" type="project" description="">
+ <local-check-config name="Shibboleth Checkstyle" location="/java-plugin-storage-jdbc/resources/checkstyle/checkstyle.xml" type="project" description="">
<additional-data name="cache-props-file-location" value="null_1312636288299_cache.properties"/>
<additional-data name="cache-file-location" value="null_1312636288299_cache.xml"/>
<additional-data name="protect-config-file" value="false"/>
diff --git a/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStoragePlugin.java b/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStoragePlugin.java
index 720ad6d..ab2885b 100644
--- a/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStoragePlugin.java
+++ b/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStoragePlugin.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -32,6 +29,7 @@ public class JDBCStoragePlugin extends FirstPartyIdPPlugin {
*
* @throws IOException if properties can't be loaded
* @throws PluginException if another error occurs
+ * @throws ModuleException if a module error occurs
*/
public JDBCStoragePlugin() throws IOException, PluginException , ModuleException{
super(JDBCStoragePlugin.class);
diff --git a/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageRecord.java b/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageRecord.java
index 077b62a..4ea6f7e 100644
--- a/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageRecord.java
+++ b/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageRecord.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageService.java b/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageService.java
index 9bd5060..5564a76 100644
--- a/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageService.java
+++ b/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageService.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -649,7 +646,8 @@ public final class JDBCStorageService extends AbstractStorageService implements
}
final Long returnedVersion = resultSet.getLong(1);
final Long returnedExpires = getExpires(resultSet, 2);
- final String returnedValue = Constraint.isNotNull(resultSet.getString(3), "value field must not be null");
+ final String returnedValue =
+ Constraint.isNotNull(resultSet.getString(3), "value field must not be null");
log.trace("Considering Version '{}', Expires '{}', Value '{}'",
returnedVersion, returnedValue, returnedExpires);
if (returnedExpires != null && System.currentTimeMillis() >= returnedExpires) {
diff --git a/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/package-info.java b/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/package-info.java
index 2079a37..642a3a2 100644
--- a/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/package-info.java
+++ b/jdbc-storage-impl/src/main/java/net/shibboleth/plugin/storage/jdbc/impl/package-info.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/jdbc-storage-impl/src/test/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageServiceTest.java b/jdbc-storage-impl/src/test/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageServiceTest.java
index a797340..81f09c5 100644
--- a/jdbc-storage-impl/src/test/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageServiceTest.java
+++ b/jdbc-storage-impl/src/test/java/net/shibboleth/plugin/storage/jdbc/impl/JDBCStorageServiceTest.java
@@ -1,10 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/checkstyle.xml b/resources/checkstyle/checkstyle.xml
similarity index 77%
rename from checkstyle.xml
rename to resources/checkstyle/checkstyle.xml
index 1398b2d..f456c13 100644
--- a/checkstyle.xml
+++ b/resources/checkstyle/checkstyle.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<!--
This configuration file was written by the eclipse-cs plugin configuration editor
@@ -10,10 +10,16 @@
-->
<module name="Checker">
<property name="severity" value="warning"/>
+ <module name="SuppressWithPlainTextCommentFilter">
+ <property name="offCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+OFF\b"/>
+ <property name="onCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+ON\b"/>
+ <property name="checkFormat" value="$1"/>
+ </module>
<module name="TreeWalker">
+ <property name="tabWidth" value="4"/>
<module name="JavadocMethod"/>
<module name="JavadocType">
- <property name="allowUnknownTags" value="true"/>
+ <property name="allowUnknownTags" value="true"/>
</module>
<module name="JavadocVariable"/>
<module name="JavadocStyle">
@@ -89,8 +95,8 @@
<property name="tokens" value="METHOD_DEF,CTOR_DEF,LITERAL_CATCH"/>
</module>
<module name="FinalLocalVariable">
- <property name="validateEnhancedForLoopVariable" value="true"/>
<property name="tokens" value="PARAMETER_DEF,VARIABLE_DEF"/>
+ <property name="validateEnhancedForLoopVariable" value="true"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="\bCheck[Ss]tyle:\s*([\w|]+)\s+OFF\b"/>
@@ -104,10 +110,10 @@
</module>
<module name="FileTabCharacter"/>
<module name="FileLength">
- <property name="max" value="1200"/>
+ <property name="max" value="1000"/>
</module>
<module name="Header">
- <property name="header" value="/*\n * Licensed to the University Corporation for Advanced Internet Development,\n * Inc. (UCAID) under one or more contributor license agreements. See the\n * NOTICE file distributed with this work for additional information regarding\n * copyright ownership. The UCAID licenses this file to You under the Apache\n * License, Version 2.0 (the "License"); you may not use this file except in\n * compliance with the License. You may obtain a cop [...]
+ <property name="header" value="/*\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, eit [...]
</module>
<module name="JavadocPackage"/>
<module name="LineLength">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list