diff --git a/brcm/pom.xml b/brcm/pom.xml index a064408..e345418 100644 --- a/brcm/pom.xml +++ b/brcm/pom.xml @@ -25,6 +25,10 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-actuator + org.postgresql diff --git a/brcm/src/main/java/repositories/ActivityRepository.java b/brcm/src/main/java/edu/cpp/brcm/ActivityRepository.java similarity index 78% rename from brcm/src/main/java/repositories/ActivityRepository.java rename to brcm/src/main/java/edu/cpp/brcm/ActivityRepository.java index 507ca7b..7be5098 100644 --- a/brcm/src/main/java/repositories/ActivityRepository.java +++ b/brcm/src/main/java/edu/cpp/brcm/ActivityRepository.java @@ -1,6 +1,6 @@ -package repositories; +package edu.cpp.brcm; -import entities.Activity; +import edu.cpp.brcm.entities.Activity; import java.util.List; diff --git a/brcm/src/main/java/repositories/AppointmentRepository.java b/brcm/src/main/java/edu/cpp/brcm/AppointmentRepository.java similarity index 84% rename from brcm/src/main/java/repositories/AppointmentRepository.java rename to brcm/src/main/java/edu/cpp/brcm/AppointmentRepository.java index a63fa8f..e4082f0 100644 --- a/brcm/src/main/java/repositories/AppointmentRepository.java +++ b/brcm/src/main/java/edu/cpp/brcm/AppointmentRepository.java @@ -1,6 +1,6 @@ -package repositories; +package edu.cpp.brcm; -import entities.Appointment; +import edu.cpp.brcm.entities.Appointment; import java.time.LocalDate; import java.util.List; diff --git a/brcm/src/main/java/edu/cpp/brcm/BrcmApplication.java b/brcm/src/main/java/edu/cpp/brcm/BrcmApplication.java index 811f99c..319107e 100644 --- a/brcm/src/main/java/edu/cpp/brcm/BrcmApplication.java +++ b/brcm/src/main/java/edu/cpp/brcm/BrcmApplication.java @@ -8,6 +8,12 @@ public class BrcmApplication { public static void main(String[] args) { SpringApplication.run(BrcmApplication.class, args); +// StudentRepository sr = new StudentRepositoryImpl(); +// CustomerRepository cr = new CustomerRepositoryImpl(); +// ProfessorRepository pr = new ProfessorRepositoryImpl(); +// CustomerManagementServiceImpl s = new CustomerManagementServiceImpl(sr, pr, cr); +// s.saveStudent(new StudentDto(123, LocalDate.now(), "maj", "min", LocalDate.MAX, "fname", "lname", LocalDate.MIN, "12345567")); +// System.out.println( "Hello World!" ); } } diff --git a/brcm/src/main/java/edu/cpp/brcm/CustomerRepository.java b/brcm/src/main/java/edu/cpp/brcm/CustomerRepository.java new file mode 100644 index 0000000..cc25c93 --- /dev/null +++ b/brcm/src/main/java/edu/cpp/brcm/CustomerRepository.java @@ -0,0 +1,11 @@ +package edu.cpp.brcm; + +import edu.cpp.brcm.entities.Customer; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface CustomerRepository extends JpaRepository { +// Customer getCustomerById(int id); +// Customer saveCustomer(Customer customer); +} diff --git a/brcm/src/main/java/repositories/DiscountSchemeRepository.java b/brcm/src/main/java/edu/cpp/brcm/DiscountSchemeRepository.java similarity index 80% rename from brcm/src/main/java/repositories/DiscountSchemeRepository.java rename to brcm/src/main/java/edu/cpp/brcm/DiscountSchemeRepository.java index 521c768..5b7f267 100644 --- a/brcm/src/main/java/repositories/DiscountSchemeRepository.java +++ b/brcm/src/main/java/edu/cpp/brcm/DiscountSchemeRepository.java @@ -1,6 +1,6 @@ -package repositories; +package edu.cpp.brcm; -import entities.Discountscheme; +import edu.cpp.brcm.entities.Discountscheme; import java.util.List; diff --git a/brcm/src/main/java/repositories/LineItemRepository.java b/brcm/src/main/java/edu/cpp/brcm/LineItemRepository.java similarity index 79% rename from brcm/src/main/java/repositories/LineItemRepository.java rename to brcm/src/main/java/edu/cpp/brcm/LineItemRepository.java index 7a188a7..1c342f6 100644 --- a/brcm/src/main/java/repositories/LineItemRepository.java +++ b/brcm/src/main/java/edu/cpp/brcm/LineItemRepository.java @@ -1,6 +1,6 @@ -package repositories; +package edu.cpp.brcm; -import entities.Lineitem; +import edu.cpp.brcm.entities.Lineitem; import java.util.List; diff --git a/brcm/src/main/java/repositories/OrderRepository.java b/brcm/src/main/java/edu/cpp/brcm/OrderRepository.java similarity index 78% rename from brcm/src/main/java/repositories/OrderRepository.java rename to brcm/src/main/java/edu/cpp/brcm/OrderRepository.java index 23b4025..537c040 100644 --- a/brcm/src/main/java/repositories/OrderRepository.java +++ b/brcm/src/main/java/edu/cpp/brcm/OrderRepository.java @@ -1,6 +1,6 @@ -package repositories; +package edu.cpp.brcm; -import entities.Order; +import edu.cpp.brcm.entities.Order; import java.util.Date; import java.util.List; diff --git a/brcm/src/main/java/repositories/PriceHistoryRepository.java b/brcm/src/main/java/edu/cpp/brcm/PriceHistoryRepository.java similarity index 67% rename from brcm/src/main/java/repositories/PriceHistoryRepository.java rename to brcm/src/main/java/edu/cpp/brcm/PriceHistoryRepository.java index 4432c33..7c0c1c5 100644 --- a/brcm/src/main/java/repositories/PriceHistoryRepository.java +++ b/brcm/src/main/java/edu/cpp/brcm/PriceHistoryRepository.java @@ -1,6 +1,6 @@ -package repositories; +package edu.cpp.brcm; -import entities.Historicalprice; +import edu.cpp.brcm.entities.Historicalprice; import java.util.List; diff --git a/brcm/src/main/java/repositories/ProfessorRepository.java b/brcm/src/main/java/edu/cpp/brcm/ProfessorRepository.java similarity index 81% rename from brcm/src/main/java/repositories/ProfessorRepository.java rename to brcm/src/main/java/edu/cpp/brcm/ProfessorRepository.java index 5a1aea6..9823533 100644 --- a/brcm/src/main/java/repositories/ProfessorRepository.java +++ b/brcm/src/main/java/edu/cpp/brcm/ProfessorRepository.java @@ -1,6 +1,6 @@ -package repositories; +package edu.cpp.brcm; -import entities.Professor; +import edu.cpp.brcm.entities.Professor; import java.util.List; public interface ProfessorRepository { Professor saveProfessor(Professor Professor); diff --git a/brcm/src/main/java/repositories/StudentRepository.java b/brcm/src/main/java/edu/cpp/brcm/StudentRepository.java similarity index 81% rename from brcm/src/main/java/repositories/StudentRepository.java rename to brcm/src/main/java/edu/cpp/brcm/StudentRepository.java index 7d4d8d6..d986f32 100644 --- a/brcm/src/main/java/repositories/StudentRepository.java +++ b/brcm/src/main/java/edu/cpp/brcm/StudentRepository.java @@ -1,6 +1,6 @@ -package repositories; +package edu.cpp.brcm; -import entities.Student; +import edu.cpp.brcm.entities.Student; import java.util.List; public interface StudentRepository { diff --git a/brcm/src/main/java/common/Hibernate.java b/brcm/src/main/java/edu/cpp/brcm/common/Hibernate.java similarity index 93% rename from brcm/src/main/java/common/Hibernate.java rename to brcm/src/main/java/edu/cpp/brcm/common/Hibernate.java index ccf7c0c..dc5e801 100644 --- a/brcm/src/main/java/common/Hibernate.java +++ b/brcm/src/main/java/edu/cpp/brcm/common/Hibernate.java @@ -1,4 +1,4 @@ -package common; +package edu.cpp.brcm.common; import org.hibernate.Session; import org.hibernate.SessionFactory; diff --git a/brcm/src/main/java/edu/cpp/brcm/controllers/CustomerController.java b/brcm/src/main/java/edu/cpp/brcm/controllers/CustomerController.java new file mode 100644 index 0000000..e41e59b --- /dev/null +++ b/brcm/src/main/java/edu/cpp/brcm/controllers/CustomerController.java @@ -0,0 +1,28 @@ +package edu.cpp.brcm.controllers; + +import edu.cpp.brcm.entities.Customer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import edu.cpp.brcm.CustomerRepository; + +import java.util.List; + +@RestController +@RequestMapping("/api/v1") +public class CustomerController { + @Autowired + private CustomerRepository repository; + @GetMapping("/customers") + public List getAllCustomers() { + return repository.findAll(); + } + + @GetMapping("/customers/{id}") + public ResponseEntity getCustomerById(@PathVariable(value = "id") int CustomerId) + throws Exception { + Customer Customer = repository.findById(CustomerId) + .orElseThrow(() -> new Exception("Customer not found for this id :: " + CustomerId)); + return ResponseEntity.ok().body(Customer); + } +} diff --git a/brcm/src/main/java/dtos/ActivityDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/ActivityDto.java similarity index 84% rename from brcm/src/main/java/dtos/ActivityDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/ActivityDto.java index adf170e..4e10a3c 100644 --- a/brcm/src/main/java/dtos/ActivityDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/ActivityDto.java @@ -1,9 +1,9 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; /** - * A DTO for the {@link entities.Activity} entity + * A DTO for the {@link edu.cpp.brcm.entities.Activity} entity */ public class ActivityDto implements Serializable { private final Integer id; diff --git a/brcm/src/main/java/dtos/AddressDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/AddressDto.java similarity index 91% rename from brcm/src/main/java/dtos/AddressDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/AddressDto.java index e9d55f2..fdf64eb 100644 --- a/brcm/src/main/java/dtos/AddressDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/AddressDto.java @@ -1,9 +1,9 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; /** - * A DTO for the {@link entities.Address} entity + * A DTO for the {@link edu.cpp.brcm.entities.Address} entity */ public class AddressDto implements Serializable { private final Integer id; diff --git a/brcm/src/main/java/dtos/AppointmentDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/AppointmentDto.java similarity index 91% rename from brcm/src/main/java/dtos/AppointmentDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/AppointmentDto.java index 742a56a..edae9b0 100644 --- a/brcm/src/main/java/dtos/AppointmentDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/AppointmentDto.java @@ -1,10 +1,10 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; import java.time.Instant; /** - * A DTO for the {@link entities.Appointment} entity + * A DTO for the {@link edu.cpp.brcm.entities.Appointment} entity */ public class AppointmentDto implements Serializable { private final Integer id; diff --git a/brcm/src/main/java/dtos/CustomerDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/CustomerDto.java similarity index 90% rename from brcm/src/main/java/dtos/CustomerDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/CustomerDto.java index cafe969..99f7793 100644 --- a/brcm/src/main/java/dtos/CustomerDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/CustomerDto.java @@ -1,10 +1,10 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; import java.time.LocalDate; /** - * A DTO for the {@link entities.Customer} entity + * A DTO for the {@link edu.cpp.brcm.entities.Customer} entity */ public class CustomerDto implements Serializable { private final Integer id; diff --git a/brcm/src/main/java/dtos/DiscountschemeDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/DiscountschemeDto.java similarity index 92% rename from brcm/src/main/java/dtos/DiscountschemeDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/DiscountschemeDto.java index 3b13362..db4e497 100644 --- a/brcm/src/main/java/dtos/DiscountschemeDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/DiscountschemeDto.java @@ -1,10 +1,10 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; import java.time.LocalDate; /** - * A DTO for the {@link entities.Discountscheme} entity + * A DTO for the {@link edu.cpp.brcm.entities.Discountscheme} entity */ public class DiscountschemeDto implements Serializable { private final Integer id; diff --git a/brcm/src/main/java/dtos/HistoricalpriceDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/HistoricalpriceDto.java similarity index 84% rename from brcm/src/main/java/dtos/HistoricalpriceDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/HistoricalpriceDto.java index 29e13e0..634a9a7 100644 --- a/brcm/src/main/java/dtos/HistoricalpriceDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/HistoricalpriceDto.java @@ -1,10 +1,10 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; import java.time.LocalDate; /** - * A DTO for the {@link entities.Historicalprice} entity + * A DTO for the {@link edu.cpp.brcm.entities.Historicalprice} entity */ public class HistoricalpriceDto implements Serializable { private final Integer id; diff --git a/brcm/src/main/java/dtos/LineitemDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/LineitemDto.java similarity index 93% rename from brcm/src/main/java/dtos/LineitemDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/LineitemDto.java index 93d5492..ed6c2d7 100644 --- a/brcm/src/main/java/dtos/LineitemDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/LineitemDto.java @@ -1,4 +1,4 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; diff --git a/brcm/src/main/java/dtos/OrderDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/OrderDto.java similarity index 98% rename from brcm/src/main/java/dtos/OrderDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/OrderDto.java index d1ff14a..51d26e6 100644 --- a/brcm/src/main/java/dtos/OrderDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/OrderDto.java @@ -1,4 +1,4 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; import java.time.LocalDate; diff --git a/brcm/src/main/java/dtos/ProfessorDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/ProfessorDto.java similarity index 97% rename from brcm/src/main/java/dtos/ProfessorDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/ProfessorDto.java index 6f802c5..7189450 100644 --- a/brcm/src/main/java/dtos/ProfessorDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/ProfessorDto.java @@ -1,4 +1,4 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; import java.time.LocalDate; diff --git a/brcm/src/main/java/dtos/StudentDto.java b/brcm/src/main/java/edu/cpp/brcm/dtos/StudentDto.java similarity index 97% rename from brcm/src/main/java/dtos/StudentDto.java rename to brcm/src/main/java/edu/cpp/brcm/dtos/StudentDto.java index 3c272d2..0ced9be 100644 --- a/brcm/src/main/java/dtos/StudentDto.java +++ b/brcm/src/main/java/edu/cpp/brcm/dtos/StudentDto.java @@ -1,4 +1,4 @@ -package dtos; +package edu.cpp.brcm.dtos; import java.io.Serializable; import java.time.LocalDate; diff --git a/brcm/src/main/java/entities/Activity.java b/brcm/src/main/java/edu/cpp/brcm/entities/Activity.java similarity index 95% rename from brcm/src/main/java/entities/Activity.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Activity.java index 8f0cf38..11c5c16 100644 --- a/brcm/src/main/java/entities/Activity.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Activity.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; diff --git a/brcm/src/main/java/entities/Address.java b/brcm/src/main/java/edu/cpp/brcm/entities/Address.java similarity index 97% rename from brcm/src/main/java/entities/Address.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Address.java index e22afbb..b5bffbc 100644 --- a/brcm/src/main/java/entities/Address.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Address.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; diff --git a/brcm/src/main/java/entities/Appointment.java b/brcm/src/main/java/edu/cpp/brcm/entities/Appointment.java similarity index 97% rename from brcm/src/main/java/entities/Appointment.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Appointment.java index e3aeeec..d1d07d0 100644 --- a/brcm/src/main/java/entities/Appointment.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Appointment.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; import java.time.Instant; diff --git a/brcm/src/main/java/entities/Customer.java b/brcm/src/main/java/edu/cpp/brcm/entities/Customer.java similarity index 97% rename from brcm/src/main/java/entities/Customer.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Customer.java index 9ed0852..c29ba03 100644 --- a/brcm/src/main/java/entities/Customer.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Customer.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; import java.time.LocalDate; diff --git a/brcm/src/main/java/entities/Discountscheme.java b/brcm/src/main/java/edu/cpp/brcm/entities/Discountscheme.java similarity index 97% rename from brcm/src/main/java/entities/Discountscheme.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Discountscheme.java index 17418f7..0fef88e 100644 --- a/brcm/src/main/java/entities/Discountscheme.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Discountscheme.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; import java.time.LocalDate; diff --git a/brcm/src/main/java/entities/Historicalprice.java b/brcm/src/main/java/edu/cpp/brcm/entities/Historicalprice.java similarity index 97% rename from brcm/src/main/java/entities/Historicalprice.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Historicalprice.java index 0602f63..bab499b 100644 --- a/brcm/src/main/java/entities/Historicalprice.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Historicalprice.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; import java.time.LocalDate; diff --git a/brcm/src/main/java/entities/Lineitem.java b/brcm/src/main/java/edu/cpp/brcm/entities/Lineitem.java similarity index 97% rename from brcm/src/main/java/entities/Lineitem.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Lineitem.java index 2f7af38..aae39b6 100644 --- a/brcm/src/main/java/entities/Lineitem.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Lineitem.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; diff --git a/brcm/src/main/java/entities/Order.java b/brcm/src/main/java/edu/cpp/brcm/entities/Order.java similarity index 98% rename from brcm/src/main/java/entities/Order.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Order.java index 00fe507..8b566ce 100644 --- a/brcm/src/main/java/entities/Order.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Order.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; import java.time.LocalDate; diff --git a/brcm/src/main/java/entities/Professor.java b/brcm/src/main/java/edu/cpp/brcm/entities/Professor.java similarity index 97% rename from brcm/src/main/java/entities/Professor.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Professor.java index 598d11b..a243d39 100644 --- a/brcm/src/main/java/entities/Professor.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Professor.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; diff --git a/brcm/src/main/java/entities/Student.java b/brcm/src/main/java/edu/cpp/brcm/entities/Student.java similarity index 97% rename from brcm/src/main/java/entities/Student.java rename to brcm/src/main/java/edu/cpp/brcm/entities/Student.java index 34e2a0e..596c481 100644 --- a/brcm/src/main/java/entities/Student.java +++ b/brcm/src/main/java/edu/cpp/brcm/entities/Student.java @@ -1,4 +1,4 @@ -package entities; +package edu.cpp.brcm.entities; import javax.persistence.*; import java.time.LocalDate; diff --git a/brcm/src/main/java/impl/CustomerManagementServiceImpl.java b/brcm/src/main/java/edu/cpp/brcm/impl/CustomerManagementServiceImpl.java similarity index 84% rename from brcm/src/main/java/impl/CustomerManagementServiceImpl.java rename to brcm/src/main/java/edu/cpp/brcm/impl/CustomerManagementServiceImpl.java index d0285cd..a418b90 100644 --- a/brcm/src/main/java/impl/CustomerManagementServiceImpl.java +++ b/brcm/src/main/java/edu/cpp/brcm/impl/CustomerManagementServiceImpl.java @@ -1,13 +1,13 @@ -package impl; +package edu.cpp.brcm.impl; -import dtos.ProfessorDto; -import dtos.StudentDto; -import entities.Customer; -import entities.Student; -import repositories.CustomerRepository; -import repositories.ProfessorRepository; -import repositories.StudentRepository; -import services.CustomerManagementService; +import edu.cpp.brcm.dtos.ProfessorDto; +import edu.cpp.brcm.dtos.StudentDto; +import edu.cpp.brcm.entities.Customer; +import edu.cpp.brcm.entities.Student; +import edu.cpp.brcm.CustomerRepository; +import edu.cpp.brcm.ProfessorRepository; +import edu.cpp.brcm.StudentRepository; +import edu.cpp.brcm.services.CustomerManagementService; import java.util.List; diff --git a/brcm/src/main/java/edu/cpp/brcm/impl/CustomerRepositoryImpl.java b/brcm/src/main/java/edu/cpp/brcm/impl/CustomerRepositoryImpl.java new file mode 100644 index 0000000..dd9b194 --- /dev/null +++ b/brcm/src/main/java/edu/cpp/brcm/impl/CustomerRepositoryImpl.java @@ -0,0 +1,29 @@ +//package edu.cpp.brcm.impl; +// +//import common.Hibernate; +//import edu.cpp.brcm.entities.Customer; +//import org.hibernate.Session; +//import edu.cpp.brcm.repositories.CustomerRepository; +// +//import java.util.Optional; +// +//public class CustomerRepositoryImpl implements CustomerRepository { +// private Session session; +// +// public CustomerRepositoryImpl(){ +// session = Hibernate.getSession(); +// } +// @Override +// public Customer getCustomerById(int id) { +// Customer customer = (Customer)session.get(Customer.class, id); +// return customer; +// } +// +// @Override +// public Customer saveCustomer(Customer customer) { +// int id = (Integer)session.save(customer); +// session.flush(); +// customer.setId(id); +// return customer; +// } +//} diff --git a/brcm/src/main/java/impl/ProfessorRepositoryImpl.java b/brcm/src/main/java/edu/cpp/brcm/impl/ProfessorRepositoryImpl.java similarity index 82% rename from brcm/src/main/java/impl/ProfessorRepositoryImpl.java rename to brcm/src/main/java/edu/cpp/brcm/impl/ProfessorRepositoryImpl.java index ce79ffd..f099936 100644 --- a/brcm/src/main/java/impl/ProfessorRepositoryImpl.java +++ b/brcm/src/main/java/edu/cpp/brcm/impl/ProfessorRepositoryImpl.java @@ -1,7 +1,7 @@ -package impl; +package edu.cpp.brcm.impl; -import entities.Professor; -import repositories.ProfessorRepository; +import edu.cpp.brcm.entities.Professor; +import edu.cpp.brcm.ProfessorRepository; import java.util.List; diff --git a/brcm/src/main/java/impl/StudentRepositoryImpl.java b/brcm/src/main/java/edu/cpp/brcm/impl/StudentRepositoryImpl.java similarity index 90% rename from brcm/src/main/java/impl/StudentRepositoryImpl.java rename to brcm/src/main/java/edu/cpp/brcm/impl/StudentRepositoryImpl.java index a99656f..466bb1b 100644 --- a/brcm/src/main/java/impl/StudentRepositoryImpl.java +++ b/brcm/src/main/java/edu/cpp/brcm/impl/StudentRepositoryImpl.java @@ -1,10 +1,10 @@ -package impl; +package edu.cpp.brcm.impl; -import common.Hibernate; -import entities.Student; +import edu.cpp.brcm.common.Hibernate; +import edu.cpp.brcm.entities.Student; import org.hibernate.Session; import org.hibernate.query.Query; -import repositories.StudentRepository; +import edu.cpp.brcm.StudentRepository; import java.util.List; import java.util.stream.Collectors; diff --git a/brcm/src/main/java/services/ActivityRegistrationService.java b/brcm/src/main/java/edu/cpp/brcm/services/ActivityRegistrationService.java similarity index 61% rename from brcm/src/main/java/services/ActivityRegistrationService.java rename to brcm/src/main/java/edu/cpp/brcm/services/ActivityRegistrationService.java index 8ca1cdc..985f159 100644 --- a/brcm/src/main/java/services/ActivityRegistrationService.java +++ b/brcm/src/main/java/edu/cpp/brcm/services/ActivityRegistrationService.java @@ -1,4 +1,4 @@ -package services; +package edu.cpp.brcm.services; public interface ActivityRegistrationService { } diff --git a/brcm/src/main/java/services/CustomerManagementService.java b/brcm/src/main/java/edu/cpp/brcm/services/CustomerManagementService.java similarity index 83% rename from brcm/src/main/java/services/CustomerManagementService.java rename to brcm/src/main/java/edu/cpp/brcm/services/CustomerManagementService.java index 9e832ca..b929593 100644 --- a/brcm/src/main/java/services/CustomerManagementService.java +++ b/brcm/src/main/java/edu/cpp/brcm/services/CustomerManagementService.java @@ -1,7 +1,7 @@ -package services; +package edu.cpp.brcm.services; -import dtos.ProfessorDto; -import dtos.StudentDto; +import edu.cpp.brcm.dtos.ProfessorDto; +import edu.cpp.brcm.dtos.StudentDto; import java.util.List; public interface CustomerManagementService { diff --git a/brcm/src/main/java/services/DiscountManagementService.java b/brcm/src/main/java/edu/cpp/brcm/services/DiscountManagementService.java similarity index 60% rename from brcm/src/main/java/services/DiscountManagementService.java rename to brcm/src/main/java/edu/cpp/brcm/services/DiscountManagementService.java index 78efeb9..b0ccc85 100644 --- a/brcm/src/main/java/services/DiscountManagementService.java +++ b/brcm/src/main/java/edu/cpp/brcm/services/DiscountManagementService.java @@ -1,4 +1,4 @@ -package services; +package edu.cpp.brcm.services; public interface DiscountManagementService { } diff --git a/brcm/src/main/java/services/PriceHistoryService.java b/brcm/src/main/java/edu/cpp/brcm/services/PriceHistoryService.java similarity index 57% rename from brcm/src/main/java/services/PriceHistoryService.java rename to brcm/src/main/java/edu/cpp/brcm/services/PriceHistoryService.java index eb54727..38fb89d 100644 --- a/brcm/src/main/java/services/PriceHistoryService.java +++ b/brcm/src/main/java/edu/cpp/brcm/services/PriceHistoryService.java @@ -1,4 +1,4 @@ -package services; +package edu.cpp.brcm.services; public interface PriceHistoryService { } diff --git a/brcm/src/main/java/services/RevenueReportService.java b/brcm/src/main/java/edu/cpp/brcm/services/RevenueReportService.java similarity index 58% rename from brcm/src/main/java/services/RevenueReportService.java rename to brcm/src/main/java/edu/cpp/brcm/services/RevenueReportService.java index ca88e56..234b8db 100644 --- a/brcm/src/main/java/services/RevenueReportService.java +++ b/brcm/src/main/java/edu/cpp/brcm/services/RevenueReportService.java @@ -1,4 +1,4 @@ -package services; +package edu.cpp.brcm.services; public interface RevenueReportService { } diff --git a/brcm/src/main/java/services/VisitRegistrationService.java b/brcm/src/main/java/edu/cpp/brcm/services/VisitRegistrationService.java similarity index 60% rename from brcm/src/main/java/services/VisitRegistrationService.java rename to brcm/src/main/java/edu/cpp/brcm/services/VisitRegistrationService.java index 1e519a0..c3fe9b1 100644 --- a/brcm/src/main/java/services/VisitRegistrationService.java +++ b/brcm/src/main/java/edu/cpp/brcm/services/VisitRegistrationService.java @@ -1,4 +1,4 @@ -package services; +package edu.cpp.brcm.services; public interface VisitRegistrationService { } diff --git a/brcm/src/main/java/impl/CustomerRepositoryImpl.java b/brcm/src/main/java/impl/CustomerRepositoryImpl.java deleted file mode 100644 index 80f9b86..0000000 --- a/brcm/src/main/java/impl/CustomerRepositoryImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package impl; - -import common.Hibernate; -import entities.Customer; -import org.hibernate.Session; -import repositories.CustomerRepository; - -import java.util.Optional; - -public class CustomerRepositoryImpl implements CustomerRepository { - private Session session; - - public CustomerRepositoryImpl(){ - session = Hibernate.getSession(); - } - @Override - public Customer getCustomerById(int id) { - Customer customer = (Customer)session.get(Customer.class, id); - return customer; - } - - @Override - public Customer saveCustomer(Customer customer) { - int id = (Integer)session.save(customer); - session.flush(); - customer.setId(id); - return customer; - } - - @Override - public S save(S entity) { - return null; - } - - @Override - public Iterable saveAll(Iterable entities) { - return null; - } - - @Override - public Optional findById(Integer integer) { - return Optional.empty(); - } - - @Override - public boolean existsById(Integer integer) { - return false; - } - - @Override - public Iterable findAll() { - return null; - } - - @Override - public Iterable findAllById(Iterable integers) { - return null; - } - - @Override - public long count() { - return 0; - } - - @Override - public void deleteById(Integer integer) { - - } - - @Override - public void delete(Customer entity) { - - } - - @Override - public void deleteAllById(Iterable integers) { - - } - - @Override - public void deleteAll(Iterable entities) { - - } - - @Override - public void deleteAll() { - - } -} diff --git a/brcm/src/main/java/repositories/CustomerRepository.java b/brcm/src/main/java/repositories/CustomerRepository.java deleted file mode 100644 index 9a8d5bc..0000000 --- a/brcm/src/main/java/repositories/CustomerRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package repositories; - -import entities.Customer; -import org.springframework.data.repository.CrudRepository; - -public interface CustomerRepository extends CrudRepository { - Customer getCustomerById(int id); - Customer saveCustomer(Customer customer); -} diff --git a/brcm/src/main/resources/application.properties b/brcm/src/main/resources/application.properties index fc3eb82..c033401 100644 --- a/brcm/src/main/resources/application.properties +++ b/brcm/src/main/resources/application.properties @@ -5,3 +5,5 @@ spring.datasource.driver-class-name=org.postgresql.Driver spring.jpa.database-platform = org.hibernate.dialect.PostgreSQLDialect spring.jpa.generate-ddl=true spring.jpa.hibernate.ddl-auto = update +management.endpoints.jmx.exposure.include=health,info,env,beans +management.endpoints.web.exposure.include=health,info,env,beans