Redistribución

java/services/auth/src/main/java/com/uva/authentication/AuthenticationApplication.java → java/services/auth/src/main/java/com/uva/api/auth/AuthenticationApplication.java

-package com.uva.authentication;
+package com.uva.api.auth;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

java/services/auth/src/main/java/com/uva/authentication/api/UserAPI.java → java/services/auth/src/main/java/com/uva/api/auth/api/UserAPI.java

-package com.uva.authentication.api;
+package com.uva.api.auth.api;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,8 +11,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
-import com.uva.authentication.models.auth.RegisterRequest;
-import com.uva.authentication.models.remote.User;
+import com.uva.api.auth.models.auth.RegisterRequest;
+import com.uva.api.auth.models.remote.User;
 
 @Component
 public class UserAPI {

java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateConfig.java → java/services/auth/src/main/java/com/uva/api/auth/config/RestTemplateConfig.java

-package com.uva.authentication.config;
+package com.uva.api.auth.config;
 
 import java.util.List;
 

java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateInterceptor.java → java/services/auth/src/main/java/com/uva/api/auth/config/RestTemplateInterceptor.java

-package com.uva.authentication.config;
+package com.uva.api.auth.config;
 
 import org.springframework.http.HttpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,7 +8,7 @@ import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.stereotype.Component;
 
-import com.uva.authentication.utils.JwtUtil;
+import com.uva.api.auth.utils.JwtUtil;
 
 import java.io.IOException;
 

java/services/auth/src/main/java/com/uva/authentication/controllers/AuthController.java → java/services/auth/src/main/java/com/uva/api/auth/controllers/AuthController.java

-package com.uva.authentication.controllers;
+package com.uva.api.auth.controllers;
 
 import java.util.Map;
 
@@ -8,9 +8,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.uva.authentication.models.auth.LoginRequest;
-import com.uva.authentication.models.auth.RegisterRequest;
-import com.uva.authentication.services.AuthService;
+import com.uva.api.auth.models.auth.LoginRequest;
+import com.uva.api.auth.models.auth.RegisterRequest;
+import com.uva.api.auth.services.AuthService;
+
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 

java/services/auth/src/main/java/com/uva/authentication/controllers/TokenController.java → java/services/auth/src/main/java/com/uva/api/auth/controllers/TokenController.java

-package com.uva.authentication.controllers;
+package com.uva.api.auth.controllers;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.uva.authentication.models.jwt.JwtAuth;
-import com.uva.authentication.services.TokenService;
+import com.uva.api.auth.models.jwt.JwtAuth;
+import com.uva.api.auth.services.TokenService;
 
 @RestController
 @RequestMapping("token")

java/services/auth/src/main/java/com/uva/authentication/models/auth/LoginRequest.java → java/services/auth/src/main/java/com/uva/api/auth/models/auth/LoginRequest.java

-package com.uva.authentication.models.auth;
+package com.uva.api.auth.models.auth;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

java/services/auth/src/main/java/com/uva/authentication/models/auth/RegisterRequest.java → java/services/auth/src/main/java/com/uva/api/auth/models/auth/RegisterRequest.java

-package com.uva.authentication.models.auth;
+package com.uva.api.auth.models.auth;
 
-import com.uva.authentication.models.remote.UserRol;
+import com.uva.api.auth.models.remote.UserRol;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

java/services/auth/src/main/java/com/uva/authentication/models/jwt/JwtAuth.java → java/services/auth/src/main/java/com/uva/api/auth/models/jwt/JwtAuth.java

-package com.uva.authentication.models.jwt;
+package com.uva.api.auth.models.jwt;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

java/services/auth/src/main/java/com/uva/authentication/models/jwt/JwtData.java → java/services/auth/src/main/java/com/uva/api/auth/models/jwt/JwtData.java

-package com.uva.authentication.models.jwt;
+package com.uva.api.auth.models.jwt;
 
 import java.lang.reflect.Field;
 import java.util.Date;
 
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.uva.authentication.models.remote.UserRol;
+import com.uva.api.auth.models.remote.UserRol;
 
 import lombok.Data;
 import lombok.Getter;

java/services/auth/src/main/java/com/uva/authentication/models/remote/User.java → java/services/auth/src/main/java/com/uva/api/auth/models/remote/User.java

-package com.uva.authentication.models.remote;
+package com.uva.api.auth.models.remote;
 
-import com.uva.authentication.models.auth.RegisterRequest;
+import com.uva.api.auth.models.auth.RegisterRequest;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

java/services/auth/src/main/java/com/uva/authentication/models/remote/UserRol.java → java/services/auth/src/main/java/com/uva/api/auth/models/remote/UserRol.java

-package com.uva.authentication.models.remote;
+package com.uva.api.auth.models.remote;
 
 public enum UserRol {
   ADMIN, HOTEL_ADMIN, CLIENT

java/services/auth/src/main/java/com/uva/authentication/services/AuthService.java → java/services/auth/src/main/java/com/uva/api/auth/services/AuthService.java

-package com.uva.authentication.services;
+package com.uva.api.auth.services;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,14 +7,14 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpClientErrorException;
 
-import com.uva.authentication.api.UserAPI;
-import com.uva.authentication.models.auth.LoginRequest;
-import com.uva.authentication.models.auth.RegisterRequest;
-import com.uva.authentication.models.jwt.JwtAuth;
-import com.uva.authentication.models.jwt.JwtData;
-import com.uva.authentication.models.remote.User;
-import com.uva.authentication.utils.JwtUtil;
-import com.uva.authentication.utils.SecurityUtils;
+import com.uva.api.auth.api.UserAPI;
+import com.uva.api.auth.models.auth.LoginRequest;
+import com.uva.api.auth.models.auth.RegisterRequest;
+import com.uva.api.auth.models.jwt.JwtAuth;
+import com.uva.api.auth.models.jwt.JwtData;
+import com.uva.api.auth.models.remote.User;
+import com.uva.api.auth.utils.JwtUtil;
+import com.uva.api.auth.utils.SecurityUtils;
 
 @Service
 public class AuthService {

java/services/auth/src/main/java/com/uva/authentication/services/TokenService.java → java/services/auth/src/main/java/com/uva/api/auth/services/TokenService.java

-package com.uva.authentication.services;
+package com.uva.api.auth.services;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import com.uva.authentication.models.jwt.JwtAuth;
-import com.uva.authentication.models.jwt.JwtData;
-import com.uva.authentication.utils.JwtUtil;
+import com.uva.api.auth.models.jwt.JwtAuth;
+import com.uva.api.auth.models.jwt.JwtData;
+import com.uva.api.auth.utils.JwtUtil;
 
 @Service
 public class TokenService {

java/services/auth/src/main/java/com/uva/authentication/utils/JwtUtil.java → java/services/auth/src/main/java/com/uva/api/auth/utils/JwtUtil.java

-package com.uva.authentication.utils;
+package com.uva.api.auth.utils;
 
 import java.util.Date;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,10 +8,9 @@ import org.springframework.web.client.HttpClientErrorException;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.algorithms.Algorithm;
-import com.uva.authentication.models.jwt.JwtData;
-import com.uva.authentication.models.remote.User;
-
 import com.auth0.jwt.interfaces.DecodedJWT;
+import com.uva.api.auth.models.jwt.JwtData;
+import com.uva.api.auth.models.remote.User;
 
 import java.time.Instant;
 

java/services/auth/src/main/java/com/uva/authentication/utils/SecurityUtils.java → java/services/auth/src/main/java/com/uva/api/auth/utils/SecurityUtils.java

-package com.uva.authentication.utils;
+package com.uva.api.auth.utils;
 
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 

java/services/bookings/src/main/java/com/uva/apis/bookings/BookingsApplication.java → java/services/bookings/src/main/java/com/uva/api/bookings/BookingsApplication.java

-package com.uva.apis.bookings;
+package com.uva.api.bookings;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

java/services/bookings/src/main/java/com/uva/apis/bookings/api/HotelApi.java → java/services/bookings/src/main/java/com/uva/api/bookings/api/HotelApi.java

-package com.uva.apis.bookings.api;
+package com.uva.api.bookings.api;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

java/services/bookings/src/main/java/com/uva/apis/bookings/api/TokenAPI.java → java/services/bookings/src/main/java/com/uva/api/bookings/api/TokenAPI.java

-package com.uva.apis.bookings.api;
+package com.uva.api.bookings.api;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.uva.apis.bookings.models.external.JwtData;
+import com.uva.api.bookings.models.external.JwtData;
 
 @Component
 public class TokenAPI {

java/services/bookings/src/main/java/com/uva/apis/bookings/api/UserApi.java → java/services/bookings/src/main/java/com/uva/api/bookings/api/UserApi.java

-package com.uva.apis.bookings.api;
+package com.uva.api.bookings.api;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;