From f2e39bb8d7801387a46580a39f4c7d2401523bd1 Mon Sep 17 00:00:00 2001 From: effe Date: Sun, 15 Sep 2024 17:18:51 -0400 Subject: [PATCH] refactor: packages --- src/main/java/com/application/munera/data/Expense.java | 3 ++- src/main/java/com/application/munera/data/User.java | 1 + .../com/application/munera/data/{ => enums}/BadgeMessage.java | 2 +- .../com/application/munera/data/{ => enums}/ExpenseType.java | 2 +- .../com/application/munera/data/{ => enums}/PeriodUnit.java | 2 +- .../java/com/application/munera/data/{ => enums}/Role.java | 2 +- .../application/munera/repositories/ExpenseRepository.java | 2 +- .../java/com/application/munera/services/ExpenseService.java | 2 +- .../java/com/application/munera/services/ViewsService.java | 4 ++-- .../com/application/munera/views/expenses/ExpensesView.java | 2 +- .../java/com/application/munera/views/users/UsersView.java | 2 +- 11 files changed, 13 insertions(+), 11 deletions(-) rename src/main/java/com/application/munera/data/{ => enums}/BadgeMessage.java (92%) rename src/main/java/com/application/munera/data/{ => enums}/ExpenseType.java (58%) rename src/main/java/com/application/munera/data/{ => enums}/PeriodUnit.java (57%) rename src/main/java/com/application/munera/data/{ => enums}/Role.java (87%) diff --git a/src/main/java/com/application/munera/data/Expense.java b/src/main/java/com/application/munera/data/Expense.java index 1d1ff13..8bf0a9c 100644 --- a/src/main/java/com/application/munera/data/Expense.java +++ b/src/main/java/com/application/munera/data/Expense.java @@ -1,5 +1,7 @@ package com.application.munera.data; +import com.application.munera.data.enums.ExpenseType; +import com.application.munera.data.enums.PeriodUnit; import jakarta.persistence.*; import jakarta.validation.constraints.Size; import lombok.Getter; @@ -7,7 +9,6 @@ import lombok.Setter; import java.math.BigDecimal; import java.time.LocalDate; -import java.time.LocalDateTime; @Entity @Getter diff --git a/src/main/java/com/application/munera/data/User.java b/src/main/java/com/application/munera/data/User.java index 62cbbc8..b91dcd5 100644 --- a/src/main/java/com/application/munera/data/User.java +++ b/src/main/java/com/application/munera/data/User.java @@ -1,5 +1,6 @@ package com.application.munera.data; +import com.application.munera.data.enums.Role; import jakarta.persistence.*; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/application/munera/data/BadgeMessage.java b/src/main/java/com/application/munera/data/enums/BadgeMessage.java similarity index 92% rename from src/main/java/com/application/munera/data/BadgeMessage.java rename to src/main/java/com/application/munera/data/enums/BadgeMessage.java index d8326d9..32f885f 100644 --- a/src/main/java/com/application/munera/data/BadgeMessage.java +++ b/src/main/java/com/application/munera/data/enums/BadgeMessage.java @@ -1,4 +1,4 @@ -package com.application.munera.data; +package com.application.munera.data.enums; import lombok.Getter; diff --git a/src/main/java/com/application/munera/data/ExpenseType.java b/src/main/java/com/application/munera/data/enums/ExpenseType.java similarity index 58% rename from src/main/java/com/application/munera/data/ExpenseType.java rename to src/main/java/com/application/munera/data/enums/ExpenseType.java index 91ce987..fde5d2f 100644 --- a/src/main/java/com/application/munera/data/ExpenseType.java +++ b/src/main/java/com/application/munera/data/enums/ExpenseType.java @@ -1,4 +1,4 @@ -package com.application.munera.data; +package com.application.munera.data.enums; public enum ExpenseType { CREDIT, diff --git a/src/main/java/com/application/munera/data/PeriodUnit.java b/src/main/java/com/application/munera/data/enums/PeriodUnit.java similarity index 57% rename from src/main/java/com/application/munera/data/PeriodUnit.java rename to src/main/java/com/application/munera/data/enums/PeriodUnit.java index 3c17c26..97285c8 100644 --- a/src/main/java/com/application/munera/data/PeriodUnit.java +++ b/src/main/java/com/application/munera/data/enums/PeriodUnit.java @@ -1,4 +1,4 @@ -package com.application.munera.data; +package com.application.munera.data.enums; public enum PeriodUnit { diff --git a/src/main/java/com/application/munera/data/Role.java b/src/main/java/com/application/munera/data/enums/Role.java similarity index 87% rename from src/main/java/com/application/munera/data/Role.java rename to src/main/java/com/application/munera/data/enums/Role.java index 41d5565..22b6269 100644 --- a/src/main/java/com/application/munera/data/Role.java +++ b/src/main/java/com/application/munera/data/enums/Role.java @@ -1,4 +1,4 @@ -package com.application.munera.data; +package com.application.munera.data.enums; import lombok.Getter; diff --git a/src/main/java/com/application/munera/repositories/ExpenseRepository.java b/src/main/java/com/application/munera/repositories/ExpenseRepository.java index 839770f..d2775ab 100644 --- a/src/main/java/com/application/munera/repositories/ExpenseRepository.java +++ b/src/main/java/com/application/munera/repositories/ExpenseRepository.java @@ -2,7 +2,7 @@ package com.application.munera.repositories; import com.application.munera.data.Expense; -import com.application.munera.data.ExpenseType; +import com.application.munera.data.enums.ExpenseType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/application/munera/services/ExpenseService.java b/src/main/java/com/application/munera/services/ExpenseService.java index 121303c..e93f986 100644 --- a/src/main/java/com/application/munera/services/ExpenseService.java +++ b/src/main/java/com/application/munera/services/ExpenseService.java @@ -1,7 +1,7 @@ package com.application.munera.services; import com.application.munera.data.Expense; -import com.application.munera.data.ExpenseType; +import com.application.munera.data.enums.ExpenseType; import com.application.munera.data.Person; import com.application.munera.repositories.ExpenseRepository; import com.application.munera.repositories.PersonRepository; diff --git a/src/main/java/com/application/munera/services/ViewsService.java b/src/main/java/com/application/munera/services/ViewsService.java index 653d9b4..c417830 100644 --- a/src/main/java/com/application/munera/services/ViewsService.java +++ b/src/main/java/com/application/munera/services/ViewsService.java @@ -1,9 +1,9 @@ package com.application.munera.services; -import com.application.munera.data.BadgeMessage; +import com.application.munera.data.enums.BadgeMessage; import com.application.munera.data.Category; import com.application.munera.data.Expense; -import com.application.munera.data.ExpenseType; +import com.application.munera.data.enums.ExpenseType; import com.vaadin.flow.component.combobox.MultiSelectComboBox; import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.textfield.TextField; diff --git a/src/main/java/com/application/munera/views/expenses/ExpensesView.java b/src/main/java/com/application/munera/views/expenses/ExpensesView.java index f21d76d..ed5599b 100644 --- a/src/main/java/com/application/munera/views/expenses/ExpensesView.java +++ b/src/main/java/com/application/munera/views/expenses/ExpensesView.java @@ -2,7 +2,7 @@ package com.application.munera.views.expenses; import com.application.munera.data.Category; import com.application.munera.data.Expense; -import com.application.munera.data.PeriodUnit; +import com.application.munera.data.enums.PeriodUnit; import com.application.munera.data.Person; import com.application.munera.facades.PersonFacade; import com.application.munera.services.CategoryService; diff --git a/src/main/java/com/application/munera/views/users/UsersView.java b/src/main/java/com/application/munera/views/users/UsersView.java index 82954c5..5fc607a 100644 --- a/src/main/java/com/application/munera/views/users/UsersView.java +++ b/src/main/java/com/application/munera/views/users/UsersView.java @@ -1,6 +1,6 @@ package com.application.munera.views.users; -import com.application.munera.data.Role; +import com.application.munera.data.enums.Role; import com.application.munera.data.User; import com.application.munera.services.UserService; import com.application.munera.views.MainLayout;