Browse Source

Moved entities to dto sub package

master
Jim Martens 10 months ago
parent
commit
ec5064f6b4
  1. 2
      oparl-server/src/integration-test/java/de/twomartens/oparlservice/OParlServiceRestTests.java
  2. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/actuator/RestHealthCheck.java
  3. 4
      oparl-server/src/main/java/de/twomartens/oparlservice/control/OParlController.java
  4. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/AgendaItem.java
  5. 3
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Body.java
  6. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Consultation.java
  7. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ErrorObject.java
  8. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/File.java
  9. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Greeting.java
  10. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/LegislativeTerm.java
  11. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Links.java
  12. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Location.java
  13. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Meeting.java
  14. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/MeetingState.java
  15. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Membership.java
  16. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ObjectList.java
  17. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Organization.java
  18. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/OrganizationType.java
  19. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Pagination.java
  20. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Paper.java
  21. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Person.java
  22. 2
      oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/System.java
  23. 4
      oparl-server/src/main/java/de/twomartens/oparlservice/service/OParlService.java
  24. 6
      oparl-server/src/test/java/de/twomartens/oparlservice/control/OParlControllerTest.java

2
oparl-server/src/integration-test/java/de/twomartens/oparlservice/OParlServiceRestTests.java

@ -1,6 +1,6 @@
package de.twomartens.oparlservice;
import de.twomartens.oparlservice.entity.System;
import de.twomartens.oparlservice.entity.dto.System;
import de.twomartens.oparlservice.interceptors.RequestTypeInterceptor;
import de.twomartens.oparlservice.interceptors.TraceIdInterceptor;
import org.junit.jupiter.api.BeforeEach;

2
oparl-server/src/main/java/de/twomartens/oparlservice/actuator/RestHealthCheck.java

@ -1,6 +1,6 @@
package de.twomartens.oparlservice.actuator;
import de.twomartens.oparlservice.entity.System;
import de.twomartens.oparlservice.entity.dto.System;
import de.twomartens.oparlservice.interceptors.RequestTypeInterceptor;
import de.twomartens.oparlservice.interceptors.TraceIdInterceptor;
import lombok.extern.slf4j.Slf4j;

4
oparl-server/src/main/java/de/twomartens/oparlservice/control/OParlController.java

@ -1,7 +1,7 @@
package de.twomartens.oparlservice.control;
import de.twomartens.oparlservice.entity.System;
import de.twomartens.oparlservice.entity.*;
import de.twomartens.oparlservice.entity.dto.*;
import de.twomartens.oparlservice.entity.dto.System;
import de.twomartens.oparlservice.service.OParlService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/AgendaItem.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/AgendaItem.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

3
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Body.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Body.java

@ -1,10 +1,9 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.experimental.SuperBuilder;
import java.time.ZonedDateTime;
import java.util.List;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Consultation.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Consultation.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/ErrorObject.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ErrorObject.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/File.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/File.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Greeting.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Greeting.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/LegislativeTerm.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/LegislativeTerm.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Links.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Links.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Location.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Location.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Meeting.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Meeting.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/MeetingState.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/MeetingState.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.Getter;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Membership.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Membership.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/ObjectList.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/ObjectList.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Organization.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Organization.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/OrganizationType.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/OrganizationType.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonValue;
import lombok.Getter;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Pagination.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Pagination.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Paper.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Paper.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/Person.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/Person.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

2
oparl-server/src/main/java/de/twomartens/oparlservice/entity/System.java → oparl-server/src/main/java/de/twomartens/oparlservice/entity/dto/System.java

@ -1,4 +1,4 @@
package de.twomartens.oparlservice.entity;
package de.twomartens.oparlservice.entity.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;

4
oparl-server/src/main/java/de/twomartens/oparlservice/service/OParlService.java

@ -1,8 +1,8 @@
package de.twomartens.oparlservice.service;
import de.twomartens.oparlservice.configs.OParlServiceProperties;
import de.twomartens.oparlservice.entity.System;
import de.twomartens.oparlservice.entity.*;
import de.twomartens.oparlservice.entity.dto.*;
import de.twomartens.oparlservice.entity.dto.System;
import org.springframework.stereotype.Service;
import java.util.Optional;

6
oparl-server/src/test/java/de/twomartens/oparlservice/control/OParlControllerTest.java

@ -1,7 +1,7 @@
package de.twomartens.oparlservice.control;
import de.twomartens.oparlservice.entity.System;
import de.twomartens.oparlservice.entity.*;
import de.twomartens.oparlservice.entity.dto.*;
import de.twomartens.oparlservice.entity.dto.System;
import de.twomartens.oparlservice.service.OParlService;
import org.hamcrest.Matchers;
import org.junit.jupiter.api.BeforeEach;
@ -687,4 +687,4 @@ class OParlControllerTest {
.papers(Collections.emptyList())
.build();
}
}
}
Loading…
Cancel
Save