From 5b966376fed2038e183321a0b3911b77f5ac0685 Mon Sep 17 00:00:00 2001
From: Tom Zhao <tom.zhao@dsv.su.se>
Date: Wed, 15 Jan 2025 14:20:36 +0100
Subject: [PATCH] 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;