refactor: idea auto reformat

rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/RestApplication.java

@@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class RestApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(RestApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(RestApplication.class, args);
+    }
 
 }

rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/config/RestConfiguration.java

 package cz.muni.fi.pa165.icehockeymanager.rest.config;
 
 import cz.muni.fi.pa165.icehockeymanager.config.ApplicationConfig;
-import cz.muni.fi.pa165.icehockeymanager.config.PersistanceApplicationConfig;
-import cz.muni.fi.pa165.icehockeymanager.rest.security.JWTAuthenticationFilter;
-import cz.muni.fi.pa165.icehockeymanager.rest.security.JWTAuthorizationFilter;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-
-import static cz.muni.fi.pa165.icehockeymanager.rest.security.SecurityConstants.SIGN_UP_URL;
 
 @Configuration
 @EnableTransactionManagement

rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/IceHockeyManagerApi.java

 package cz.muni.fi.pa165.icehockeymanager.rest.controller;
 
-import cz.muni.fi.pa165.icehockeymanager.dto.*;
+import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDto;
+import cz.muni.fi.pa165.icehockeymanager.dto.PlayerTransferDto;
+import cz.muni.fi.pa165.icehockeymanager.dto.TeamDto;
 import cz.muni.fi.pa165.icehockeymanager.facades.TeamManagerFacade;
 import cz.muni.fi.pa165.icehockeymanager.facades.UserAuthFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 

rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/LeagueManagerController.java

@@ -4,7 +4,6 @@ import cz.muni.fi.pa165.icehockeymanager.dto.GameCreateDto;
 import cz.muni.fi.pa165.icehockeymanager.dto.GameUpdateScoreDto;
 import cz.muni.fi.pa165.icehockeymanager.dto.GameWinnerDto;
 import cz.muni.fi.pa165.icehockeymanager.dto.TeamCreateDto;
-import cz.muni.fi.pa165.icehockeymanager.dto.TeamDto;
 import cz.muni.fi.pa165.icehockeymanager.facades.LeagueManagerFacade;
 import cz.muni.fi.pa165.icehockeymanager.facades.TeamManagerFacade;
 import cz.muni.fi.pa165.icehockeymanager.facades.UserAuthFacade;
@@ -12,9 +11,7 @@ import cz.muni.fi.pa165.icehockeymanager.facades.UserFacade;
 import cz.muni.fi.pa165.icehockeymanager.rest.security.JWTAuthenticationFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -28,12 +25,11 @@ import javax.validation.Valid;
 @RequestMapping("/pa165/api/manage/league")
 public class LeagueManagerController {
 
-    Logger logger = LoggerFactory.getLogger(JWTAuthenticationFilter.class);
-
     private final UserFacade userFacade;
     private final LeagueManagerFacade leagueManagerFacade;
     private final TeamManagerFacade teamManagerFacade;
     private final UserAuthFacade userAuthFacade;
+    Logger logger = LoggerFactory.getLogger(JWTAuthenticationFilter.class);
 
     public LeagueManagerController(UserFacade userFacade, LeagueManagerFacade leagueManagerFacade, TeamManagerFacade teamManagerFacade, UserAuthFacade userAuthFacade) {
         this.userFacade = userFacade;

rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/PublicController.java

@@ -3,9 +3,7 @@ package cz.muni.fi.pa165.icehockeymanager.rest.controller;
 import cz.muni.fi.pa165.icehockeymanager.dto.GameDto;
 import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDto;
 import cz.muni.fi.pa165.icehockeymanager.dto.TeamDto;
-import cz.muni.fi.pa165.icehockeymanager.facades.LeagueManagerFacade;
 import cz.muni.fi.pa165.icehockeymanager.facades.TeamManagerFacade;
-import cz.muni.fi.pa165.icehockeymanager.facades.UserAuthFacade;
 import cz.muni.fi.pa165.icehockeymanager.facades.UserFacade;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/demo/DataLoader.java

@@ -21,6 +21,12 @@ public class DataLoader implements ApplicationRunner {
         this.userFacade = userFacade;
     }
 
+    private static TeamCreateDto createTeam(String name) {
+        var team = new TeamCreateDto();
+        team.setName(name);
+        return team;
+    }
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
         leagueManager.createNewTeam(createTeam("Toronto Maple Leafs"));
@@ -28,10 +34,4 @@ public class DataLoader implements ApplicationRunner {
         var team = teams.stream().findFirst().orElseThrow();
         userAuth.createTeamManager("team_manager", "1234", team.getId().intValue());
     }
-
-    private static TeamCreateDto createTeam(String name) {
-        var team = new TeamCreateDto();
-        team.setName(name);
-        return team;
-    }
 }

rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/security/JWTAuthenticationFilter.java

@@ -12,14 +12,12 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
 import javax.servlet.FilterChain;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -29,9 +27,8 @@ import static cz.muni.fi.pa165.icehockeymanager.rest.security.SecurityConstants.
 
 public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
 
-    Logger logger = LoggerFactory.getLogger(JWTAuthenticationFilter.class);
-
     private final UserAuthFacade userAuthFacade;
+    Logger logger = LoggerFactory.getLogger(JWTAuthenticationFilter.class);
 
     public JWTAuthenticationFilter(UserAuthFacade userAuthFacade) {
         this.userAuthFacade = userAuthFacade;
@@ -47,15 +44,15 @@ public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilte
                     .readValue(req.getInputStream(), UserAuthRequestDto.class);
             logger.info(String.format("Log in attempt by %s", creds.getUsername()));
             var user = userAuthFacade.authenticateUser(
-                            creds.getUsername(),
-                            creds.getPassword()
+                    creds.getUsername(),
+                    creds.getPassword()
             ).orElseThrow(() -> new BadCredentialsException(creds.getUsername()));
             return new UsernamePasswordAuthenticationToken(
                     creds.getUsername(),
                     creds.getPassword(),
                     List.of(
                             new SimpleGrantedAuthority(user.getRole().toString())
-                            )
+                    )
             );
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -73,7 +70,7 @@ public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilte
                 .withExpiresAt(new Date(System.currentTimeMillis() + EXPIRATION_TIME))
                 .sign(Algorithm.HMAC512(SECRET.getBytes()));
 
-        String body = ((String) auth.getPrincipal()) + " " + token;
+        String body = auth.getPrincipal() + " " + token;
 
         res.getWriter().write(body);
         res.getWriter().flush();

rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/security/JWTAuthorizationFilter.java

@@ -16,7 +16,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 import static cz.muni.fi.pa165.icehockeymanager.rest.security.SecurityConstants.HEADER_STRING;
@@ -25,9 +24,8 @@ import static cz.muni.fi.pa165.icehockeymanager.rest.security.SecurityConstants.
 
 public class JWTAuthorizationFilter extends BasicAuthenticationFilter {
 
-    Logger logger = LoggerFactory.getLogger(JWTAuthorizationFilter.class);
-
     private final UserAuthFacade userAuthFacade;
+    Logger logger = LoggerFactory.getLogger(JWTAuthorizationFilter.class);
 
     public JWTAuthorizationFilter(AuthenticationManager authManager, UserAuthFacade userAuthFacade) {
         super(authManager);

rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/security/WebSecurity.java

@@ -34,7 +34,7 @@ public class WebSecurity extends WebSecurityConfigurerAdapter {
                 .antMatchers(HttpMethod.POST, SIGN_UP_URL).permitAll()
                 .antMatchers(HttpMethod.GET, "/pa165/api/public/**").permitAll()
                 .antMatchers("/pa165/api/manage/league/**").hasRole(Roles.LEAGUE_MANAGER.toString())
-                .antMatchers( "/pa165/api/manage/team/**").hasRole(Roles.TEAM_MANAGER.toString())
+                .antMatchers("/pa165/api/manage/team/**").hasRole(Roles.TEAM_MANAGER.toString())
                 .anyRequest().authenticated()
                 .and()
                 .addFilter(new JWTAuthenticationFilter(userAuthFacade))

rest/src/test/java/cz/muni/fi/pa165/icehockeymanager/rest/RestApplicationTests.java

@@ -6,8 +6,8 @@ import org.springframework.boot.test.context.SpringBootTest;
 @SpringBootTest
 class RestApplicationTests {
 
-	@Test
-	void contextLoads() {
-	}
+    @Test
+    void contextLoads() {
+    }
 
 }