Clean up AAAShiroFilter a bit

Shorten refernces and remove unneeded @RequireHttpWhiteboard

Change-Id: I9d62b64bdb006a258d038e7ca643a68da8defd74
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/filters/AAAShiroFilter.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/filters/AAAShiroFilter.java
index a7da6c21b547987789da44f05654a7cd317a1ac9..49b895b64d1ff99e94e3df1be84c05a4ed024346 100644 (file)
--- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/filters/AAAShiroFilter.java
+++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/filters/AAAShiroFilter.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.aaa.shiro.filters;
 
 import javax.servlet.Filter;
@@ -13,7 +12,6 @@ import javax.servlet.annotation.WebFilter;
 import org.apache.shiro.web.servlet.ShiroFilter;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ServiceScope;
-import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
 import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardFilterAsyncSupported;
 import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardFilterName;
 import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardFilterPattern;
@@ -33,14 +31,13 @@ import org.slf4j.LoggerFactory;
  *
  * <code>log:set DEBUG AAAShiroFilter</code>
  *
- * @see javax.servlet.Filter
+ * @see Filter
  * @see ShiroFilter
  */
 @WebFilter(urlPatterns = "/*", filterName = "AAAShiroFilter")
 @HttpWhiteboardFilterAsyncSupported
 @HttpWhiteboardFilterPattern("/*")
 @HttpWhiteboardFilterName("AAAShiroFilter")
-@RequireHttpWhiteboard
 @Component(service = Filter.class, scope = ServiceScope.PROTOTYPE)
 public final class AAAShiroFilter extends ShiroFilter {
     private static final Logger LOG = LoggerFactory.getLogger(AAAShiroFilter.class);