From 82c5a7a85ad22de574b657ca605140bdc5867d34 Mon Sep 17 00:00:00 2001 From: Nico Athanassiadis <nico@dsv.su.se> Date: Thu, 20 Feb 2025 08:45:04 +0100 Subject: [PATCH] reformatted code with prettier tooling --- .../daisy/workers/ProjectExporter.java | 23 +++++++++---------- .../io/impl/ExternalExporterDaisyImpl.java | 5 ++-- .../daisy/workers/ProjectExporterTest.java | 7 ++++-- .../impl/ExternalExporterDaisyImplTest.java | 19 ++++++++------- 4 files changed, 27 insertions(+), 27 deletions(-) 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 dccccdda5a..31e1fbcdb8 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,7 +1,18 @@ 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 java.time.Instant; +import java.time.LocalDate; +import java.time.Period; +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; @@ -30,18 +41,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.LocalDate; -import java.time.Period; -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 18000dcea1..a8b7184112 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 @@ -2,6 +2,8 @@ package se.su.dsv.scipro.io.impl; import jakarta.inject.Inject; import jakarta.ws.rs.core.Response; +import java.math.BigDecimal; +import java.time.LocalDate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import se.su.dsv.scipro.daisyexternal.http.DaisyAPI; @@ -22,9 +24,6 @@ import se.su.dsv.scipro.project.Project; import se.su.dsv.scipro.system.Unit; import se.su.dsv.scipro.system.User; -import java.math.BigDecimal; -import java.time.LocalDate; - public class ExternalExporterDaisyImpl implements ExternalExporter { private static final Logger LOGGER = LoggerFactory.getLogger(ExternalExporterDaisyImpl.class); 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 6ea34f846d..80f69ab45e 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 @@ -145,7 +145,11 @@ public class ProjectExporterTest { @Test public void change_head_supervisor() throws Exception { - User newSupervisor = User.builder().firstName("New").lastName("Supervisor").emailAddress("new@supervisor.com").build(); + User newSupervisor = User.builder() + .firstName("New") + .lastName("Supervisor") + .emailAddress("new@supervisor.com") + .build(); Unit unit = new Unit(); unit.setIdentifier(239478); @@ -166,7 +170,6 @@ public class ProjectExporterTest { projectExporter.run(); verify(externalExporter).addContributorToProject(exportedProject, newSupervisor, Role.SUPERVISOR); - } @Test 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 451675ec65..c6be049575 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 @@ -1,6 +1,15 @@ package se.su.dsv.scipro.io.impl; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import jakarta.ws.rs.core.Response; +import java.net.URI; +import java.time.LocalDate; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -14,16 +23,6 @@ import se.su.dsv.scipro.system.DegreeType; import se.su.dsv.scipro.system.ProjectType; import se.su.dsv.scipro.system.Unit; -import java.net.URI; -import java.time.LocalDate; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @ExtendWith(MockitoExtension.class) public class ExternalExporterDaisyImplTest {