Revize 216a8f66

re #41 move enumerations from dto to domain package

server/src/main/java/org/danekja/ymanager/MethodSecurityConfiguration.java

@@ +1 @@
+package org.danekja.ymanager;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
+
+@Configuration
+@EnableGlobalMethodSecurity (jsr250Enabled = true, prePostEnabled = true)
+public class MethodSecurityConfiguration extends GlobalMethodSecurityConfiguration {
+}

server/src/main/java/org/danekja/ymanager/SecurityConfiguration.java

@@ -1 @@
-package org.danekja.ymanager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider;
-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.core.AuthenticationException;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-
-@Configuration
-@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.cors()
-                .and()
-                .authorizeRequests()
-                .anyRequest().authenticated()
-                .and()
-                .httpBasic();
-    }
-
-    /**
-     * This is a dummy authentication provider which does not check password at all.
-     * <p>
-     * To be replaced with OAuth2 client
-     *
-     * @param userDetailsService
-     * @return
-     */
-    @Bean
-    public AuthenticationProvider dummyAuthManager(UserDetailsService userDetailsService) {
-        return new AbstractUserDetailsAuthenticationProvider() {
-
-            private final Logger LOG = LoggerFactory.getLogger("DummyLogger");
-
-            @Override
-            protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
-
-            }
-
-            @Override
-            protected UserDetails retrieveUser(String username, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
-                return userDetailsService.loadUserByUsername(username);
-            }
-        };
-    }
-
-}

server/src/main/java/org/danekja/ymanager/WebSecurityConfiguration.java

@@ +1 @@
+package org.danekja.ymanager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider;
+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.core.AuthenticationException;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+
+@Configuration
+@EnableWebSecurity
+public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.cors()
+                .and()
+                .authorizeRequests()
+                .anyRequest().authenticated()
+                .and()
+                .httpBasic();
+    }
+
+    /**
+     * This is a dummy authentication provider which does not check password at all.
+     * <p>
+     * To be replaced with OAuth2 client
+     *
+     * @param userDetailsService
+     * @return
+     */
+    @Bean
+    public AuthenticationProvider dummyAuthManager(UserDetailsService userDetailsService) {
+        return new AbstractUserDetailsAuthenticationProvider() {
+
+            private final Logger LOG = LoggerFactory.getLogger("DummyLogger");
+
+            @Override
+            protected void additionalAuthenticationChecks(UserDetails userDetails, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
+
+            }
+
+            @Override
+            protected UserDetails retrieveUser(String username, UsernamePasswordAuthenticationToken authentication) throws AuthenticationException {
+                return userDetailsService.loadUserByUsername(username);
+            }
+        };
+    }
+
+}

server/src/main/java/org/danekja/ymanager/business/ApiManager.java

@@ -1 +1 @@
 package org.danekja.ymanager.business;
 
-import org.danekja.ymanager.domain.User;
-import org.danekja.ymanager.domain.Vacation;
+import org.danekja.ymanager.domain.*;
 import org.danekja.ymanager.dto.*;
+import org.danekja.ymanager.dto.DefaultSettings;
 import org.danekja.ymanager.repository.RequestRepository;
 import org.danekja.ymanager.repository.UserRepository;
 import org.danekja.ymanager.repository.VacationRepository;

server/src/main/java/org/danekja/ymanager/business/Manager.java

@@ -1 +1 @@
 package org.danekja.ymanager.business;
 
+import org.danekja.ymanager.domain.RequestType;
+import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.dto.*;
 import org.danekja.ymanager.ws.rest.RESTFullException;
 

server/src/main/java/org/danekja/ymanager/business/mock/ManagerMock.java

@@ -1 +1 @@
 package org.danekja.ymanager.business.mock;
 
 import org.danekja.ymanager.business.Manager;
+import org.danekja.ymanager.domain.RequestType;
+import org.danekja.ymanager.domain.Status;
+import org.danekja.ymanager.domain.UserRole;
+import org.danekja.ymanager.domain.VacationType;
 import org.danekja.ymanager.dto.*;
 import org.danekja.ymanager.ws.rest.RESTFullException;
 

server/src/main/java/org/danekja/ymanager/domain/RequestType.java

@@ +1 @@
+package org.danekja.ymanager.domain;
+
+/**
+ * The enum {@code RequestType} represents different types of a request.
+ */
+public enum RequestType {
+    /**
+     * The request for a vacation.
+     */
+    VACATION,
+
+    /**
+     * The request for an authorization.
+     */
+    AUTHORIZATION;
+
+    /**
+     * Creates the type of a request from the provided string.
+     * The method is case insensitive. If the given string does not correspond to any values of the enum the method returns null.
+     *
+     * @param type the string representation of the type of a request
+     * @return the value of the enum or null
+     */
+    public static RequestType getType(final String type) {
+        if (type == null || type.isEmpty()) return null;
+        try {
+            return RequestType.valueOf(type.toUpperCase());
+        } catch (final IllegalArgumentException e) {
+            return null;
+        }
+    }
+}

server/src/main/java/org/danekja/ymanager/domain/Status.java

@@ +1 @@
+package org.danekja.ymanager.domain;
+
+/**
+ * The enum {@code Status} represents states of authorization and vacation approval process.
+ */
+public enum Status {
+    /**
+     * The subject of a request is accepted.
+     */
+    ACCEPTED,
+
+    /**
+     * The subject of a request is waiting for an answer.
+     */
+    PENDING,
+
+    /**
+     * The subject of a request is rejected.
+     */
+    REJECTED;
+
+    /**
+     * Creates the status from the provided string.
+     * The method is case insensitive. If the given string does not correspond to any values of the enum the method returns null.
+     *
+     * @param status the string representation of the status
+     * @return the value of the enum or null
+     */
+    public static Status getStatus(final String status) {
+        if (status == null || status.isEmpty()) return null;
+        try {
+            return Status.valueOf(status.toUpperCase());
+        } catch (final IllegalArgumentException e) {
+            return null;
+        }
+    }
+}

server/src/main/java/org/danekja/ymanager/domain/User.java

@@ -1 +1 @@
 package org.danekja.ymanager.domain;
 
-import org.danekja.ymanager.dto.Status;
-import org.danekja.ymanager.dto.UserRole;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.GrantedAuthority;

server/src/main/java/org/danekja/ymanager/domain/UserRole.java

@@ +1 @@
+package org.danekja.ymanager.domain;
+
+/**
+ * The enum {@code UserRole} represents different roles of a user.
+ */
+public enum UserRole {
+    /**
+     * The user is an employee.
+     */
+    EMPLOYEE,
+
+    /**
+     * The user is na employer. This user has more rights than an employee.
+     */
+    EMPLOYER;
+
+    /**
+     * Creates the role from the provided string.
+     * The method is case insensitive. If the given string does not correspond to any values of the enum the method returns null.
+     *
+     * @param role the string representation of the role
+     * @return the value of the enum or null
+     */
+    public static UserRole getUserRole(final String role) {
+        if (role == null || role.isEmpty()) return null;
+        try {
+            return UserRole.valueOf(role.toUpperCase());
+        } catch (final IllegalArgumentException e) {
+            return null;
+        }
+    }
+}

server/src/main/java/org/danekja/ymanager/domain/Vacation.java

@@ -1 +1 @@
 package org.danekja.ymanager.domain;
 
-import org.danekja.ymanager.dto.Status;
-import org.danekja.ymanager.dto.VacationType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

server/src/main/java/org/danekja/ymanager/domain/VacationType.java

@@ +1 @@
+package org.danekja.ymanager.domain;
+
+/**
+ * The enum {@code VacationType} represents different types of a vacation.
+ */
+public enum VacationType {
+    /**
+     * The vacation represents a sick day.
+     */
+    SICK_DAY,
+
+    /**
+     * The vacation represents an overtime.
+     */
+    VACATION;
+
+    /**
+     * Creates the type of a vacation from the provided string.
+     * The method is case insensitive. If the given string does not correspond to any values of the enum the method returns null.
+     *
+     * @param type the string representation of the type of a vacation
+     * @return the value of the enum or null
+     */
+    public static VacationType getVacationType(final String type) {
+        if (type == null || type.isEmpty()) return null;
+        try {
+            return VacationType.valueOf(type.toUpperCase());
+        } catch (final IllegalArgumentException e) {
+            return null;
+        }
+    }
+}

server/src/main/java/org/danekja/ymanager/dto/AuthorizationRequest.java

@@ -1 +1 @@
 package org.danekja.ymanager.dto;
 
+import org.danekja.ymanager.domain.Status;
+
 import java.time.LocalDateTime;
 
 /**

server/src/main/java/org/danekja/ymanager/dto/BasicRequest.java

@@ -1 +1 @@
 package org.danekja.ymanager.dto;
 
+import org.danekja.ymanager.domain.Status;
+
 /**
  * An instance of the messenger class {@code BasicRequest} can represent an authorization or a vacation request.
  * The class is used for changing a status of the authorization or the vacation request when a client sends a request on an api endpoint.

server/src/main/java/org/danekja/ymanager/dto/FullUserProfile.java

@@ -1 +1 @@
 package org.danekja.ymanager.dto;
 
+import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.domain.User;
+import org.danekja.ymanager.domain.UserRole;
 
 import java.time.LocalDateTime;
 

server/src/main/java/org/danekja/ymanager/dto/RequestType.java

@@ -1 @@
-package org.danekja.ymanager.dto;
-
-/**
- * The enum {@code RequestType} represents different types of a request.
- */
-public enum RequestType {
-    /**
-     * The request for a vacation.
-     */
-    VACATION,
-
-    /**
-     * The request for an authorization.
-     */
-    AUTHORIZATION;
-
-    /**
-     * Creates the type of a request from the provided string.
-     * The method is case insensitive. If the given string does not correspond to any values of the enum the method returns null.
-     *
-     * @param type the string representation of the type of a request
-     * @return the value of the enum or null
-     */
-    public static RequestType getType(final String type) {
-        if (type == null || type.isEmpty()) return null;
-        try {
-            return RequestType.valueOf(type.toUpperCase());
-        } catch (final IllegalArgumentException e) {
-            return null;
-        }
-    }
-}

server/src/main/java/org/danekja/ymanager/dto/Status.java

@@ -1 @@
-package org.danekja.ymanager.dto;
-
-/**
- * The enum {@code Status} represents states of authorization and vacation approval process.
- */
-public enum Status {
-    /**
-     * The subject of a request is accepted.
-     */
-    ACCEPTED,
-
-    /**
-     * The subject of a request is waiting for an answer.
-     */
-    PENDING,
-
-    /**
-     * The subject of a request is rejected.
-     */
-    REJECTED;
-
-    /**
-     * Creates the status from the provided string.
-     * The method is case insensitive. If the given string does not correspond to any values of the enum the method returns null.
-     *
-     * @param status the string representation of the status
-     * @return the value of the enum or null
-     */
-    public static Status getStatus(final String status) {
-        if (status == null || status.isEmpty()) return null;
-        try {
-            return Status.valueOf(status.toUpperCase());
-        } catch (final IllegalArgumentException e) {
-            return null;
-        }
-    }
-}

server/src/main/java/org/danekja/ymanager/dto/UserRole.java

@@ -1 @@
-package org.danekja.ymanager.dto;
-
-/**
- * The enum {@code UserRole} represents different roles of a user.
- */
-public enum UserRole {
-    /**
-     * The user is an employee.
-     */
-    EMPLOYEE,
-
-    /**
-     * The user is na employer. This user has more rights than an employee.
-     */
-    EMPLOYER;
-
-    /**
-     * Creates the role from the provided string.
-     * The method is case insensitive. If the given string does not correspond to any values of the enum the method returns null.
-     *
-     * @param role the string representation of the role
-     * @return the value of the enum or null
-     */
-    public static UserRole getUserRole(final String role) {
-        if (role == null || role.isEmpty()) return null;
-        try {
-            return UserRole.valueOf(role.toUpperCase());
-        } catch (final IllegalArgumentException e) {
-            return null;
-        }
-    }
-}

server/src/main/java/org/danekja/ymanager/dto/UserSettings.java

@@ -1 +1 @@
 package org.danekja.ymanager.dto;
 
+import org.danekja.ymanager.domain.UserRole;
+
 import java.time.LocalDateTime;
 
 /**

server/src/main/java/org/danekja/ymanager/dto/VacationDay.java

@@ -1 +1 @@
 package org.danekja.ymanager.dto;
 
+import org.danekja.ymanager.domain.Status;
+import org.danekja.ymanager.domain.VacationType;
+
 import java.time.LocalDate;
 import java.time.LocalTime;
 

server/src/main/java/org/danekja/ymanager/dto/VacationRequest.java

@@ -1 +1 @@
 package org.danekja.ymanager.dto;
 
+import org.danekja.ymanager.domain.Status;
+import org.danekja.ymanager.domain.VacationType;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;

server/src/main/java/org/danekja/ymanager/dto/VacationType.java

@@ -1 @@
-package org.danekja.ymanager.dto;
-
-/**
- * The enum {@code VacationType} represents different types of a vacation.
- */
-public enum VacationType {
-    /**
-     * The vacation represents a sick day.
-     */
-    SICK_DAY,
-
-    /**
-     * The vacation represents an overtime.
-     */
-    VACATION;
-
-    /**
-     * Creates the type of a vacation from the provided string.
-     * The method is case insensitive. If the given string does not correspond to any values of the enum the method returns null.
-     *
-     * @param type the string representation of the type of a vacation
-     * @return the value of the enum or null
-     */
-    public static VacationType getVacationType(final String type) {
-        if (type == null || type.isEmpty()) return null;
-        try {
-            return VacationType.valueOf(type.toUpperCase());
-        } catch (final IllegalArgumentException e) {
-            return null;
-        }
-    }
-}

server/src/main/java/org/danekja/ymanager/repository/RequestRepository.java

@@ -1 +1 @@
 package org.danekja.ymanager.repository;
 
+import org.danekja.ymanager.domain.Status;
+import org.danekja.ymanager.domain.VacationType;
 import org.danekja.ymanager.dto.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

server/src/main/java/org/danekja/ymanager/repository/UserRepository.java

@@ -1 +1 @@
 package org.danekja.ymanager.repository;
 
+import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.domain.User;
+import org.danekja.ymanager.domain.UserRole;
 import org.danekja.ymanager.dto.*;
 import org.danekja.ymanager.repository.jdbc.mappers.UserRowMapper;
 import org.slf4j.Logger;
@@ -18 +20 @@
 import java.util.Map;
 import java.util.Optional;
 
-import static org.danekja.ymanager.dto.UserRole.getUserRole;
+import static org.danekja.ymanager.domain.UserRole.getUserRole;
 
 /**
  * An instance of the class UserRepository handles queries which selects and updates users and their settings in a database.

server/src/main/java/org/danekja/ymanager/repository/VacationRepository.java

@@ -2 +2 @@
 
 import org.danekja.ymanager.domain.User;
 import org.danekja.ymanager.domain.Vacation;
-import org.danekja.ymanager.dto.Status;
-import org.danekja.ymanager.dto.UserRole;
+import org.danekja.ymanager.domain.Status;
+import org.danekja.ymanager.domain.UserRole;
 import org.danekja.ymanager.dto.VacationDay;
-import org.danekja.ymanager.dto.VacationType;
+import org.danekja.ymanager.domain.VacationType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21 +21 @@
 import java.util.Optional;
 
 import static java.util.Optional.ofNullable;
-import static org.danekja.ymanager.dto.Status.getStatus;
+import static org.danekja.ymanager.domain.Status.getStatus;
 
 @Repository
 public class VacationRepository {

server/src/main/java/org/danekja/ymanager/repository/jdbc/mappers/UserRowMapper.java

@@ -1 +1 @@
 package org.danekja.ymanager.repository.jdbc.mappers;
 
 import org.danekja.ymanager.domain.User;
-import org.danekja.ymanager.dto.Status;
-import org.danekja.ymanager.dto.UserRole;
+import org.danekja.ymanager.domain.Status;
+import org.danekja.ymanager.domain.UserRole;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;

server/src/main/java/org/danekja/ymanager/ws/rest/ApiController.java

@@ -3 +3 @@
 import org.apache.commons.lang3.StringUtils;
 import org.danekja.ymanager.business.FileService;
 import org.danekja.ymanager.business.Manager;
+import org.danekja.ymanager.domain.RequestType;
+import org.danekja.ymanager.domain.Status;
 import org.danekja.ymanager.dto.*;
 import org.danekja.ymanager.util.localization.Language;
 import org.springframework.beans.factory.annotation.Autowired;

server/src/test/java/org/danekja/ymanager/domain/UserTest.java

@@ -1 +1 @@
 package org.danekja.ymanager.domain;
 
-import org.danekja.ymanager.dto.Status;
-import org.danekja.ymanager.dto.UserRole;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

server/src/test/java/org/danekja/ymanager/domain/VacationTest.java

@@ -1 +1 @@
 package org.danekja.ymanager.domain;
 
-import org.danekja.ymanager.dto.Status;
-import org.danekja.ymanager.dto.VacationType;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;