[java-opensaml COMMIT] in /trunk/opensaml-storage-impl/src: main/java/org/opensaml/storage/impl/MemoryStorageService....

[noreply at shibboleth.net]

Author: scantor
Date: Sat Apr 12 21:52:26 2014
New Revision: 3790

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3790&view=rev
Log:
Fix warnings.

Modified:
    trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/MemoryStorageService.java
    trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/ServletRequestScopedStorageService.java
    trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/ServletRequestScopedStorageServiceTest.java

Modified: trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/MemoryStorageService.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/MemoryStorageService.java?rev=3790&r1=3789&r2=3790&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/MemoryStorageService.java (original)
+++ trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/MemoryStorageService.java Sat Apr 12 21:52:26 2014
@@ -57,6 +57,7 @@
     @NonnullAfterInit private ReadWriteLock lock;
 
     /** {@inheritDoc} */
+    @Override
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
         contextMap = Maps.newHashMap();
@@ -64,6 +65,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     protected void doDestroy() {
         super.doDestroy();
         contextMap = null;
@@ -72,16 +74,19 @@
 
 
     /** {@inheritDoc} */
+    @Override
     @Nonnull @NonnullElements @Live protected Map<String, Map<String, MutableStorageRecord>> getContextMap() {
         return contextMap;
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nonnull protected ReadWriteLock getLock() {
         return lock;
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nullable protected TimerTask getCleanupTask() {
         return new TimerTask() {
             /** {@inheritDoc} */

Modified: trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/ServletRequestScopedStorageService.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/ServletRequestScopedStorageService.java?rev=3790&r1=3789&r2=3790&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/ServletRequestScopedStorageService.java (original)
+++ trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/ServletRequestScopedStorageService.java Sat Apr 12 21:52:26 2014
@@ -118,12 +118,11 @@
 
     /** Constructor. */
     public ServletRequestScopedStorageService() {
-        super();
-        
         cookieName = DEFAULT_COOKIE_NAME;
     }
 
     /** {@inheritDoc} */
+    @Override
     public synchronized void setCleanupInterval(long interval) {
         // Don't allow a cleanup task.
         super.setCleanupInterval(0);
@@ -185,6 +184,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     protected void doInitialize() throws ComponentInitializationException {
         super.doInitialize();
         
@@ -196,6 +196,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean create(@Nonnull @NotEmpty final String context, @Nonnull @NotEmpty final String key,
             @Nonnull @NotEmpty final String value, @Nullable final Long expiration) throws IOException {
         
@@ -208,6 +209,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public void updateContextExpiration(@Nonnull @NotEmpty final String context, @Nullable final Long expiration)
             throws IOException {
         super.updateContextExpiration(context, expiration);
@@ -216,6 +218,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     public void deleteContext(@Nonnull @NotEmpty final String context) throws IOException {
         super.deleteContext(context);
         
@@ -223,6 +226,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public void reap(@Nonnull @NotEmpty final String context) throws IOException {
         super.reap(context);
         
@@ -230,11 +234,13 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
         
     }
 
     /** {@inheritDoc} */
+    @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
             ServletException {
         if (!(response instanceof HttpServletResponse)) {
@@ -354,11 +360,9 @@
             final JsonGenerator gen = Json.createGenerator(sink);
             
             gen.writeStartObject();
-            
             for (Map.Entry<String,Map<String, MutableStorageRecord>> context : contextMap.entrySet()) {
                 
                 gen.writeStartObject(context.getKey());
-                
                 for (Map.Entry<String,MutableStorageRecord> entry : context.getValue().entrySet()) {

[... 66 lines stripped ...]