Merge pull request #3 from obrienlabs/ref-15-add-swagger2

#2 - add swagger2

reference-nbi/pom.xml

@@ -55,6 +55,19 @@
 			<scope>test</scope>
 		</dependency>
 
+
+	 <!-- swagger -->    
+    <dependency>
+        <groupId>io.springfox</groupId>
+        <artifactId>springfox-swagger2</artifactId>
+        <version>2.9.2</version>
+    </dependency>
+    <dependency>
+        <groupId>io.springfox</groupId>
+        <artifactId>springfox-swagger-ui</artifactId>
+        <version>2.9.2</version>
+    </dependency>
+
 	 <!-- https://jersey.java.net/documentation/latest/modules-and-dependencies.html -->
     <dependency>
         <groupId>javax.ws.rs</groupId>
@@ -193,7 +206,7 @@
 	</build>
 
     <profiles>
-        <profile>
+        <!-- profile>
             <id>docker</id>
             <build>
                 <plugins>
@@ -279,7 +292,7 @@
                                 <id>copy-dockerfile</id>
                                 <goals>
                                     <goal>copy-resources</goal>
-                                </goals><!-- here the phase you need -->
+                                </goals>
                                 <phase>package</phase>
                                 <configuration>
                                     <outputDirectory>${project.basedir}/target/docker-stage</outputDirectory>
@@ -414,6 +427,6 @@
                     </plugin>
                 </plugins>
             </build>
-        </profile>
+        </profile-->
     </profiles>
 </project>

reference-nbi/src/main/java/cloud/containerization/reference/nbi/Base64Filter.java

@@ -13,27 +13,32 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-@Component
-@Order(1)
+// disable for now
+//@Component
+//@Order(1)
 public class Base64Filter implements Filter {
 	private final static Logger LOG = Logger.getLogger(Base64Filter.class.getName());
+	public static final Boolean enabled = false;
 
 	@Override
 	public void doFilter(ServletRequest request, javax.servlet.ServletResponse response, FilterChain chain)
 			throws IOException, ServletException {
-		HttpServletRequest req = (HttpServletRequest) request;
-		// Note: the query string does not include the anchor hash (clent) content
-		String queryString = req.getQueryString();
-        LOG.info("Pre request + querystring: " + req.getRequestURI() + "?" + queryString);
-        //LOG.info(encode(queryString));
-        // decode base64 encoded parameters high in the chain
-        String decoded = decode(queryString);
-        LOG.info("decoded: " + decoded);
+		if(enabled) {
+			HttpServletRequest req = (HttpServletRequest) request;
+
+			// Note: the query string does not include the anchor hash (clent) content
+			String queryString = req.getQueryString();
+			LOG.info("Pre request + querystring: " + req.getRequestURI() + "?" + queryString);
+			//LOG.info(encode(queryString));
+			// decode base64 encoded parameters high in the chain
+			String decoded = decode(queryString);
+			LOG.info("decoded: " + decoded);
 
-        // 3 solutions to emulate a setQueryParameter() call (wrapping request, request attributes, or custom parameters)
-        req.setAttribute("qs", decoded);
-        chain.doFilter(request, response);
-        LOG.info("Post request: " + req.getRequestURI());
+			// 3 solutions to emulate a setQueryParameter() call (wrapping request, request attributes, or custom parameters)
+			req.setAttribute("qs", decoded);
+			chain.doFilter(request, response);
+			LOG.info("Post request: " + req.getRequestURI());
+		}
 	}
 
 

reference-nbi/src/main/java/cloud/containerization/reference/nbi/SwaggerConfig.java

@@ -0,0 +1,26 @@
+package cloud.containerization.reference.nbi;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+
+	@Bean
+	public Docket api() {
+		return new Docket(DocumentationType.SWAGGER_2)
+				.select()
+				.apis(RequestHandlerSelectors.any())
+				.paths(PathSelectors.any())
+				.build();
+
+	}
+
+}

reference-nbi/src/main/resources/application.properties

@@ -1 +1,2 @@
 server.servlet.context-path=/nbi
+logging.level.org.springframework.web=DEBUG