add api versioning and swagger2 docs

Author: attacomsian

.gitignore

@@ -23,4 +23,6 @@
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
+/.nb-gradle/
+
+/uploads/

build.gradle

@@ -29,6 +29,9 @@ dependencies {
 	compile('org.springframework.boot:spring-boot-starter-security')
 	compile('org.springframework.boot:spring-boot-starter-web')
 	compile("com.auth0:java-jwt:3.4.0")
+	compile ("io.springfox:springfox-swagger2:2.9.2")
+	compile ("io.springfox:springfox-swagger-ui:2.9.2")
+	compile ("io.springfox:springfox-spring-web:2.9.2")
 	runtime('mysql:mysql-connector-java')
 	testCompile('org.springframework.boot:spring-boot-starter-test')
 }

src/main/java/com/streaming/Application.java

@@ -6,19 +6,43 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import springfox.documentation.builders.ApiInfoBuilder;
+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;
+
+import static springfox.documentation.builders.PathSelectors.regex;
 
 @SpringBootApplication
 @EnableConfigurationProperties({
-		FileStorageProperties.class
+        FileStorageProperties.class
 })
+@EnableSwagger2
 public class Application {
 
-	@Bean
-	public BCryptPasswordEncoder bCryptPasswordEncoder() {
-		return new BCryptPasswordEncoder();
-	}
+    @Bean
+    public BCryptPasswordEncoder bCryptPasswordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    @Bean
+    public Docket apiV10() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .groupName("live-streaming-api-v1.0")
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.streaming.controllers"))
+                .paths(PathSelectors.any())
+                .build()
+                .apiInfo(new ApiInfoBuilder()
+                        .version("1.0")
+                        .title("Live Streaming API")
+                        .description("Documentation Live Streaming API v1.0")
+                        .build());
+    }
 
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
 }

src/main/java/com/streaming/controllers/UserController.java

@@ -11,7 +11,7 @@
 import java.util.Date;
 
 @RestController
-@RequestMapping("/users")
+@RequestMapping("/api/v1.0/users")
 public class UserController {
 
     private UserRepository userRepository;

src/main/java/com/streaming/controllers/VideoController.java

@@ -17,13 +17,11 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
 @RestController
-@RequestMapping("/videos")
+@RequestMapping("/api/v1.0/videos")
 public class VideoController {
 
     private static final Logger logger = LoggerFactory.getLogger(VideoController.class);
@@ -67,10 +65,11 @@ public Video getVideo(@PathVariable Long id) {
         return video.isPresent() ? video.get() : null;
     }
 
-    @GetMapping("/download/{fileName:.+}")
-    public ResponseEntity<Resource> downloadFile(@PathVariable String fileName, HttpServletRequest request) {
+    @GetMapping("/download/{id:.+}")
+    public ResponseEntity<Resource> downloadFile(@PathVariable Long id, HttpServletRequest request) {
+        Optional<Video> video = videoRepository.findById(id);
         // Load file as Resource
-        Resource resource = fileStorageService.loadFileAsResource(fileName);
+        Resource resource = fileStorageService.loadFileAsResource(video.get().getUrl());
 
         // try to find file's content type
         String contentType = null;

src/main/java/com/streaming/domains/Video.java

@@ -1,5 +1,7 @@
 package com.streaming.domains;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
@@ -13,6 +15,7 @@ public class Video implements Serializable {
     private Long id;
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
+    @JsonIgnore
     private User user;
     private String title;
     private double size;

src/main/java/com/streaming/security/JWTAuthenticationFilter.java

@@ -56,5 +56,6 @@ protected void successfulAuthentication(HttpServletRequest req,
                 .withExpiresAt(new Date(System.currentTimeMillis() + EXPIRATION_TIME))
                 .sign(HMAC512(SECRET.getBytes()));
         res.addHeader(HEADER_STRING, TOKEN_PREFIX + token);
+        res.addHeader("Access-Control-Expose-Headers", HEADER_STRING);
     }
 }

src/main/java/com/streaming/security/SecurityConstants.java

@@ -5,5 +5,4 @@ public class SecurityConstants {
     public static final long EXPIRATION_TIME = 10 * 24 * 60 * 60 * 1000; // 864000000 milliseconds / 10 days
     public static final String TOKEN_PREFIX = "Bearer ";
     public static final String HEADER_STRING = "Authorization";
-    public static final String SIGN_UP_URL = "/users/sign-up";
 }

src/main/java/com/streaming/security/WebSecurity.java

@@ -13,8 +13,6 @@
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.context.annotation.Bean;
 
-import static com.streaming.security.SecurityConstants.SIGN_UP_URL;
-
 @EnableWebSecurity
 public class WebSecurity extends WebSecurityConfigurerAdapter {
     private UserDetailsServiceImpl userDetailsService;
@@ -28,8 +26,9 @@ public WebSecurity(UserDetailsServiceImpl userDetailsService, BCryptPasswordEnco
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.cors().and().csrf().disable().authorizeRequests()
-                .antMatchers(HttpMethod.POST, SIGN_UP_URL).permitAll()
-                .anyRequest().authenticated()
+//                .antMatchers(HttpMethod.POST, SIGN_UP_URL).permitAll()
+                .antMatchers("/videos/**").authenticated()
+                .anyRequest().permitAll()
                 .and()
                 .addFilter(new JWTAuthenticationFilter(authenticationManager()))
                 .addFilter(new JWTAuthorizationFilter(authenticationManager()))