[java-opensaml] branch master updated: CheckStyle

Rod Widdowson rdw at steadingsoftware.com
Mon Jun 10 12:21:32 EDT 2019


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

rdw pushed a commit to branch master
in repository java-opensaml.

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

The following commit(s) were added to refs/heads/master by this push:
       new  f57a0af   CheckStyle
f57a0af is described below

commit f57a0afe20bda64ac44a66e58244294b9d450382
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Jun 8 13:53:23 2019 +0100

    CheckStyle
---
 .../java/org/opensaml/core/xml/XMLObjectBaseTestCase.java   | 13 +------------
 .../metadata/resolver/impl/HTTPMetadataResolverTest.java    |  1 -
 .../java/org/opensaml/storage/impl/JPAStorageService.java   |  9 +++------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java b/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java
index 35d5ea6..cd547a0 100644
--- a/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java
+++ b/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java
@@ -21,12 +21,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
 
-import javax.annotation.Nonnull;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
 import javax.xml.namespace.QName;
 
 import org.custommonkey.xmlunit.Diff;
@@ -44,12 +39,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
-import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import net.shibboleth.utilities.java.support.xml.AttributeSupport;
 import net.shibboleth.utilities.java.support.xml.ParserPool;
 import net.shibboleth.utilities.java.support.xml.QNameSupport;
 import net.shibboleth.utilities.java.support.xml.SerializeSupport;
@@ -79,13 +72,10 @@ public abstract class XMLObjectBaseTestCase extends OpenSAMLInitBaseTestCase {
     /** QName for SimpleXMLObject */
     protected static QName simpleXMLObjectQName = new QName(SimpleXMLObject.NAMESPACE, SimpleXMLObject.LOCAL_NAME);
 
-    /** Baseline for duration calculations (comes from XML Schema standard). */
-    private static Calendar baseline = new GregorianCalendar(1696, 9, 1, 0, 0, 0);
-    
     @BeforeClass
 	protected void initXMLObjectSupport() throws Exception {
         XMLUnit.setIgnoreWhitespace(true);
-        
+
         try {
             parserPool = XMLObjectProviderRegistrySupport.getParserPool();
             builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
@@ -95,7 +85,6 @@ public abstract class XMLObjectBaseTestCase extends OpenSAMLInitBaseTestCase {
             log.error("Can not initialize XMLObjectBaseTestCase", e);
             throw e;
         }
-        
     }
 
     /**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
index 9e14beb..4a96b62 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
@@ -17,7 +17,6 @@
 
 package org.opensaml.saml.metadata.resolver.impl;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java
index 35c0533..d35b4f8 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java
@@ -708,8 +708,7 @@ public class JPAStorageService extends AbstractStorageService implements Storage
      *
      * @param transaction to commit
      */
-    private void commitTransaction(@Nullable final EntityTransaction transaction)
-    {
+    private void commitTransaction(@Nullable final EntityTransaction transaction) {
         if (transaction != null && transaction.isActive() && !transaction.getRollbackOnly()) {
             try {
                 transaction.commit();
@@ -724,8 +723,7 @@ public class JPAStorageService extends AbstractStorageService implements Storage
      *
      * @param transaction to roll back
      */
-    private void rollbackTransaction(@Nullable final EntityTransaction transaction)
-    {
+    private void rollbackTransaction(@Nullable final EntityTransaction transaction) {
         if (transaction != null && transaction.isActive()) {
             try {
                 transaction.rollback();
@@ -740,8 +738,7 @@ public class JPAStorageService extends AbstractStorageService implements Storage
      *
      * @param manager to close
      */
-    private void closeEntityManager(@Nullable final EntityManager manager)
-    {
+    private void closeEntityManager(@Nullable final EntityManager manager) {
         if (manager != null && manager.isOpen()) {
             try {
                 manager.close();

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


More information about the commits mailing list