DMC/scipro
7
0
Fork 0
Code Issues 32 Pull Requests 4 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 +20 -24
4 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 509f9ed9cd - Show all commits

1
core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPI.java
View File

@ -6,7 +6,6 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import se.su.dsv.scipro.io.dto.AddThesisAuthor; import se.su.dsv.scipro.io.dto.AddThesisAuthor;
import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; import se.su.dsv.scipro.io.dto.AuthorProjectParticipant;
import se.su.dsv.scipro.io.dto.CourseRegistration; import se.su.dsv.scipro.io.dto.CourseRegistration;

3
core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java
View File

@ -21,7 +21,6 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature; import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
import se.su.dsv.scipro.io.dto.AddThesisAuthor; import se.su.dsv.scipro.io.dto.AddThesisAuthor;
import se.su.dsv.scipro.io.dto.AuthorProjectParticipant; import se.su.dsv.scipro.io.dto.AuthorProjectParticipant;
@ -389,7 +388,7 @@ public class DaisyAPIImpl implements DaisyAPI {
@Override @Override
public OrganisationalUnit orgunit(final int unitId) { public OrganisationalUnit orgunit(final int unitId) {
return () -> return () ->
units() units()
.path(Integer.toString(unitId)) .path(Integer.toString(unitId))
.path("researchAreas") .path("researchAreas")
.request(MediaType.APPLICATION_XML_TYPE) .request(MediaType.APPLICATION_XML_TYPE)

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

@ -4,6 +4,14 @@ import jakarta.inject.Inject;
import jakarta.inject.Named; import jakarta.inject.Named;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import jakarta.ws.rs.core.Response; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import se.su.dsv.scipro.daisyExternal.ImporterTransactions; 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.system.Username;
import se.su.dsv.scipro.util.Pair; 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 @Named
public class ImporterTransactionsImpl implements ImporterTransactions { public class ImporterTransactionsImpl implements ImporterTransactions {

23
daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java
View File

@ -1,8 +1,19 @@
package se.su.dsv.scipro.integration.daisy.workers; package se.su.dsv.scipro.integration.daisy.workers;
import static com.querydsl.core.types.dsl.Expressions.anyOf;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import jakarta.inject.Named; import jakarta.inject.Named;
import jakarta.ws.rs.core.Response; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import se.su.dsv.scipro.daisyExternal.http.DaisyAPI; 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.system.User;
import se.su.dsv.scipro.workerthreads.AbstractWorker; 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 @Named
public class ProjectExporter extends AbstractWorker { public class ProjectExporter extends AbstractWorker {