Merge branch 'main' into wishList
# Conflicts: # src/main/java/hdm/mi/growbros/exceptions/PlantNotFoundException.java
Showing
- pom.xml 11 additions, 0 deletionspom.xml
- requests.http 6 additions, 2 deletionsrequests.http
- src/main/java/hdm/mi/growbros/GrowBrosApplication.java 0 additions, 24 deletionssrc/main/java/hdm/mi/growbros/GrowBrosApplication.java
- src/main/java/hdm/mi/growbros/config/JpaConfiguration.java 9 additions, 0 deletionssrc/main/java/hdm/mi/growbros/config/JpaConfiguration.java
- src/main/java/hdm/mi/growbros/config/Seeding.java 47 additions, 0 deletionssrc/main/java/hdm/mi/growbros/config/Seeding.java
- src/main/java/hdm/mi/growbros/controllers/GardenController.java 62 additions, 0 deletions...in/java/hdm/mi/growbros/controllers/GardenController.java
- src/main/java/hdm/mi/growbros/exceptions/PlantNotFoundException.java 0 additions, 1 deletion...va/hdm/mi/growbros/exceptions/PlantNotFoundException.java
- src/main/java/hdm/mi/growbros/models/GardenEntry.java 48 additions, 0 deletionssrc/main/java/hdm/mi/growbros/models/GardenEntry.java
- src/main/java/hdm/mi/growbros/models/plant/Plant.java 2 additions, 0 deletionssrc/main/java/hdm/mi/growbros/models/plant/Plant.java
- src/main/java/hdm/mi/growbros/repositories/GardenRepository.java 52 additions, 0 deletions...n/java/hdm/mi/growbros/repositories/GardenRepository.java
- src/main/java/hdm/mi/growbros/repositories/PlantRepository.java 3 additions, 0 deletions...in/java/hdm/mi/growbros/repositories/PlantRepository.java
- src/main/java/hdm/mi/growbros/service/GardenService.java 85 additions, 0 deletionssrc/main/java/hdm/mi/growbros/service/GardenService.java
- src/main/java/hdm/mi/growbros/service/PlantsService.java 4 additions, 0 deletionssrc/main/java/hdm/mi/growbros/service/PlantsService.java
- src/main/java/hdm/mi/growbros/util/FileReader.java 37 additions, 0 deletionssrc/main/java/hdm/mi/growbros/util/FileReader.java
- src/main/resources/plants/default-plants.json 1 addition, 0 deletionssrc/main/resources/plants/default-plants.json
- src/test/java/hdm/mi/growbros/config/SpringSecurityTestConfig.java 61 additions, 0 deletions...java/hdm/mi/growbros/config/SpringSecurityTestConfig.java
- src/test/java/hdm/mi/growbros/config/UserTestData.java 29 additions, 0 deletionssrc/test/java/hdm/mi/growbros/config/UserTestData.java
- src/test/java/hdm/mi/growbros/controllers/GardenControllerTest.java 73 additions, 0 deletions...ava/hdm/mi/growbros/controllers/GardenControllerTest.java
- src/test/java/hdm/mi/growbros/repositories/GardenRepositoryTest.java 119 additions, 0 deletions...va/hdm/mi/growbros/repositories/GardenRepositoryTest.java
- src/test/java/hdm/mi/growbros/service/GardenServiceTest.java 90 additions, 0 deletionssrc/test/java/hdm/mi/growbros/service/GardenServiceTest.java
Loading
Please register or sign in to comment