Upgrade to Spring Boot 2.0.x (#388)

* upgrade to 2.0.x

* findOne() → findById()

* delete() → deleteById()

* save() → saveAll()

* UriUtils.encode no longer throws exception

* update configuration

* upgrade to Flyway 5.0

* fix build file name

build.gradle

@@ -3,24 +3,23 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.22.RELEASE")
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:2.0.9.RELEASE")
     }
 }
 
-plugins {
-    id 'java'
-    id 'org.springframework.boot' version '1.5.22.RELEASE'
-    id 'checkstyle'
-    id 'idea'
-}
+apply plugin: 'java'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
+apply plugin: 'checkstyle'
+apply plugin: 'idea'
 
 checkstyle {
     configFile file("checkstyle.xml")
 }
 
-jar {
-    baseName = 'ipa-api'
-    version =  '0.1.0'
+bootJar {
+    archiveBaseName = 'ipa-api'
+    archiveVersion = '0.1.0'
 }
 
 repositories {
@@ -54,7 +53,7 @@ dependencies {
     compile("org.slf4j:slf4j-api:1.7.25")
     compile("org.apache.commons:commons-lang3:3.7")
     compile("javax.mail:mail:1.4.7")
-    compile("org.flywaydb:flyway-core:4.2.0")
+    compile("org.flywaydb:flyway-core:5.0.7")
     compile("org.apache.httpcomponents:httpclient:4.5.9")
     compile("org.javers:javers-core:2.4.1")
     compile("javax.xml.bind:jaxb-api:2.3.1")

src/main/java/edu/ucdavis/dss/ipa/repositories/BudgetRepository.java

@@ -4,7 +4,5 @@
 import org.springframework.data.repository.CrudRepository;
 
 public interface BudgetRepository extends CrudRepository<Budget, Long> {
-    Budget findById(Long id);
-
     Budget findByScheduleId(Long scheduleId);
 }

src/main/java/edu/ucdavis/dss/ipa/repositories/BudgetScenarioRepository.java

@@ -8,8 +8,6 @@
 import java.util.List;
 
 public interface BudgetScenarioRepository extends CrudRepository<BudgetScenario, Long> {
-    BudgetScenario findById(Long id);
-
     BudgetScenario findByBudgetIdAndName(long id, String budgetScenarioName);
 
     @Query( " SELECT DISTINCT bs" +

src/main/java/edu/ucdavis/dss/ipa/repositories/ExpenseItemRepository.java

@@ -22,8 +22,6 @@ public interface ExpenseItemRepository extends CrudRepository<ExpenseItem, Long>
             " AND bs.id = :budgetScenarioId ")
     List<ExpenseItem> findByBudgetScenarioId(@Param("budgetScenarioId") Long budgetScenarioId);
 
-    ExpenseItem findById(Long expenseItemId);
-
     void deleteById(long expenseItemId);
 
     @Modifying

src/main/java/edu/ucdavis/dss/ipa/repositories/ExpenseItemTypeRepository.java

@@ -4,7 +4,5 @@
 import org.springframework.data.repository.CrudRepository;
 
 public interface ExpenseItemTypeRepository extends CrudRepository<ExpenseItemType, Long> {
-    ExpenseItemType findById(long ExpenseItemTypeId);
-
     ExpenseItemType findByDescription(String description);
 }

src/main/java/edu/ucdavis/dss/ipa/repositories/InstructorCostRepository.java

@@ -9,8 +9,6 @@
 import java.util.List;
 
 public interface InstructorCostRepository extends CrudRepository<InstructorCost, Long> {
-    InstructorCost findById(Long lineItemId);
-
     void deleteById(long lineItemId);
 
     List<InstructorCost> findByBudgetId(Long budgetId);

src/main/java/edu/ucdavis/dss/ipa/repositories/InstructorRepository.java

@@ -5,9 +5,6 @@
 import edu.ucdavis.dss.ipa.entities.Instructor;
 
 public interface InstructorRepository extends CrudRepository<Instructor, Long> {
-
-	Instructor findById(Long id);
-
 	Instructor findByUcdStudentSID(String ucdStudentSID);
 
 	Instructor findByLoginIdIgnoreCase(String loginId);

src/main/java/edu/ucdavis/dss/ipa/repositories/InstructorSupportCallResponseRepository.java

@@ -6,8 +6,6 @@
 import java.util.List;
 
 public interface InstructorSupportCallResponseRepository extends CrudRepository<InstructorSupportCallResponse, Long> {
-    InstructorSupportCallResponse findById (long instructorSupportCallResponseId);
-
     List<InstructorSupportCallResponse> findByScheduleId (long scheduleId);
 
     InstructorSupportCallResponse findByScheduleIdAndInstructorIdAndTermCode(long scheduleId, long instructorId, String termCode);

src/main/java/edu/ucdavis/dss/ipa/repositories/InstructorSupportPreferenceRepository.java

@@ -18,7 +18,5 @@ public interface InstructorSupportPreferenceRepository extends CrudRepository<In
 
     List<InstructorSupportPreference> findByInstructorId(long instructorId);
 
-    InstructorSupportPreference findById(long preferenceId);
-
     List<InstructorSupportPreference> findByInstructorIdAndSectionGroupId(Long instructorId, Long sectionGroupId);
 }

src/main/java/edu/ucdavis/dss/ipa/repositories/InstructorTypeCostRepository.java

@@ -9,8 +9,6 @@
 import java.util.List;
 
 public interface InstructorTypeCostRepository extends CrudRepository<InstructorTypeCost, Long> {
-    InstructorTypeCost findById(Long instructorTypeId);
-
     void deleteById(long instructorTypeCostId);
 
     InstructorTypeCost findByInstructorTypeIdAndBudgetId(long instructorTypeId, long budgetId);

src/main/java/edu/ucdavis/dss/ipa/repositories/InstructorTypeRepository.java

@@ -4,5 +4,4 @@
 import org.springframework.data.repository.CrudRepository;
 
 public interface InstructorTypeRepository extends CrudRepository<InstructorType, Long> {
-    InstructorType findById(Long instructorTypeId);
 }

src/main/java/edu/ucdavis/dss/ipa/repositories/LineItemCategoryRepository.java

@@ -9,7 +9,5 @@
 import java.util.List;
 
 public interface LineItemCategoryRepository extends CrudRepository<LineItemCategory, Long> {
-    LineItemCategory findById(long lineItemCategoryId);
-
     LineItemCategory findByDescription(String description);
 }

src/main/java/edu/ucdavis/dss/ipa/repositories/LineItemRepository.java

@@ -16,8 +16,6 @@ public interface LineItemRepository extends CrudRepository<LineItem, Long> {
             " AND b.id = :budgetId ")
     List<LineItem> findByBudgetId(@Param("budgetId") Long budgetId);
 
-    LineItem findById(Long lineItemId);
-
     void deleteById(long lineItemId);
 
     @Modifying

src/main/java/edu/ucdavis/dss/ipa/repositories/LineItemTypeRepository.java

@@ -4,5 +4,4 @@
 import org.springframework.data.repository.CrudRepository;
 
 public interface LineItemTypeRepository extends CrudRepository<LineItemType, Long> {
-    LineItemType findById(long LineItemTypeId);
 }

src/main/java/edu/ucdavis/dss/ipa/repositories/ReasonCategoryRepository.java

@@ -4,5 +4,4 @@
 import org.springframework.data.repository.CrudRepository;
 
 public interface ReasonCategoryRepository extends CrudRepository<ReasonCategory, Long> {
-    ReasonCategory findById(long reasonCategoryId);
 }

src/main/java/edu/ucdavis/dss/ipa/repositories/SectionGroupCostInstructorRepository.java

@@ -10,8 +10,6 @@
 import java.util.List;
 
 public interface SectionGroupCostInstructorRepository extends CrudRepository<SectionGroupCostInstructor, Long> {
-    SectionGroupCostInstructor findById(long sectionGroupCostInstructorId);
-
     @Query( " SELECT DISTINCT sgci" +
             " FROM SectionGroupCostInstructor sgci, SectionGroupCost sgc, BudgetScenario bs, Budget b" +
             " WHERE b.id = :budgetId" +

src/main/java/edu/ucdavis/dss/ipa/repositories/SectionGroupCostRepository.java

@@ -15,8 +15,6 @@ public interface SectionGroupCostRepository extends CrudRepository<SectionGroupC
             " AND b.id = :budgetId ")
     List<SectionGroupCost> findByBudgetId(@Param("budgetId") Long budgetId);
 
-    SectionGroupCost findById(long sectionGroupCostId);
-
     @Query( " SELECT DISTINCT sgc" +
         " FROM Schedule s, Workgroup w, Budget b, BudgetScenario bs, SectionGroupCost sgc" +
         " WHERE sgc.budgetScenario = bs" +

src/main/java/edu/ucdavis/dss/ipa/repositories/SectionGroupRepository.java

@@ -8,8 +8,6 @@
 import java.util.List;
 
 public interface SectionGroupRepository extends CrudRepository<SectionGroup, Long> {
-	SectionGroup findById(Long id);
-
 	List<SectionGroup> findByCourseScheduleWorkgroupIdAndCourseScheduleYear(long workgroupId, long year);
 
 	@Query( " SELECT DISTINCT sg" +

src/main/java/edu/ucdavis/dss/ipa/repositories/SectionRepository.java

@@ -8,9 +8,6 @@
 import java.util.List;
 
 public interface SectionRepository extends CrudRepository<Section, Long> {
-
-	Section findById(Long id);
-
     /**
      * Finds sections that do have sections and those sections have the
      * visible flag set to true or Null

src/main/java/edu/ucdavis/dss/ipa/repositories/SupportAssignmentRepository.java

@@ -7,6 +7,4 @@
 import org.springframework.transaction.annotation.Transactional;
 
 public interface SupportAssignmentRepository extends CrudRepository<SupportAssignment, Long> {
-
-    SupportAssignment findById(Long id);
 }

src/main/java/edu/ucdavis/dss/ipa/repositories/SupportStaffRepository.java

@@ -4,8 +4,5 @@
 import org.springframework.data.repository.CrudRepository;
 
 public interface SupportStaffRepository extends CrudRepository<SupportStaff, Long> {
-
-    SupportStaff findById(Long id);
-
     SupportStaff findByLoginIdIgnoreCase(String loginId);
 }

src/main/java/edu/ucdavis/dss/ipa/repositories/TeachingAssignmentRepository.java

@@ -12,9 +12,6 @@
 import java.util.List;
 
 public interface TeachingAssignmentRepository extends CrudRepository<TeachingAssignment, Long> {
-
-	TeachingAssignment findById(Long id);
-
 	TeachingAssignment findOneBySectionGroupAndInstructorAndTermCode(SectionGroup sectionGroup, Instructor instructor, String termCode);
 
 	TeachingAssignment findOneByInstructorIdAndScheduleIdAndTermCodeAndBuyoutAndAndCourseReleaseAndSabbaticalAndInResidenceAndWorkLifeBalanceAndLeaveOfAbsenceAndSabbaticalInResidenceAndJointAppointmentAndInterdisciplinaryTeachingAndWorkLoadCredit(

src/main/java/edu/ucdavis/dss/ipa/repositories/UserRepository.java

@@ -13,8 +13,6 @@ public interface UserRepository extends CrudRepository<User, Long> {
 
 	User findByToken(String token);
 
-	User findById(Long id);
-
 	@Query("SELECT u FROM User u WHERE u.loginId LIKE :query% OR u.firstName LIKE :query% OR u.lastName LIKE :query%")
 	List<User> findByFirstNameOrLastNameOrLoginId(@Param("query") String query);
 

src/main/java/edu/ucdavis/dss/ipa/security/CasEntryPoint.java

@@ -33,12 +33,8 @@ public CasEntryPoint(String preLoginPath, String casLoginUrl, String returnUrl)
     public String getReturnUrl() { return returnUrl; }
 
     public String getCasLoginUrl() {
-        try {
-            return casLoginUrl + (casLoginUrl.contains("?") ? "&" : "?")
-                    + ServiceProperties.DEFAULT_CAS_SERVICE_PARAMETER + "=" + UriUtils.encode(getReturnUrl(), "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        return casLoginUrl + (casLoginUrl.contains("?") ? "&" : "?")
+                + ServiceProperties.DEFAULT_CAS_SERVICE_PARAMETER + "=" + UriUtils.encode(getReturnUrl(), "UTF-8");
     }
 
     @Override

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaActivityService.java

@@ -60,13 +60,13 @@ public Activity saveActivity(Activity activity) {
 
 	@Override
 	public Activity findOneById(Long id) {
-		return this.activityRepository.findOne(id);
+		return this.activityRepository.findById(id).orElse(null);
 	}
 
 	@Override
 	@Transactional
 	public void deleteActivityById(Long id) {
-		activityRepository.delete(id);
+		activityRepository.deleteById(id);
 	}
 
 	@Override

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetScenarioService.java

@@ -124,7 +124,7 @@ public BudgetScenario findOrCreate(Budget budget, String budgetScenarioName) {
     @Transactional
     @Override
     public BudgetScenario createFromExisting(Long workgroupId, Long scenarioId, String name, boolean copyFunds) {
-        BudgetScenario originalBudgetScenario = budgetScenarioRepository.findById(scenarioId);
+        BudgetScenario originalBudgetScenario = budgetScenarioRepository.findById(scenarioId).orElse(null);
 
         if (originalBudgetScenario == null) {
             return null;
@@ -165,7 +165,7 @@ public BudgetScenario createFromExisting(Long workgroupId, Long scenarioId, Stri
     }
 
     public BudgetScenario createBudgetRequestScenario(long workgroupId, long scenarioId) {
-        BudgetScenario originalScenario = budgetScenarioRepository.findById(scenarioId);
+        BudgetScenario originalScenario = budgetScenarioRepository.findById(scenarioId).orElse(null);
 
         if (originalScenario == null) { return null; }
 
@@ -223,7 +223,7 @@ public BudgetScenario createBudgetRequestScenario(long workgroupId, long scenari
 
     @Override
     public BudgetScenario approveBudgetRequestScenario(long workgroupId, long scenarioId) {
-        BudgetScenario approvedScenario = budgetScenarioRepository.findById(scenarioId);
+        BudgetScenario approvedScenario = budgetScenarioRepository.findById(scenarioId).orElse(null);
 
         // only one budget request should be approved at a time
         List<BudgetScenario> budgetRequestScenarios = budgetScenarioRepository.findbyWorkgroupIdAndYear(workgroupId,
@@ -370,11 +370,11 @@ private BudgetScenario updateFromLiveData(BudgetScenario liveDataScenario, Boole
 
     @Override
     public BudgetScenario findById(long budgetScenarioId) {
-        return budgetScenarioRepository.findById(budgetScenarioId);
+        return budgetScenarioRepository.findById(budgetScenarioId).orElse(null);
     }
 
     @Override
     public void deleteById(long budgetScenarioId) {
-        budgetScenarioRepository.delete(budgetScenarioId);
+        budgetScenarioRepository.deleteById(budgetScenarioId);
     }
 }

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaBudgetService.java

@@ -54,7 +54,7 @@ public Budget findOrCreateByWorkgroupIdAndYear(long workgroupId, long year) {
 
     @Override
     public Budget findById(long budgetId) {
-        return budgetRepository.findById(budgetId);
+        return budgetRepository.findById(budgetId).orElse(null);
     }
 
     @Override

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaCourseService.java

@@ -23,7 +23,7 @@ public class JpaCourseService implements CourseService {
 
 	@Override
 	public Course getOneById(Long id) {
-		return this.courseRepository.findOne(id);
+		return this.courseRepository.findById(id).orElse(null);
 	}
 
 	private Course save(Course course) {
@@ -121,7 +121,7 @@ public boolean delete(Long id) {
 		try {
 			course.setTags(new ArrayList<Tag>());
 			this.save(course);
-			this.courseRepository.delete(id);
+			this.courseRepository.deleteById(id);
 
 			return true;
 		} catch (EmptyResultDataAccessException e) {

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemService.java

@@ -26,7 +26,7 @@ public List<ExpenseItem> findByBudgetScenarioId(Long budgetScenarioId) {
 
     @Override
     public ExpenseItem findById(Long expenseItemId) {
-        return expenseItemRepository.findById(expenseItemId);
+        return expenseItemRepository.findById(expenseItemId).orElse(null);
     }
 
     @Override

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaExpenseItemTypeService.java

@@ -20,7 +20,7 @@ public List<ExpenseItemType> findAll() {
 
     @Override
     public ExpenseItemType findById(long ExpenseItemTypeId) {
-        return ExpenseItemTypeRepository.findById(ExpenseItemTypeId);
+        return ExpenseItemTypeRepository.findById(ExpenseItemTypeId).orElse(null);
     }
 
     @Override

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorCostService.java

@@ -28,7 +28,7 @@ public InstructorCost findByInstructorIdAndBudgetId(Long instructorId, Long budg
 
     @Override
     public InstructorCost findById(Long lineItemId) {
-        return instructorCostRepository.findById(lineItemId);
+        return instructorCostRepository.findById(lineItemId).orElse(null);
     }
 
     @Override

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorService.java

@@ -34,7 +34,7 @@ public Instructor save(Instructor instructor) {
 
 	@Override
 	public Instructor getOneById(Long id) {
-		return this.instructorRepository.findById(id);
+		return this.instructorRepository.findById(id).orElse(null);
 	}
 
 	@Override
@@ -93,7 +93,7 @@ public void removeOrphanedByLoginId(String loginId) {
 		if (instructor.getTeachingAssignments().size() == 0 &&
 			instructor.getTeachingCallResponses().size() == 0 &&
 			instructor.getTeachingCallReceipts().size() == 0) {
-				instructorRepository.delete(instructor.getId());
+				instructorRepository.deleteById(instructor.getId());
 		}
 	}
 

src/main/java/edu/ucdavis/dss/ipa/services/jpa/JpaInstructorSupportCallResponseService.java

@@ -35,7 +35,7 @@ public class JpaInstructorSupportCallResponseService implements InstructorSuppor
 
     @Override
     public InstructorSupportCallResponse findOneById(long instructorInstructionalSupportCallResponseId) {
-        return instructorSupportCallResponseRepository.findById(instructorInstructionalSupportCallResponseId);
+        return instructorSupportCallResponseRepository.findById(instructorInstructionalSupportCallResponseId).orElse(null);
     }
 
     @Override
@@ -48,7 +48,7 @@ public List<InstructorSupportCallResponse> findByScheduleId(long scheduleId) {
 
     @Override
     public void delete(long instructorInstructionalSupportCallResponseId) {
-        instructorSupportCallResponseRepository.delete(instructorInstructionalSupportCallResponseId);
+        instructorSupportCallResponseRepository.deleteById(instructorInstructionalSupportCallResponseId);
     }
 
     @Override