[java-opensaml] 07/08: OSJ-342 Investigate Strategies to end of life our use of Hibernate in V5

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch dev/OSJ-342
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=63337bbd65987d9129dac0d7aab9215937d05d37

commit 63337bbd65987d9129dac0d7aab9215937d05d37
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 13 14:54:33 2022 +0100

    OSJ-342 Investigate Strategies to end of life our use of Hibernate in V5
    
    https://shibboleth.atlassian.net/browse/OSJ-342
    
    Add Missing annotations.  Fix Javadoc.
---
 .../org/opensaml/storage/impl/JDBCStorageService.java   | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JDBCStorageService.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JDBCStorageService.java
index 73dbb5c4f..ba15ade5c 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JDBCStorageService.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JDBCStorageService.java
@@ -666,7 +666,6 @@ public final class JDBCStorageService extends AbstractStorageService implements
                 selectStmnt.setString(1, context);
                 selectStmnt.setString(2, key);
                 log.debug("Querying {}", selectStmnt);
-                final String s = selectStmnt.toString();
                 final ResultSet resultSet = selectStmnt.executeQuery();
                 if (!resultSet.next()) {
                     log.debug("Nothing returned");
@@ -815,8 +814,7 @@ public final class JDBCStorageService extends AbstractStorageService implements
                 updateStmnt.execute();
                 connection.commit();
                 return;
-            }
-            catch (final SQLException e) {
+            } catch (final SQLException e) {
                 boolean retry = false;
                 for (final String msg : retryableErrors) {
                     if (e.getSQLState() != null && e.getSQLState().contains(msg)) {
@@ -840,7 +838,7 @@ public final class JDBCStorageService extends AbstractStorageService implements
     }
 
     /** {@inheritDoc} */
-    public void reap(final String context) throws IOException {
+    public void reap(@Nonnull @NotEmpty final String context) throws IOException {
         //
         // Constraints, Logging
         //
@@ -853,8 +851,7 @@ public final class JDBCStorageService extends AbstractStorageService implements
                 updateStmnt.execute();
                 connection.commit();
                 return;
-            }
-            catch (final SQLException e) {
+            } catch (final SQLException e) {
                 boolean retry = false;
                 for (final String msg : retryableErrors) {
                     if (e.getSQLState() != null && e.getSQLState().contains(msg)) {
@@ -877,7 +874,8 @@ public final class JDBCStorageService extends AbstractStorageService implements
     }
 
     /** {@inheritDoc} */
-    public void updateContextExpiration(String context, Long expires) throws IOException {
+    public void updateContextExpiration(@Nonnull @NotEmpty final String context, @Nullable final Long  expires)
+            throws IOException {
         //
         // Constraints, Logging
         //
@@ -891,8 +889,7 @@ public final class JDBCStorageService extends AbstractStorageService implements
                 updateStmnt.execute();
                 connection.commit();
                 return;
-            }
-            catch (final SQLException e) {
+            } catch (final SQLException e) {
                 boolean retry = false;
                 for (final String msg : retryableErrors) {
                     if (e.getSQLState() != null && e.getSQLState().contains(msg)) {
@@ -915,7 +912,7 @@ public final class JDBCStorageService extends AbstractStorageService implements
     }
 
     /** {@inheritDoc} */
-    public void deleteContext(String context) throws IOException {
+    public void deleteContext(@Nonnull @NotEmpty final String context) throws IOException {
         //
         // Constraints, Logging
         //        

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.