DMC/scipro
7
0
Fork 0
Code Issues 31 Pull Requests 3 Actions Projects 1 Wiki Activity

Improve XJC-binding (Issue 73) #74

Merged
ansv7779 merged 9 commits from 73-improve-xjc-binding into develop 2025-01-16 13:55:39 +01:00
Conversation 3 Commits 9 Files Changed 35 +31 -20
9 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b966376fe - Show all commits

2
daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/ExternalImporter.java → daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/ExternalImporter.java
View File

@ -1,4 +1,4 @@
package se.su.dsv.scipro.daisyExternal;
package se.su.dsv.scipro.daisyexternal;
/**
* Specifies interaction of an importing service component.

2
daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/ImporterTransactions.java → daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/ImporterTransactions.java
View File

@ -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;

6
daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java → daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/impl/ExternalImporterDaisyImpl.java
View File

@ -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;

4
daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java → daisy-integration/src/main/java/se/su/dsv/scipro/daisyexternal/impl/ImporterTransactionsImpl.java
View File

@ -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;

8
daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyIntegrationConfiguration.java
View File

@ -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;

4
daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java
View File

@ -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;

4
daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImplTest.java → daisy-integration/src/test/java/se/su/dsv/scipro/daisyexternal/impl/ExternalImporterDaisyImplTest.java
View File

@ -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;

9
daisy-integration/src/test/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImplTest.java → daisy-integration/src/test/java/se/su/dsv/scipro/daisyexternal/impl/ImporterTransactionsImplTest.java
View File

@ -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 {

12
daisy-integration/src/test/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorkerTest.java
View File

@ -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;