From 0c1fe8efcedfd9f2ab2732f0764cc64858aa196e Mon Sep 17 00:00:00 2001 From: Armin Friedl Date: Mon, 13 Jul 2020 21:55:02 +0200 Subject: [PATCH] Remove invalid constraints, prepare python generator for deployment --- .drone.yml | 14 ++++++++++++++ .../net/friedl/fling/model/dto/ArtifactDto.java | 1 - .../java/net/friedl/fling/model/dto/FlingDto.java | 2 -- .../net/friedl/fling/model/ArtifactDtoTest.java | 7 ++----- .../java/net/friedl/fling/model/FlingDtoTest.java | 14 ++++---------- web/fling/package-lock.json | 2 +- web/fling/src/components/admin/FlingTile.jsx | 8 ++++---- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4989620..87e3192 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,8 +41,22 @@ steps: - openapi-generator generate -i http://runservice:8080/v3/api-docs -g python + --additional-properties packageName=flingclient -o flingclient.py --enable-post-process-file + - cd flingclient.py + - |+ + cat << EOF + [distutils] + index-servers = + nexus + [private-repository] + repository = + username = + password = + EOF >> .pypirc + - cat .pypirc + - cd .. # JavaScript client - openapi-generator generate -i http://runservice:8080/v3/api-docs diff --git a/service/fling/src/main/java/net/friedl/fling/model/dto/ArtifactDto.java b/service/fling/src/main/java/net/friedl/fling/model/dto/ArtifactDto.java index 8dfcb90..e02b983 100644 --- a/service/fling/src/main/java/net/friedl/fling/model/dto/ArtifactDto.java +++ b/service/fling/src/main/java/net/friedl/fling/model/dto/ArtifactDto.java @@ -18,7 +18,6 @@ import lombok.NoArgsConstructor; @Schema(name = "Artifact") public class ArtifactDto { @Schema(accessMode = AccessMode.READ_ONLY, type = "string") - @NotNull private UUID id; @Schema(type = "string", diff --git a/service/fling/src/main/java/net/friedl/fling/model/dto/FlingDto.java b/service/fling/src/main/java/net/friedl/fling/model/dto/FlingDto.java index be6379d..ff2ab54 100644 --- a/service/fling/src/main/java/net/friedl/fling/model/dto/FlingDto.java +++ b/service/fling/src/main/java/net/friedl/fling/model/dto/FlingDto.java @@ -17,7 +17,6 @@ import lombok.NoArgsConstructor; @Schema(name = "Fling") public class FlingDto { @Schema(accessMode = AccessMode.READ_ONLY, type = "string") - @NotNull private UUID id; @Schema(description = "Name of the fling") @@ -26,7 +25,6 @@ public class FlingDto { @Schema(type = "integer", format = "int64", accessMode = AccessMode.READ_ONLY, description = "Creation time in milliseconds since the unix epoch 01.01.1970 00:00:00 UTC") - @NotNull private Instant creationTime; @Schema(description = "Share id of the fling. Used in the share link.") diff --git a/service/fling/src/test/java/net/friedl/fling/model/ArtifactDtoTest.java b/service/fling/src/test/java/net/friedl/fling/model/ArtifactDtoTest.java index 394079d..3e10a39 100644 --- a/service/fling/src/test/java/net/friedl/fling/model/ArtifactDtoTest.java +++ b/service/fling/src/test/java/net/friedl/fling/model/ArtifactDtoTest.java @@ -22,7 +22,7 @@ public class ArtifactDtoTest { private Validator validator; @Test - void testSetId_null_validationFails() { + void testSetId_null_validationOk() { ArtifactDto artifactDto = ArtifactDto.builder() .id(null) .path(Paths.get("test")) @@ -31,10 +31,7 @@ public class ArtifactDtoTest { Set> constraintViolations = validator.validate(artifactDto); - assertThat(constraintViolations).hasSize(1); - ConstraintViolation violation = constraintViolations.iterator().next(); - assertThat(violation.getPropertyPath().toString()).isEqualTo("id"); - assertThat(violation.getMessage()).isEqualTo("must not be null"); + assertThat(constraintViolations).hasSize(0); } @Test diff --git a/service/fling/src/test/java/net/friedl/fling/model/FlingDtoTest.java b/service/fling/src/test/java/net/friedl/fling/model/FlingDtoTest.java index 6d6f2f5..6960013 100644 --- a/service/fling/src/test/java/net/friedl/fling/model/FlingDtoTest.java +++ b/service/fling/src/test/java/net/friedl/fling/model/FlingDtoTest.java @@ -22,7 +22,7 @@ public class FlingDtoTest { private Validator validator; @Test - void testSetId_null_validationFails() { + void testSetId_null_validationOk() { FlingDto flingDto = FlingDto.builder() .id(null) .name("test") @@ -33,10 +33,7 @@ public class FlingDtoTest { Set> constraintViolations = validator.validate(flingDto); - assertThat(constraintViolations).hasSize(1); - ConstraintViolation violation = constraintViolations.iterator().next(); - assertThat(violation.getPropertyPath().toString()).isEqualTo("id"); - assertThat(violation.getMessage()).isEqualTo("must not be null"); + assertThat(constraintViolations).hasSize(0); } @Test @@ -58,7 +55,7 @@ public class FlingDtoTest { } @Test - void testSetCreationTime_null_validationFails() { + void testSetCreationTime_null_validationOk() { FlingDto flingDto = FlingDto.builder() .id(new UUID(0L, 0L)) .name("test") @@ -69,10 +66,7 @@ public class FlingDtoTest { Set> constraintViolations = validator.validate(flingDto); - assertThat(constraintViolations).hasSize(1); - ConstraintViolation violation = constraintViolations.iterator().next(); - assertThat(violation.getPropertyPath().toString()).isEqualTo("creationTime"); - assertThat(violation.getMessage()).isEqualTo("must not be null"); + assertThat(constraintViolations).hasSize(0); } diff --git a/web/fling/package-lock.json b/web/fling/package-lock.json index c595a82..554398d 100644 --- a/web/fling/package-lock.json +++ b/web/fling/package-lock.json @@ -1210,7 +1210,7 @@ "@fling/flingclient": { "version": "0.1.0-snapshot", "resolved": "https://nexus.friedl.net/repository/npm-private/@fling/flingclient/-/flingclient-0.1.0-snapshot.tgz", - "integrity": "sha512-KXeJE/tTCi+IRBZ8pBeFLFEn7GDBWw/aIDj4xaofjw6S0DFEpw5TwW+Oh45NALk/SEiR4DKBuG/sfgiHrpZwLA==", + "integrity": "sha512-Ws4M0st41sb8gQz07k3ygEXoqx5GtSmH9rr/RzrJhQELt0dVxNi8qJY3VcJxV6svpYvwKDacRyy+aXnNnOG6/w==", "requires": { "@babel/cli": "^7.0.0", "superagent": "3.7.0" diff --git a/web/fling/src/components/admin/FlingTile.jsx b/web/fling/src/components/admin/FlingTile.jsx index 8b9b7f0..fd5f00f 100644 --- a/web/fling/src/components/admin/FlingTile.jsx +++ b/web/fling/src/components/admin/FlingTile.jsx @@ -16,16 +16,16 @@ function TileAction(props) {
  • - +
    • @@ -57,7 +57,7 @@ function TileAction(props) { } async function toggleShared() { - await flingClient.putFling(props.fling.id, {"sharing": {"shared": !props.fling.sharing.shared}}); + await flingClient.putFling(props.fling.id, {"sharing": {"shared": !props.fling.shared}}); await props.refreshFlingListFn(); } }