feat(yaml-payload): annotate effected endpoints to accept yaml payload

refs: #177
DataCater · Apr 18, 2023 · 1fb2b56 · 1fb2b56
1 parent 194fc84
commit 1fb2b56
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/platform-api/src/main/java/io/datacater/core/config/ConfigEndpoint.java b/platform-api/src/main/java/io/datacater/core/config/ConfigEndpoint.java
@@ -1,6 +1,7 @@
 package io.datacater.core.config;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.jaxrs.yaml.YAMLMediaTypes;
 import io.datacater.core.exceptions.ConfigNotFoundException;
 import io.quarkus.security.Authenticated;
 import io.smallrye.mutiny.Uni;
@@ -16,7 +17,7 @@
 
 @Path("/configs")
 @Authenticated
-@Produces(MediaType.APPLICATION_JSON)
+@Produces({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
 @SecurityRequirement(name = "apiToken")
 public class ConfigEndpoint {
   private static final String UUID_NOT_FOUND_ERROR_MESSAGE = "No config found for uuid %s";
@@ -51,7 +52,7 @@ public Uni<ConfigEntity> getConfig(@PathParam("uuid") UUID uuid) {
 
   @POST
   @RequestBody
-  @Consumes(MediaType.APPLICATION_JSON)
+  @Consumes({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
   public Uni<ConfigEntity> createConfig(Config config) throws JsonProcessingException {
     ConfigEntity configEntity =
         ConfigEntity.from(config.name(), config.kind(), config.metadata(), config.spec());
@@ -63,7 +64,7 @@ public Uni<ConfigEntity> createConfig(Config config) throws JsonProcessingExcept
   @PUT
   @Path("{uuid}")
   @RequestBody
-  @Consumes(MediaType.APPLICATION_JSON)
+  @Consumes({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
   public Uni<ConfigEntity> updateConfig(@PathParam("uuid") UUID uuid, Config config) {
     return sf.withTransaction(
         ((session, transaction) ->

diff --git a/platform-api/src/main/java/io/datacater/core/deployment/DeploymentEndpoint.java b/platform-api/src/main/java/io/datacater/core/deployment/DeploymentEndpoint.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.yaml.YAMLMediaTypes;
 import io.datacater.core.authentication.DataCaterSessionFactory;
 import io.datacater.core.config.ConfigEntity;
 import io.datacater.core.config.ConfigUtilities;
@@ -40,7 +41,7 @@
 
 @Path("/deployments")
 @Authenticated
-@Produces(MediaType.APPLICATION_JSON)
+@Produces({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
 @SecurityRequirement(name = "apiToken")
 @RequestScoped
 public class DeploymentEndpoint {
@@ -166,7 +167,7 @@ public Uni<List<DeploymentEntity>> getDeployments() {
   }
 
   @POST
-  @Consumes(MediaType.APPLICATION_JSON)
+  @Consumes({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
   public Uni<DeploymentEntity> createDeployment(DeploymentSpec spec) {
     DeploymentEntity de = new DeploymentEntity(spec);
 
@@ -252,6 +253,7 @@ public Uni<Response> deleteDeployment(@PathParam("uuid") UUID deploymentId) {
 
   @PUT
   @Path("{uuid}")
+  @Consumes({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
   public Uni<DeploymentEntity> updateDeployment(
       @PathParam("uuid") UUID deploymentUuid, DeploymentSpec spec) {
     return dsf.withTransaction(

diff --git a/platform-api/src/main/java/io/datacater/core/pipeline/PipelineEndpoint.java b/platform-api/src/main/java/io/datacater/core/pipeline/PipelineEndpoint.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.jaxrs.yaml.YAMLMediaTypes;
 import io.datacater.core.authentication.DataCaterSessionFactory;
 import io.datacater.core.exceptions.DatacaterException;
 import io.datacater.core.exceptions.PipelineNotFoundException;
@@ -42,7 +43,7 @@
 
 @Path("/pipelines")
 @Authenticated
-@Produces(MediaType.APPLICATION_JSON)
+@Produces({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
 @SecurityRequirement(name = "apiToken")
 public class PipelineEndpoint {
 
@@ -75,7 +76,7 @@ public Uni<PipelineEntity> getPipeline(@PathParam("uuid") UUID uuid) {
 
   @POST
   @RequestBody
-  @Consumes(MediaType.APPLICATION_JSON)
+  @Consumes({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
   public Uni<PipelineEntity> createPipeline(Pipeline pipeline) throws JsonProcessingException {
     PipelineEntity pe =
         PipelineEntity.from(
@@ -88,7 +89,7 @@ public Uni<PipelineEntity> createPipeline(Pipeline pipeline) throws JsonProcessi
   @PUT
   @Path("{uuid}")
   @RequestBody
-  @Consumes(MediaType.APPLICATION_JSON)
+  @Consumes({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
   public Uni<PipelineEntity> updatePipeline(@PathParam("uuid") UUID uuid, Pipeline pipeline) {
     return dsf.withTransaction(
         ((session, transaction) ->

diff --git a/platform-api/src/main/java/io/datacater/core/stream/StreamEndpoint.java b/platform-api/src/main/java/io/datacater/core/stream/StreamEndpoint.java
@@ -81,7 +81,7 @@ public Uni<Response> createStream(Stream stream) throws JsonProcessingException
   @PUT
   @Path("{uuid}")
   @RequestBody
-  @Consumes(MediaType.APPLICATION_JSON)
+  @Consumes({MediaType.APPLICATION_JSON, YAMLMediaTypes.APPLICATION_JACKSON_YAML})
   public Uni<StreamEntity> updateStream(@PathParam("uuid") UUID uuid, Stream stream) {
 
     return dsf.withTransaction(