diff --git a/core/src/main/java/se/su/dsv/scipro/CoreConfig.java b/core/src/main/java/se/su/dsv/scipro/CoreConfig.java index 43c4d7ed10..b7c51b41f2 100644 --- a/core/src/main/java/se/su/dsv/scipro/CoreConfig.java +++ b/core/src/main/java/se/su/dsv/scipro/CoreConfig.java @@ -17,7 +17,7 @@ import se.su.dsv.scipro.checklist.ChecklistAnswerServiceImpl; import se.su.dsv.scipro.checklist.ChecklistServiceImpl; import se.su.dsv.scipro.checklist.ChecklistTemplateService; import se.su.dsv.scipro.checklist.ChecklistTemplateServiceImpl; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPIImpl; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPIImpl; import se.su.dsv.scipro.date.DateServiceImpl; import se.su.dsv.scipro.file.FileDescriptionRepo; import se.su.dsv.scipro.file.FileReferenceRepository; diff --git a/core/src/main/java/se/su/dsv/scipro/daisyExternal/exceptions/ExternalImportException.java b/core/src/main/java/se/su/dsv/scipro/daisyexternal/exceptions/ExternalImportException.java similarity index 73% rename from core/src/main/java/se/su/dsv/scipro/daisyExternal/exceptions/ExternalImportException.java rename to core/src/main/java/se/su/dsv/scipro/daisyexternal/exceptions/ExternalImportException.java index 39e5ca95b6..18d0462a91 100755 --- a/core/src/main/java/se/su/dsv/scipro/daisyExternal/exceptions/ExternalImportException.java +++ b/core/src/main/java/se/su/dsv/scipro/daisyexternal/exceptions/ExternalImportException.java @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.exceptions; +package se.su.dsv.scipro.daisyexternal.exceptions; public class ExternalImportException extends RuntimeException { diff --git a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPI.java b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/DaisyAPI.java similarity index 98% rename from core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPI.java rename to core/src/main/java/se/su/dsv/scipro/daisyexternal/http/DaisyAPI.java index 30eead4375..9b0b71a808 100644 --- a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPI.java +++ b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/DaisyAPI.java @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.http; +package se.su.dsv.scipro.daisyexternal.http; import jakarta.ws.rs.core.Response; import java.io.InputStream; diff --git a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/DaisyAPIImpl.java similarity index 99% rename from core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java rename to core/src/main/java/se/su/dsv/scipro/daisyexternal/http/DaisyAPIImpl.java index 5a39bbc3da..f930b51560 100755 --- a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java +++ b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/DaisyAPIImpl.java @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.http; +package se.su.dsv.scipro.daisyexternal.http; import static jakarta.ws.rs.client.Entity.xml; diff --git a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/OrganisationalUnit.java b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/OrganisationalUnit.java similarity index 77% rename from core/src/main/java/se/su/dsv/scipro/daisyExternal/http/OrganisationalUnit.java rename to core/src/main/java/se/su/dsv/scipro/daisyexternal/http/OrganisationalUnit.java index 65f6699a53..7143685c68 100644 --- a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/OrganisationalUnit.java +++ b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/OrganisationalUnit.java @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.http; +package se.su.dsv.scipro.daisyexternal.http; import java.util.List; import se.su.dsv.scipro.io.dto.ResearchArea; diff --git a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/PhotoResult.java b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/PhotoResult.java similarity index 96% rename from core/src/main/java/se/su/dsv/scipro/daisyExternal/http/PhotoResult.java rename to core/src/main/java/se/su/dsv/scipro/daisyexternal/http/PhotoResult.java index 063c5cf9c1..dd75979b39 100644 --- a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/PhotoResult.java +++ b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/PhotoResult.java @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.http; +package se.su.dsv.scipro.daisyexternal.http; import java.io.InputStream; import java.util.function.Function; diff --git a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/Semester.java b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/Semester.java similarity index 95% rename from core/src/main/java/se/su/dsv/scipro/daisyExternal/http/Semester.java rename to core/src/main/java/se/su/dsv/scipro/daisyexternal/http/Semester.java index 9930163d84..fb47e26e55 100644 --- a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/Semester.java +++ b/core/src/main/java/se/su/dsv/scipro/daisyexternal/http/Semester.java @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.http; +package se.su.dsv.scipro.daisyexternal.http; public abstract class Semester { diff --git a/core/src/test/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java b/core/src/test/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java index 44eb67b749..fdf3945bf0 100644 --- a/core/src/test/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java +++ b/core/src/test/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java @@ -11,6 +11,7 @@ import java.io.PrintWriter; import java.net.InetSocketAddress; import java.util.*; import org.junit.jupiter.api.Test; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPIImpl; import se.su.dsv.scipro.io.dto.Person; import se.su.dsv.scipro.io.dto.ProjectParticipant; import se.su.dsv.scipro.io.dto.Role; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java index 6613b2e597..cb670b898d 100755 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java @@ -8,8 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import se.su.dsv.scipro.daisyExternal.ExternalImporter; import se.su.dsv.scipro.daisyExternal.ImporterTransactions; -import se.su.dsv.scipro.daisyExternal.exceptions.ExternalImportException; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.exceptions.ExternalImportException; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.io.dto.Employee; import se.su.dsv.scipro.io.dto.Person; import se.su.dsv.scipro.io.dto.Thesis; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java index 63fe064e95..48b42c8607 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java @@ -15,7 +15,7 @@ import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import se.su.dsv.scipro.daisyExternal.ImporterTransactions; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; import se.su.dsv.scipro.io.dto.Course; import se.su.dsv.scipro.io.dto.CourseRegistration; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java index ac3916fd07..b878f1998e 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java @@ -4,7 +4,7 @@ import jakarta.inject.Inject; import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.WebApplicationException; import java.util.List; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.finalthesis.PublishingConsentService; import se.su.dsv.scipro.io.dto.PublishingConsentLevel; import se.su.dsv.scipro.project.Project; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java index 9956543fb5..56dd73601a 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java @@ -7,9 +7,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import se.su.dsv.scipro.daisyExternal.ExternalImporter; import se.su.dsv.scipro.daisyExternal.ImporterTransactions; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; import se.su.dsv.scipro.daisyExternal.impl.ExternalImporterDaisyImpl; import se.su.dsv.scipro.daisyExternal.impl.ImporterTransactionsImpl; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.finalseminar.FinalSeminarService; import se.su.dsv.scipro.finalthesis.FinalThesisService; import se.su.dsv.scipro.forum.ProjectForumService; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java index ad9a87d6d0..08b02e98a5 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java @@ -9,7 +9,7 @@ import java.util.Objects; import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.security.auth.roles.Roles; import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.system.UserSearchProvider; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java index be10731801..e2788e0037 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java @@ -6,7 +6,7 @@ import jakarta.inject.Inject; import jakarta.ws.rs.core.Response; import java.util.Objects; import java.util.Set; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.io.dto.Person; import se.su.dsv.scipro.io.dto.ProjectParticipant; import se.su.dsv.scipro.io.dto.Role; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java index 769507253b..0163896b67 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.grading.GradingCompletedEvent; import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; import se.su.dsv.scipro.io.dto.Course; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java index 7ba4f4989e..39ed5e05d1 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java @@ -3,7 +3,7 @@ package se.su.dsv.scipro.integration.daisy.workers; import jakarta.inject.Inject; import java.util.List; import java.util.Optional; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.grading.NationalSubjectCategory; import se.su.dsv.scipro.grading.NationalSubjectCategoryService; import se.su.dsv.scipro.io.dto.ResearchSubject; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java index 39da00b4cf..d144f13d40 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java @@ -16,7 +16,7 @@ import java.util.function.Predicate; import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.finalseminar.FinalSeminar; import se.su.dsv.scipro.finalseminar.FinalSeminarParticipation; import se.su.dsv.scipro.finalseminar.FinalSeminarService; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java index 26ebd3813b..b810269fee 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java @@ -6,7 +6,7 @@ import java.time.Instant; import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.grading.ThesisApprovedHistoryService; import se.su.dsv.scipro.io.dto.STATUS; import se.su.dsv.scipro.project.Project; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java index ab796585ec..6b4bfe4a31 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java @@ -4,7 +4,7 @@ import jakarta.inject.Inject; import java.util.Collections; import java.util.Date; import java.util.List; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.finalthesis.FinalThesis; import se.su.dsv.scipro.finalthesis.FinalThesisService; import se.su.dsv.scipro.forum.ProjectForumService; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java index 77845ced07..7b7e480ca4 100755 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java @@ -10,8 +10,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import se.su.dsv.scipro.daisyExternal.ExternalImporter; import se.su.dsv.scipro.daisyExternal.ImporterTransactions; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; -import se.su.dsv.scipro.daisyExternal.http.Semester; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.Semester; import se.su.dsv.scipro.io.dto.Person; import se.su.dsv.scipro.io.dto.Program; import se.su.dsv.scipro.io.dto.ProgramAdmission; diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java b/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java index dd20dd1064..205030c3fb 100755 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.io.ExternalExporter; import se.su.dsv.scipro.io.dto.AddThesisAuthor; import se.su.dsv.scipro.io.dto.AddThesisAuthorCourse; diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImplTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImplTest.java index 566ec3fd57..cc1d57418a 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImplTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImplTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import se.su.dsv.scipro.daisyExternal.ImporterTransactions; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.io.dto.Person; import se.su.dsv.scipro.springdata.services.UnitService; import se.su.dsv.scipro.system.UserImportService; diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImplTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImplTest.java index baa7bda301..9800e46789 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImplTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImplTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.io.dto.Person; import se.su.dsv.scipro.io.dto.UserName; import se.su.dsv.scipro.match.ProgramService; diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivatorTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivatorTest.java index ea13a62418..7a8e11d798 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivatorTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivatorTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.grading.GradingCompletedEvent; import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; import se.su.dsv.scipro.io.dto.Course; diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporterTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporterTest.java index 570bbfa9f1..fec03c6a38 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporterTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporterTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.finalseminar.FinalSeminarService; import se.su.dsv.scipro.finalthesis.FinalThesisService; import se.su.dsv.scipro.io.ExternalExporter; diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizerTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizerTest.java index 133616e85a..e648f07ee5 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizerTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizerTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.grading.ThesisApprovedHistoryService; import se.su.dsv.scipro.io.dto.STATUS; import se.su.dsv.scipro.io.dto.Thesis; diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorkerTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorkerTest.java index 6789af1f8f..5b7592d5c5 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorkerTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorkerTest.java @@ -12,7 +12,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import se.su.dsv.scipro.daisyExternal.ExternalImporter; import se.su.dsv.scipro.daisyExternal.ImporterTransactions; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.io.dto.Person; import se.su.dsv.scipro.io.dto.Thesis; import se.su.dsv.scipro.match.ProgramService; diff --git a/daisy-integration/src/test/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImplTest.java b/daisy-integration/src/test/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImplTest.java index 930ec58dc6..e9c044dabe 100644 --- a/daisy-integration/src/test/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImplTest.java +++ b/daisy-integration/src/test/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImplTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.io.dto.ThesisToBeCreated; import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.reusable.SciProUtilities; diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java b/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java index 81528142ae..25c88e47b6 100644 --- a/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java +++ b/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java @@ -20,7 +20,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import se.su.dsv.scipro.components.BootstrapDatePicker; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.file.FileDescription; import se.su.dsv.scipro.file.FileService; import se.su.dsv.scipro.finalseminar.FinalSeminar; diff --git a/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java b/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java index 4ed217b535..d2e964e3b2 100644 --- a/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java +++ b/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java @@ -14,8 +14,8 @@ import org.apache.wicket.injection.Injector; import org.apache.wicket.request.resource.AbstractResource; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; -import se.su.dsv.scipro.daisyExternal.http.PhotoResult; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.PhotoResult; import se.su.dsv.scipro.data.dataobjects.Member; import se.su.dsv.scipro.finalseminar.FinalSeminarService; import se.su.dsv.scipro.project.Project; diff --git a/view/src/test/java/se/su/dsv/scipro/SciProTest.java b/view/src/test/java/se/su/dsv/scipro/SciProTest.java index 768b84e0df..4c3fdfd589 100755 --- a/view/src/test/java/se/su/dsv/scipro/SciProTest.java +++ b/view/src/test/java/se/su/dsv/scipro/SciProTest.java @@ -30,8 +30,8 @@ import se.su.dsv.scipro.checklist.ChecklistCategoryRepo; import se.su.dsv.scipro.checklist.ChecklistQuestionRepo; import se.su.dsv.scipro.checklist.ChecklistService; import se.su.dsv.scipro.checklist.ChecklistTemplateService; -import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; -import se.su.dsv.scipro.daisyExternal.http.PhotoResult; +import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; +import se.su.dsv.scipro.daisyexternal.http.PhotoResult; import se.su.dsv.scipro.data.enums.DateStyle; import se.su.dsv.scipro.date.DateService; import se.su.dsv.scipro.examiner.pages.ExaminerStartPage;