Merge pull request #1775 from AlexElin/jaxrs_cleanup

code cleanup in the jaxrs module

Author: fehguy

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/Reader.java

@@ -1,6 +1,5 @@
 package io.swagger.jaxrs.config;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.config.FilterFactory;
 import io.swagger.config.Scanner;
@@ -27,7 +26,7 @@
 import java.util.Set;
 
 public class BeanConfig extends AbstractScanner implements Scanner, SwaggerConfig {
-    Logger LOGGER = LoggerFactory.getLogger(BeanConfig.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BeanConfig.class);
 
     Reader reader = new Reader(new Swagger());
 
@@ -140,6 +139,7 @@ public void setHost(String host) {
         this.host = host;
     }
 
+    @Override
     public String getFilterClass() {
         return filterClass;
     }
@@ -233,6 +233,7 @@ public void scanAndRead() {
         }
     }
 
+    @Override
     public Set<Class<?>> classes() {
         ConfigurationBuilder config = new ConfigurationBuilder();
         Set<String> acceptablePackages = new HashSet<String>();
@@ -316,6 +317,7 @@ public Swagger getSwagger() {
         return reader.getSwagger();
     }
 
+    @Override
     public Swagger configure(Swagger swagger) {
         if (schemes != null) {
             for (String scheme : schemes) {

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/BeanConfig.java

@@ -8,6 +8,7 @@
 public class DefaultJaxrsScanner extends AbstractScanner implements JaxrsScanner {
     private boolean prettyPrint = false;
 
+    @Override
     public Set<Class<?>> classesFromContext(Application app, ServletConfig sc) {
         Set<Class<?>> output = new HashSet<Class<?>>();
         if (app != null) {
@@ -25,6 +26,7 @@ public Set<Class<?>> classesFromContext(Application app, ServletConfig sc) {
         return output;
     }
 
+    @Override
     public Set<Class<?>> classes() {
         return new HashSet<Class<?>>();
     }
@@ -33,6 +35,7 @@ public boolean prettyPrint() {
         return prettyPrint;
     }
 
+    @Override
     public void setPrettyPrint(boolean shouldPrettyPrint) {
         this.prettyPrint = shouldPrettyPrint;
     }

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/DefaultJaxrsScanner.java

@@ -5,7 +5,7 @@
 import java.util.HashSet;
 
 /**
- * The <code>ReaderConfig</code> interface defines configuration settings for
+ * The {@code ReaderConfig} interface defines configuration settings for
  * JAX-RS annotations reader.
  */
 public class DefaultReaderConfig implements ReaderConfig {

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/DefaultReaderConfig.java

@@ -5,7 +5,7 @@
 import java.util.Collection;
 
 /**
- * The <code>ReaderConfig</code> interface defines configuration settings for
+ * The {@code ReaderConfig} interface defines configuration settings for
  * JAX-RS annotations reader.
  */
 public interface ReaderConfig {
@@ -14,7 +14,7 @@ public interface ReaderConfig {
      * Checks if all resources, but not those with the
      * {@link Api} annotation has to be processed.
      *
-     * @return <code>true</code> if all resource has to be processed
+     * @return {@code true} if all resource has to be processed
      */
     boolean isScanAllResources();
 

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/ReaderConfig.java

@@ -8,7 +8,7 @@
 import java.util.Set;
 
 /**
- * The <code>ReaderConfigUtils</code> class defines helper methods for handling
+ * The {@code ReaderConfigUtils} class defines helper methods for handling
  * configuration settings for JAX-RS annotations reader.
  */
 public class ReaderConfigUtils {

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/ReaderConfigUtils.java

@@ -59,6 +59,7 @@ public void setResourcePackage(String resourcePackage) {
         this.resourcePackage = resourcePackage;
     }
 
+    @Override
     public Swagger configure(Swagger swagger) {
         if (filterClass != null) {
             try {
@@ -74,6 +75,7 @@ public Swagger configure(Swagger swagger) {
         return swagger;
     }
 
+    @Override
     public Set<Class<?>> classes() {
         Set<Class<?>> classes = getReflections().getTypesAnnotatedWith(Api.class);
         Set<Class<?>> output = new HashSet<Class<?>>();
@@ -85,6 +87,7 @@ public Set<Class<?>> classes() {
         return output;
     }
 
+    @Override
     public String getFilterClass() {
         return filterClass;
     }
@@ -93,10 +96,12 @@ public void setFilterClass(String filterClass) {
         this.filterClass = filterClass;
     }
 
+    @Override
     public boolean getPrettyPrint() {
         return true;
     }
 
+    @Override
     public void setPrettyPrint(boolean shouldPrettyPrint) {
         prettyPrint = shouldPrettyPrint;
     }

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/ReflectiveJaxrsScanner.java

@@ -256,7 +256,7 @@ public static boolean isScannerIdInitParamDefined(ServletConfig sc) {
         if (key != null){
             return true;
         } else {
-            return (sc.getInitParameter(CONTEXT_ID_KEY) != null) ? true : false;
+            return (sc.getInitParameter(CONTEXT_ID_KEY) != null);
         }
     }
 
@@ -276,7 +276,7 @@ public static boolean isConfigIdInitParamDefined(ServletConfig sc) {
         if (key != null){
             return true;
         } else {
-            return (sc.getInitParameter(CONTEXT_ID_KEY) != null) ? true : false;
+            return (sc.getInitParameter(CONTEXT_ID_KEY) != null);
         }
     }
 

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/SwaggerContextService.java

@@ -14,13 +14,14 @@
 import java.util.List;
 
 public class WebXMLReader implements SwaggerConfig {
-    protected String basePath,
-            host,
-            filterClass,
-            apiVersion,
-            title;
+    private static final Logger LOGGER = LoggerFactory.getLogger(WebXMLReader.class);
+
+    protected String basePath;
+    protected String host;
+    protected String filterClass;
+    protected String apiVersion;
+    protected String title;
     protected String[] schemes = new String[]{};
-    private Logger LOGGER = LoggerFactory.getLogger(WebXMLReader.class);
 
     public WebXMLReader(ServletConfig servletConfig) {
         apiVersion = servletConfig.getInitParameter("api.version");
@@ -83,10 +84,12 @@ public WebXMLReader(ServletConfig servletConfig) {
         }
     }
 
+    @Override
     public String getFilterClass() {
         return filterClass;
     }
 
+    @Override
     public Swagger configure(Swagger swagger) {
         if (swagger != null) {
             Info info = swagger.getInfo();

modules/swagger-jaxrs/src/main/java/io/swagger/jaxrs/config/WebXMLReader.java

@@ -10,7 +10,7 @@
 import java.util.ServiceLoader;
 
 public class SwaggerExtensions {
-    static Logger LOGGER = LoggerFactory.getLogger(SwaggerExtensions.class);
+    private static Logger LOGGER = LoggerFactory.getLogger(SwaggerExtensions.class);
 
     private static List<SwaggerExtension> extensions = null;
 
@@ -29,9 +29,7 @@ public static Iterator<SwaggerExtension> chain() {
     static {
         extensions = new ArrayList<SwaggerExtension>();
         ServiceLoader<SwaggerExtension> loader = ServiceLoader.load(SwaggerExtension.class);
-        Iterator<SwaggerExtension> itr = loader.iterator();
-        while (itr.hasNext()) {
-            SwaggerExtension ext = itr.next();
+        for (SwaggerExtension ext : loader) {
             LOGGER.debug("adding extension " + ext);
             extensions.add(ext);
         }