From 85ac5976db9b3c18261d013056b7ab7ef3165c22 Mon Sep 17 00:00:00 2001 From: Tom Zhao Date: Wed, 8 Jan 2025 13:37:19 +0100 Subject: [PATCH 1/7] 73: Replace to single imports & format improvement --- .../scipro/daisyExternal/http/DaisyAPI.java | 22 ++++++++++++- .../daisyExternal/http/DaisyAPIImpl.java | 32 +++++++++++++++--- core/src/main/xsd/daisy_api.xsd | 5 ++- .../impl/ImporterTransactionsImpl.java | 29 +++++++++++++--- .../daisy/workers/ProjectExporter.java | 33 ++++++++++++------- .../io/impl/ExternalExporterDaisyImpl.java | 12 ++++++- .../daisy/workers/ProjectExporterTest.java | 7 +++- 7 files changed, 114 insertions(+), 26 deletions(-) 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 index 19c17dfa1b..af60d40470 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 @@ -6,7 +6,27 @@ import java.util.Date; import java.util.List; import java.util.Optional; import java.util.Set; -import se.su.dsv.scipro.io.dto.*; + +import se.su.dsv.scipro.io.dto.AddThesisAuthor; +import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; +import se.su.dsv.scipro.io.dto.CourseRegistration; +import se.su.dsv.scipro.io.dto.Employee; +import se.su.dsv.scipro.io.dto.Person; +import se.su.dsv.scipro.io.dto.Program; +import se.su.dsv.scipro.io.dto.ProgramAdmission; +import se.su.dsv.scipro.io.dto.ProjectParticipant; +import se.su.dsv.scipro.io.dto.PublishingConsent; +import se.su.dsv.scipro.io.dto.PublishingConsentLevel; +import se.su.dsv.scipro.io.dto.ResearchArea; +import se.su.dsv.scipro.io.dto.ResearchSubject; +import se.su.dsv.scipro.io.dto.StudentProgramAdmission; +import se.su.dsv.scipro.io.dto.Thesis; +import se.su.dsv.scipro.io.dto.ThesisPublication; +import se.su.dsv.scipro.io.dto.ThesisRejection; +import se.su.dsv.scipro.io.dto.ThesisToBeCreated; +import se.su.dsv.scipro.io.dto.ThesisToBeUpdated; +import se.su.dsv.scipro.io.dto.Unit; +import se.su.dsv.scipro.io.dto.UserName; public interface DaisyAPI { Set getContributors(Integer projectId); 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 index aa41073c08..e239ea3f9c 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 @@ -16,9 +16,34 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import java.io.InputStream; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Optional; +import java.util.Set; + import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; -import se.su.dsv.scipro.io.dto.*; +import se.su.dsv.scipro.io.dto.AddThesisAuthor; +import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; +import se.su.dsv.scipro.io.dto.CourseRegistration; +import se.su.dsv.scipro.io.dto.Employee; +import se.su.dsv.scipro.io.dto.ObjectFactory; +import se.su.dsv.scipro.io.dto.Person; +import se.su.dsv.scipro.io.dto.Program; +import se.su.dsv.scipro.io.dto.ProgramAdmission; +import se.su.dsv.scipro.io.dto.ProjectParticipant; +import se.su.dsv.scipro.io.dto.PublishingConsent; +import se.su.dsv.scipro.io.dto.PublishingConsentLevel; +import se.su.dsv.scipro.io.dto.ResearchArea; +import se.su.dsv.scipro.io.dto.ResearchSubject; +import se.su.dsv.scipro.io.dto.StudentProgramAdmission; +import se.su.dsv.scipro.io.dto.Thesis; +import se.su.dsv.scipro.io.dto.ThesisPublication; +import se.su.dsv.scipro.io.dto.ThesisRejection; +import se.su.dsv.scipro.io.dto.ThesisToBeCreated; +import se.su.dsv.scipro.io.dto.ThesisToBeUpdated; +import se.su.dsv.scipro.io.dto.Unit; +import se.su.dsv.scipro.io.dto.UserName; public class DaisyAPIImpl implements DaisyAPI { @@ -364,8 +389,7 @@ public class DaisyAPIImpl implements DaisyAPI { @Override public OrganisationalUnit orgunit(final int unitId) { return () -> - target() - .path("orgunit") + units() .path(Integer.toString(unitId)) .path("researchAreas") .request(MediaType.APPLICATION_XML_TYPE) diff --git a/core/src/main/xsd/daisy_api.xsd b/core/src/main/xsd/daisy_api.xsd index 806769ad48..301a0271da 100755 --- a/core/src/main/xsd/daisy_api.xsd +++ b/core/src/main/xsd/daisy_api.xsd @@ -1,7 +1,5 @@ - + @@ -62,6 +60,7 @@ + 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 395f5485ef..591f40dec0 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 @@ -4,22 +4,43 @@ import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.transaction.Transactional; import jakarta.ws.rs.core.Response; -import java.util.*; -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.io.dto.*; +import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; +import se.su.dsv.scipro.io.dto.Course; +import se.su.dsv.scipro.io.dto.CourseRegistration; +import se.su.dsv.scipro.io.dto.EducationalLevel; +import se.su.dsv.scipro.io.dto.Person; +import se.su.dsv.scipro.io.dto.ProgramType; import se.su.dsv.scipro.io.dto.ResearchArea; +import se.su.dsv.scipro.io.dto.StudentProgramAdmission; +import se.su.dsv.scipro.io.dto.Thesis; +import se.su.dsv.scipro.io.dto.UserName; import se.su.dsv.scipro.match.ProgramService; import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.ProjectService; import se.su.dsv.scipro.security.auth.roles.Roles; -import se.su.dsv.scipro.system.*; +import se.su.dsv.scipro.system.DegreeType; +import se.su.dsv.scipro.system.Language; import se.su.dsv.scipro.system.Program; +import se.su.dsv.scipro.system.ResearchAreaService; +import se.su.dsv.scipro.system.User; +import se.su.dsv.scipro.system.UserNameService; +import se.su.dsv.scipro.system.UserService; +import se.su.dsv.scipro.system.Username; import se.su.dsv.scipro.util.Pair; +import java.util.Comparator; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Stream; + @Named public class ImporterTransactionsImpl implements ImporterTransactions { 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 3bd943ffca..8ca912dca2 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 @@ -1,19 +1,8 @@ package se.su.dsv.scipro.integration.daisy.workers; -import static com.querydsl.core.types.dsl.Expressions.anyOf; - import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.ws.rs.core.Response; -import java.time.Instant; -import java.time.Period; -import java.util.Calendar; -import java.util.Date; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; -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; @@ -23,7 +12,15 @@ import se.su.dsv.scipro.finalseminar.FinalSeminarService; import se.su.dsv.scipro.finalthesis.FinalThesis; import se.su.dsv.scipro.finalthesis.FinalThesisService; import se.su.dsv.scipro.io.ExternalExporter; -import se.su.dsv.scipro.io.dto.*; +import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; +import se.su.dsv.scipro.io.dto.Person; +import se.su.dsv.scipro.io.dto.ProjectParticipant; +import se.su.dsv.scipro.io.dto.ResearchAreaWithID; +import se.su.dsv.scipro.io.dto.ResearchAreas; +import se.su.dsv.scipro.io.dto.Role; +import se.su.dsv.scipro.io.dto.Thesis; +import se.su.dsv.scipro.io.dto.ThesisToBeUpdated; +import se.su.dsv.scipro.io.dto.UnitWithID; import se.su.dsv.scipro.io.exceptions.ExternalExportException; import se.su.dsv.scipro.io.facade.ExporterFacade; import se.su.dsv.scipro.project.Project; @@ -35,6 +32,18 @@ import se.su.dsv.scipro.system.DegreeType; import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.workerthreads.AbstractWorker; +import java.time.Instant; +import java.time.Period; +import java.util.Calendar; +import java.util.Date; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Stream; + +import static com.querydsl.core.types.dsl.Expressions.anyOf; + @Named public class ProjectExporter extends AbstractWorker { 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 90aaca25c2..dd20dd1064 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 @@ -9,7 +9,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; import se.su.dsv.scipro.io.ExternalExporter; -import se.su.dsv.scipro.io.dto.*; +import se.su.dsv.scipro.io.dto.AddThesisAuthor; +import se.su.dsv.scipro.io.dto.AddThesisAuthorCourse; +import se.su.dsv.scipro.io.dto.AddThesisAuthorStudent; +import se.su.dsv.scipro.io.dto.EducationalLevel; +import se.su.dsv.scipro.io.dto.Person; +import se.su.dsv.scipro.io.dto.ProjectParticipant; +import se.su.dsv.scipro.io.dto.ResearchAreaWithID; +import se.su.dsv.scipro.io.dto.ResearchAreas; +import se.su.dsv.scipro.io.dto.Role; +import se.su.dsv.scipro.io.dto.ThesisToBeCreated; +import se.su.dsv.scipro.io.dto.UnitWithID; import se.su.dsv.scipro.io.exceptions.ExternalExportException; import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.reusable.SciProUtilities; 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 1cfcf78361..570bbfa9f1 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 @@ -18,7 +18,12 @@ 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; -import se.su.dsv.scipro.io.dto.*; +import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; +import se.su.dsv.scipro.io.dto.Person; +import se.su.dsv.scipro.io.dto.ProjectParticipant; +import se.su.dsv.scipro.io.dto.Role; +import se.su.dsv.scipro.io.dto.Thesis; +import se.su.dsv.scipro.io.dto.ThesisToBeUpdated; import se.su.dsv.scipro.io.facade.ExporterFacade; import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.project.ProjectRepo; -- 2.39.5 From 509f9ed9cd026f7ca56eeffcdf9385b1519f4abc Mon Sep 17 00:00:00 2001 From: Tom Zhao Date: Wed, 8 Jan 2025 13:47:21 +0100 Subject: [PATCH 2/7] 73: Reformat --- .../scipro/daisyExternal/http/DaisyAPI.java | 1 - .../daisyExternal/http/DaisyAPIImpl.java | 3 +-- .../impl/ImporterTransactionsImpl.java | 17 +++++++------- .../daisy/workers/ProjectExporter.java | 23 +++++++++---------- 4 files changed, 20 insertions(+), 24 deletions(-) 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 index af60d40470..30eead4375 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 @@ -6,7 +6,6 @@ import java.util.Date; import java.util.List; import java.util.Optional; import java.util.Set; - import se.su.dsv.scipro.io.dto.AddThesisAuthor; import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; import se.su.dsv.scipro.io.dto.CourseRegistration; 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 index e239ea3f9c..5a39bbc3da 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 @@ -21,7 +21,6 @@ import java.util.Date; import java.util.List; import java.util.Optional; import java.util.Set; - import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; import se.su.dsv.scipro.io.dto.AddThesisAuthor; import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; @@ -389,7 +388,7 @@ public class DaisyAPIImpl implements DaisyAPI { @Override public OrganisationalUnit orgunit(final int unitId) { return () -> - units() + units() .path(Integer.toString(unitId)) .path("researchAreas") .request(MediaType.APPLICATION_XML_TYPE) 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 591f40dec0..63fe064e95 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 @@ -4,6 +4,14 @@ import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.transaction.Transactional; import jakarta.ws.rs.core.Response; +import java.util.Comparator; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import se.su.dsv.scipro.daisyExternal.ImporterTransactions; @@ -32,15 +40,6 @@ import se.su.dsv.scipro.system.UserService; import se.su.dsv.scipro.system.Username; import se.su.dsv.scipro.util.Pair; -import java.util.Comparator; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Stream; - @Named public class ImporterTransactionsImpl implements ImporterTransactions { 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 8ca912dca2..39da00b4cf 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 @@ -1,8 +1,19 @@ package se.su.dsv.scipro.integration.daisy.workers; +import static com.querydsl.core.types.dsl.Expressions.anyOf; + import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.ws.rs.core.Response; +import java.time.Instant; +import java.time.Period; +import java.util.Calendar; +import java.util.Date; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +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; @@ -32,18 +43,6 @@ import se.su.dsv.scipro.system.DegreeType; import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.workerthreads.AbstractWorker; -import java.time.Instant; -import java.time.Period; -import java.util.Calendar; -import java.util.Date; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Stream; - -import static com.querydsl.core.types.dsl.Expressions.anyOf; - @Named public class ProjectExporter extends AbstractWorker { -- 2.39.5 From 6b80388db4f87e234822cd5379c397c41986d302 Mon Sep 17 00:00:00 2001 From: Tom Zhao Date: Thu, 9 Jan 2025 14:36:12 +0100 Subject: [PATCH 3/7] Use JAXB binding file to rename Status.java to Status2.java --- core/src/main/xjb/daisy_api.xjb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/core/src/main/xjb/daisy_api.xjb b/core/src/main/xjb/daisy_api.xjb index abc4c4444f..a50ec543ca 100644 --- a/core/src/main/xjb/daisy_api.xjb +++ b/core/src/main/xjb/daisy_api.xjb @@ -1,6 +1,7 @@ - @@ -12,4 +13,11 @@ - \ No newline at end of file + + + + + + + + -- 2.39.5 From 0040faf6248e8579de6380bafee015e127c14bed Mon Sep 17 00:00:00 2001 From: Tom Zhao Date: Thu, 9 Jan 2025 14:58:24 +0100 Subject: [PATCH 4/7] Rename package name daisyExternal to daisyexternal --- core/src/main/java/se/su/dsv/scipro/CoreConfig.java | 2 +- .../exceptions/ExternalImportException.java | 2 +- .../{daisyExternal => daisyexternal}/http/DaisyAPI.java | 2 +- .../{daisyExternal => daisyexternal}/http/DaisyAPIImpl.java | 2 +- .../http/OrganisationalUnit.java | 2 +- .../{daisyExternal => daisyexternal}/http/PhotoResult.java | 2 +- .../{daisyExternal => daisyexternal}/http/Semester.java | 2 +- .../se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java | 1 + .../scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java | 4 ++-- .../scipro/daisyExternal/impl/ImporterTransactionsImpl.java | 2 +- .../su/dsv/scipro/integration/daisy/DaisyConsentService.java | 2 +- .../integration/daisy/DaisyIntegrationConfiguration.java | 2 +- .../dsv/scipro/integration/daisy/DaisyUserSearchService.java | 2 +- .../dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java | 2 +- .../daisy/workers/GradingCompletedMilestoneActivator.java | 2 +- .../integration/daisy/workers/ImportNationalCategories.java | 2 +- .../dsv/scipro/integration/daisy/workers/ProjectExporter.java | 2 +- .../scipro/integration/daisy/workers/ProjectFinalizer.java | 2 +- .../integration/daisy/workers/RejectedThesisWorker.java | 2 +- .../scipro/integration/daisy/workers/UserImportWorker.java | 4 ++-- .../se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java | 2 +- .../daisyExternal/impl/ExternalImporterDaisyImplTest.java | 2 +- .../daisyExternal/impl/ImporterTransactionsImplTest.java | 2 +- .../daisy/workers/GradingCompletedMilestoneActivatorTest.java | 2 +- .../scipro/integration/daisy/workers/ProjectExporterTest.java | 2 +- .../integration/daisy/workers/ProjectFinalizerTest.java | 2 +- .../integration/daisy/workers/UserImportWorkerTest.java | 2 +- .../su/dsv/scipro/io/impl/ExternalExporterDaisyImplTest.java | 2 +- .../main/java/se/su/dsv/scipro/grading/SendToExaminer.java | 2 +- view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java | 4 ++-- view/src/test/java/se/su/dsv/scipro/SciProTest.java | 4 ++-- 31 files changed, 35 insertions(+), 34 deletions(-) rename core/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/exceptions/ExternalImportException.java (73%) rename core/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/http/DaisyAPI.java (98%) rename core/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/http/DaisyAPIImpl.java (99%) rename core/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/http/OrganisationalUnit.java (77%) rename core/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/http/PhotoResult.java (96%) rename core/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/http/Semester.java (95%) 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; -- 2.39.5 From 3ba1a7ac26a039fdbb6e458a789c959ce06484d9 Mon Sep 17 00:00:00 2001 From: Tom Zhao Date: Thu, 9 Jan 2025 15:49:46 +0100 Subject: [PATCH 5/7] Rename package name from daisyExternal to daisyexternal in test class as well --- .../http/DaisyAPIImplTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename core/src/test/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/http/DaisyAPIImplTest.java (99%) 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 similarity index 99% rename from core/src/test/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImplTest.java rename to core/src/test/java/se/su/dsv/scipro/daisyexternal/http/DaisyAPIImplTest.java index fdf3945bf0..018db6224e 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 @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.http; +package se.su.dsv.scipro.daisyexternal.http; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; @@ -11,7 +11,6 @@ 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; -- 2.39.5 From 5b966376fed2038e183321a0b3911b77f5ac0685 Mon Sep 17 00:00:00 2001 From: Tom Zhao Date: Wed, 15 Jan 2025 14:20:36 +0100 Subject: [PATCH 6/7] 73: Rename package name to se.su.dsv.scipro.daisyexternal in module daisy-integration. --- .../ExternalImporter.java | 2 +- .../ImporterTransactions.java | 2 +- .../impl/ExternalImporterDaisyImpl.java | 6 +++--- .../impl/ImporterTransactionsImpl.java | 4 ++-- .../daisy/DaisyIntegrationConfiguration.java | 8 ++++---- .../integration/daisy/workers/UserImportWorker.java | 4 ++-- .../impl/ExternalImporterDaisyImplTest.java | 4 ++-- .../impl/ImporterTransactionsImplTest.java | 9 +++++++-- .../daisy/workers/UserImportWorkerTest.java | 12 +++++++++--- 9 files changed, 31 insertions(+), 20 deletions(-) rename daisy-integration/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/ExternalImporter.java (82%) rename daisy-integration/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/ImporterTransactions.java (92%) rename daisy-integration/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/impl/ExternalImporterDaisyImpl.java (98%) rename daisy-integration/src/main/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/impl/ImporterTransactionsImpl.java (99%) rename daisy-integration/src/test/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/impl/ExternalImporterDaisyImplTest.java (94%) rename daisy-integration/src/test/java/se/su/dsv/scipro/{daisyExternal => daisyexternal}/impl/ImporterTransactionsImplTest.java (92%) diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/ExternalImporter.java b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/ExternalImporter.java similarity index 82% rename from daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/ExternalImporter.java rename to daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/ExternalImporter.java index 642668a636..f8800aa7e9 100755 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/ExternalImporter.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/ExternalImporter.java @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal; +package se.su.dsv.scipro.daisyexternal; /** * Specifies interaction of an importing service component. diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/ImporterTransactions.java b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/ImporterTransactions.java similarity index 92% rename from daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/ImporterTransactions.java rename to daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/ImporterTransactions.java index bbf5af7707..1d8c59e6d5 100644 --- a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/ImporterTransactions.java +++ b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/ImporterTransactions.java @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal; +package se.su.dsv.scipro.daisyexternal; import java.util.Map; import se.su.dsv.scipro.io.dto.Person; 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 similarity index 98% rename from daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java rename to daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/impl/ExternalImporterDaisyImpl.java index cb670b898d..16cdfa3920 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 @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.impl; +package se.su.dsv.scipro.daisyexternal.impl; import jakarta.inject.Inject; import jakarta.transaction.Transactional; @@ -6,8 +6,8 @@ import jakarta.ws.rs.ClientErrorException; import java.util.*; 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.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.io.dto.Employee; 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 similarity index 99% rename from daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java rename to daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/impl/ImporterTransactionsImpl.java index 48b42c8607..75b292c4da 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 @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.impl; +package se.su.dsv.scipro.daisyexternal.impl; import jakarta.inject.Inject; import jakarta.inject.Named; @@ -14,7 +14,7 @@ import java.util.Set; 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.ImporterTransactions; import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; 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/DaisyIntegrationConfiguration.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java index 56dd73601a..4aa40b825e 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 @@ -5,10 +5,10 @@ import jakarta.inject.Provider; import jakarta.persistence.EntityManager; 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.impl.ExternalImporterDaisyImpl; -import se.su.dsv.scipro.daisyExternal.impl.ImporterTransactionsImpl; +import se.su.dsv.scipro.daisyexternal.ExternalImporter; +import se.su.dsv.scipro.daisyexternal.ImporterTransactions; +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; 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 7b7e480ca4..9f24d5e9e3 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 @@ -8,8 +8,8 @@ import java.util.*; import java.util.stream.Stream; 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.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.io.dto.Person; 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 similarity index 94% rename from daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImplTest.java rename to daisy-integration/src/test/java/se/su/dsv/scipro/daisyexternal/impl/ExternalImporterDaisyImplTest.java index cc1d57418a..4d47af6ddb 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 @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.impl; +package se.su.dsv.scipro.daisyexternal.impl; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.anyString; @@ -9,7 +9,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.ImporterTransactions; +import se.su.dsv.scipro.daisyexternal.ImporterTransactions; import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; import se.su.dsv.scipro.io.dto.Person; import se.su.dsv.scipro.springdata.services.UnitService; 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 similarity index 92% rename from daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImplTest.java rename to daisy-integration/src/test/java/se/su/dsv/scipro/daisyexternal/impl/ImporterTransactionsImplTest.java index 9800e46789..e47d29378b 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 @@ -1,4 +1,4 @@ -package se.su.dsv.scipro.daisyExternal.impl; +package se.su.dsv.scipro.daisyexternal.impl; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.AdditionalAnswers.returnsFirstArg; @@ -17,7 +17,12 @@ import se.su.dsv.scipro.io.dto.Person; import se.su.dsv.scipro.io.dto.UserName; import se.su.dsv.scipro.match.ProgramService; import se.su.dsv.scipro.project.ProjectService; -import se.su.dsv.scipro.system.*; +import se.su.dsv.scipro.system.ProjectTypeService; +import se.su.dsv.scipro.system.ResearchAreaService; +import se.su.dsv.scipro.system.User; +import se.su.dsv.scipro.system.UserNameService; +import se.su.dsv.scipro.system.UserService; +import se.su.dsv.scipro.system.Username; @ExtendWith(MockitoExtension.class) public class ImporterTransactionsImplTest { 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 5b7592d5c5..f796aaf19b 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 @@ -4,14 +4,20 @@ import static java.util.Arrays.asList; import static org.mockito.Mockito.*; import jakarta.persistence.EntityManager; -import java.util.*; + +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Optional; + import org.junit.jupiter.api.BeforeEach; 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.ExternalImporter; -import se.su.dsv.scipro.daisyExternal.ImporterTransactions; +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.io.dto.Person; import se.su.dsv.scipro.io.dto.Thesis; -- 2.39.5 From 289dfa2b996c61239f286efffcd46fa19aca1104 Mon Sep 17 00:00:00 2001 From: Tom Zhao Date: Wed, 15 Jan 2025 14:28:37 +0100 Subject: [PATCH 7/7] 73: Reformat code --- .../scipro/integration/daisy/DaisyIntegrationConfiguration.java | 2 +- .../scipro/integration/daisy/workers/UserImportWorkerTest.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) 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 4aa40b825e..e5bd7507da 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/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 f796aaf19b..2ac5ec1138 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 @@ -4,13 +4,11 @@ import static java.util.Arrays.asList; import static org.mockito.Mockito.*; import jakarta.persistence.EntityManager; - import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Optional; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -- 2.39.5