Merge pull request #66 from who-icatx/api-validation

Api validation

Author: alexsilaghi

src/main/java/edu/stanford/protege/gateway/OwlEntityService.java

@@ -201,7 +201,7 @@ private void validateEntityUpdate(OWLEntityDto owlEntityDto, String existingProj
         callerVersionMatchesLatestVersion(owlEntityDto, existingProjectId, callerHash);
         entityIsNotItsOwnParent(owlEntityDto);
         linearizationParentsAreOnlyDirectParents(owlEntityDto, existingProjectId);
-        validatorService.validateOWLEntityDto(owlEntityDto);
+        validatorService.validateOWLEntityDto(owlEntityDto, existingProjectId);
     }
 
     private void callerVersionMatchesLatestVersion(OWLEntityDto owlEntityDto, String existingProjectId, String callerHash) {

src/main/java/edu/stanford/protege/gateway/config/ApplicationBeans.java

@@ -183,4 +183,19 @@ CommandExecutor<GetFullPostCoordinationConfigurationRequest, GetFullPostCoordina
         return new CommandExecutorImpl<>(GetFullPostCoordinationConfigurationResponse.class);
     }
 
+    @Bean
+    CommandExecutor<ValidateEntityUpdateRequest, ValidateEntityUpdateResponse> executorForValidateEntityUpdate() {
+        return new CommandExecutorImpl<>(ValidateEntityUpdateResponse.class);
+    }
+
+    @Bean
+    CommandExecutor<CheckNonExistentIrisRequest, CheckNonExistentIrisResponse> executorForCheckNonExistentIris() {
+        return new CommandExecutorImpl<>(CheckNonExistentIrisResponse.class);
+    }
+
+    @Bean
+    CommandExecutor<ValidateLogicalDefinitionFromApiRequest, ValidateLogicalDefinitionFromApiResponse> validateLogicalDefinitionsExecutor() {
+        return new CommandExecutorImpl<>(ValidateLogicalDefinitionFromApiResponse.class);
+    }
+
 }

src/main/java/edu/stanford/protege/gateway/ontology/commands/CheckNonExistentIrisRequest.java

@@ -0,0 +1,23 @@
+package edu.stanford.protege.gateway.ontology.commands;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import edu.stanford.protege.webprotege.common.ProjectId;
+import edu.stanford.protege.webprotege.common.Request;
+import org.semanticweb.owlapi.model.IRI;
+
+import java.util.Set;
+
+@JsonTypeName(CheckNonExistentIrisRequest.CHANNEL)
+public record CheckNonExistentIrisRequest(
+        @JsonProperty("projectId") ProjectId projectId,
+        @JsonProperty("iris") Set<IRI> iris
+) implements Request<CheckNonExistentIrisResponse> {
+
+    public static final String CHANNEL = "webprotege.entities.CheckNonExistentIris";
+
+    @Override
+    public String getChannel() {
+        return CHANNEL;
+    }
+}

src/main/java/edu/stanford/protege/gateway/ontology/commands/CheckNonExistentIrisResponse.java

@@ -0,0 +1,20 @@
+package edu.stanford.protege.gateway.ontology.commands;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import edu.stanford.protege.webprotege.common.Response;
+import org.semanticweb.owlapi.model.IRI;
+
+import java.util.Set;
+
+import static edu.stanford.protege.gateway.ontology.commands.CheckNonExistentIrisRequest.CHANNEL;
+
+@JsonTypeName(CHANNEL)
+public record CheckNonExistentIrisResponse(
+        @JsonProperty("nonExistentIris") Set<IRI> nonExistentIris
+) implements Response {
+
+    public static CheckNonExistentIrisResponse create(Set<IRI> nonExistentIris) {
+        return new CheckNonExistentIrisResponse(nonExistentIris);
+    }
+}

src/main/java/edu/stanford/protege/gateway/ontology/commands/ValidateLogicalDefinitionFromApiRequest.java

@@ -0,0 +1,35 @@
+package edu.stanford.protege.gateway.ontology.commands;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import edu.stanford.protege.webprotege.common.ProjectId;
+import edu.stanford.protege.webprotege.common.Request;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+
+@JsonTypeName(ValidateLogicalDefinitionFromApiRequest.CHANNEL)
+public record ValidateLogicalDefinitionFromApiRequest(
+        @JsonProperty("projectId") @Nonnull ProjectId projectId,
+        @JsonProperty("entityIri") @Nonnull String entityIri,
+        @JsonProperty("logicalDefinitions") @Nonnull List<LogicalDefinition> logicalDefinitions,
+        @JsonProperty("necessaryConditions") @Nonnull List<Relationship> necessaryConditions
+) implements Request<ValidateLogicalDefinitionFromApiResponse> {
+
+    public static final String CHANNEL = "webprotege.icd.ValidateLogicalDefinitionsFromApi";
+
+    @Override
+    public String getChannel() {
+        return CHANNEL;
+    }
+
+    public record LogicalDefinition(
+            @JsonProperty("logicalDefinitionSuperclass") @Nonnull String logicalDefinitionSuperclass,
+            @JsonProperty("relationships") @Nonnull List<Relationship> relationships
+    ) {}
+
+    public record Relationship(
+            @JsonProperty("axis") @Nonnull String axis,
+            @JsonProperty("filler") @Nonnull String filler
+    ) {}
+}

src/main/java/edu/stanford/protege/gateway/ontology/commands/ValidateLogicalDefinitionFromApiResponse.java

@@ -0,0 +1,20 @@
+package edu.stanford.protege.gateway.ontology.commands;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import edu.stanford.protege.webprotege.common.Response;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+
+import static edu.stanford.protege.gateway.ontology.commands.ValidateLogicalDefinitionFromApiRequest.CHANNEL;
+
+@JsonTypeName(CHANNEL)
+public record ValidateLogicalDefinitionFromApiResponse(
+        @JsonProperty("messages") @Nonnull List<String> messages
+) implements Response {
+
+    public static ValidateLogicalDefinitionFromApiResponse create(@Nonnull List<String> messages) {
+        return new ValidateLogicalDefinitionFromApiResponse(messages);
+    }
+}

src/main/java/edu/stanford/protege/gateway/postcoordination/EntityPostCoordinationService.java

@@ -120,6 +120,6 @@ public CompletableFuture<List<EntityPostCoordinationCustomScalesDto>> getEntityC
     }
 
     public List<CompletePostCoordinationAxisConfiguration> getAllPostCoordinationAxisConfigs() throws ExecutionException, InterruptedException, TimeoutException {
-        return entityConfigurationExecutor.execute(new GetFullPostCoordinationConfigurationRequest(), SecurityContextHelper.getExecutionContext()).get(5, TimeUnit.SECONDS).configuration();
+        return entityConfigurationExecutor.execute(new GetFullPostCoordinationConfigurationRequest(), SecurityContextHelper.getExecutionContext()).get(15, TimeUnit.SECONDS).configuration();
     }
 }

src/main/java/edu/stanford/protege/gateway/postcoordination/commands/ValidateEntityUpdateRequest.java

@@ -0,0 +1,22 @@
+package edu.stanford.protege.gateway.postcoordination.commands;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import edu.stanford.protege.webprotege.common.ProjectId;
+import edu.stanford.protege.webprotege.common.Request;
+
+@JsonTypeName(ValidateEntityUpdateRequest.CHANNEL)
+public record ValidateEntityUpdateRequest(@JsonProperty("projectId")
+                                         ProjectId projectId,
+                                         @JsonProperty("entityCustomScaleValues")
+                                         WhoficCustomScalesValues entityCustomScaleValues,
+                                         @JsonProperty("entitySpecification")
+                                         WhoficEntityPostCoordinationSpecification entitySpecification) implements Request<ValidateEntityUpdateResponse> {
+
+    public final static String CHANNEL = "webprotege.postcoordination.ValidateEntityUpdate";
+
+    @Override
+    public String getChannel() {
+        return CHANNEL;
+    }
+}

src/main/java/edu/stanford/protege/gateway/postcoordination/commands/ValidateEntityUpdateResponse.java

@@ -0,0 +1,28 @@
+package edu.stanford.protege.gateway.postcoordination.commands;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import edu.stanford.protege.webprotege.common.Response;
+
+import java.util.List;
+
+import static edu.stanford.protege.gateway.postcoordination.commands.ValidateEntityUpdateRequest.CHANNEL;
+
+@JsonTypeName(CHANNEL)
+public class ValidateEntityUpdateResponse implements Response {
+
+    @JsonProperty("errorMessages")
+    private final List<String> errorMessages;
+
+    public ValidateEntityUpdateResponse() {
+        this.errorMessages = List.of();
+    }
+
+    public ValidateEntityUpdateResponse(List<String> errorMessages) {
+        this.errorMessages = errorMessages;
+    }
+
+    public List<String> getErrorMessages() {
+        return errorMessages;
+    }
+}