From 7a816c0a22e7b71a978bdd67667c4db70e958aec Mon Sep 17 00:00:00 2001 From: iimpulse Date: Mon, 3 Feb 2025 14:36:53 -0700 Subject: [PATCH 1/2] constraining 255 for tests --- .../src/main/java/org/jax/oan/controller/SearchController.java | 3 ++- .../test/java/org/jax/oan/controller/SearchControllerTest.java | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/oan-rest/src/main/java/org/jax/oan/controller/SearchController.java b/oan-rest/src/main/java/org/jax/oan/controller/SearchController.java index 24b8ba7..1d06799 100644 --- a/oan-rest/src/main/java/org/jax/oan/controller/SearchController.java +++ b/oan-rest/src/main/java/org/jax/oan/controller/SearchController.java @@ -9,6 +9,7 @@ import io.micronaut.http.exceptions.HttpStatusException; import io.micronaut.serde.annotation.SerdeImport; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Size; import org.jax.oan.core.Disease; import org.jax.oan.core.SearchDto; import org.jax.oan.core.SupportedEntity; @@ -38,7 +39,7 @@ public SearchController(SearchService searchService, DiseaseService diseaseServi public HttpResponse searchEntity(@Schema(minLength = 1, maxLength = 20, type = "string", pattern = ".*", format = "string") @PathVariable String entity, @Schema(minLength = 1, maxLength = 255, type = "string", pattern = "^[a-zA-Z0-9\\s\\-':]+$", format = "string") - @QueryValue @Pattern(regexp = "^[a-zA-Z0-9\\s\\-':,]+$") String q, + @QueryValue @Pattern(regexp = "^[a-zA-Z0-9\\s\\-':,]+$") @Size(max = 255) String q, @Schema(minLength = 0, maxLength = 1000, type = "number", format = "int32") @QueryValue(value = "page", defaultValue = "0") int page, @Schema(minLength = 0, maxLength = 10000, type = "number", format = "int32") diff --git a/oan-rest/src/test/java/org/jax/oan/controller/SearchControllerTest.java b/oan-rest/src/test/java/org/jax/oan/controller/SearchControllerTest.java index 36a7684..1b1c8b8 100644 --- a/oan-rest/src/test/java/org/jax/oan/controller/SearchControllerTest.java +++ b/oan-rest/src/test/java/org/jax/oan/controller/SearchControllerTest.java @@ -66,9 +66,9 @@ void negative_search_bad_query(RequestSpecification spec){ spec.when().get("/api/network/search/disease?q=( )").then().statusCode(400); spec.when().get("/api/network/search/disease?q=%20Cardiac%20tumors%20(").then().statusCode(400); spec.when().get("/api/network/search/disease?q=NM_000314.8:c.-511G%3EA").then().statusCode(400); + spec.when().get("/api/network/search/disease?q=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789").then().statusCode(400); } - @Test void postive_intersecting(RequestSpecification spec){ when(diseaseService.findIntersectingByPhenotypes(List.of(TermId.of("HP:333333"), TermId.of("HP:44444")))) diff --git a/pom.xml b/pom.xml index 201e0be..d0ecfcb 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 5.13.0 2.2.20 4.7.5 - 1.4.11 + 1.4.12 From fb8d775750396185be0683485079c21ad861bb95 Mon Sep 17 00:00:00 2001 From: iimpulse Date: Mon, 3 Feb 2025 14:38:50 -0700 Subject: [PATCH 2/2] reving to 1.0.13 --- oan-etl/pom.xml | 2 +- oan-model/pom.xml | 2 +- oan-rest/pom.xml | 2 +- oan-rest/src/main/java/org/jax/oan/Application.java | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/oan-etl/pom.xml b/oan-etl/pom.xml index 0d19150..72b6b6a 100644 --- a/oan-etl/pom.xml +++ b/oan-etl/pom.xml @@ -7,7 +7,7 @@ org.jax.oan ontology-annotation-network - 1.0.12 + 1.0.13 oan-etl diff --git a/oan-model/pom.xml b/oan-model/pom.xml index 617b213..a45d0f9 100644 --- a/oan-model/pom.xml +++ b/oan-model/pom.xml @@ -4,7 +4,7 @@ org.jax.oan ontology-annotation-network - 1.0.12 + 1.0.13 oan-model diff --git a/oan-rest/pom.xml b/oan-rest/pom.xml index 4e9250d..8699abc 100644 --- a/oan-rest/pom.xml +++ b/oan-rest/pom.xml @@ -4,7 +4,7 @@ org.jax.oan ontology-annotation-network - 1.0.12 + 1.0.13 oan-rest diff --git a/oan-rest/src/main/java/org/jax/oan/Application.java b/oan-rest/src/main/java/org/jax/oan/Application.java index 55c269f..eb48e2e 100644 --- a/oan-rest/src/main/java/org/jax/oan/Application.java +++ b/oan-rest/src/main/java/org/jax/oan/Application.java @@ -12,7 +12,7 @@ @OpenAPIDefinition( info = @Info( title = "ontology-annotation-network", - version = "1.0.12", + version = "1.0.13", description = "A restful service for access to the ontology annotation network.", contact = @Contact(name = "Michael Gargano", email = "Michael.Gargano@jax.org") ), servers = {@Server(url = "https://ontology.jax.org/api/network", description = "Production Server URL") diff --git a/pom.xml b/pom.xml index d0ecfcb..e949cc5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.jax.oan ontology-annotation-network pom - 1.0.12 + 1.0.13 ontology-annotation-network https://github.com/TheJacksonLaboratory/ontology-annotation-network