removed page and external references in favour of auto generation

plantbreeding · daveneti · Jun 24, 2024 · Jun 24, 2024 · Jun 24, 2024 · Jun 24, 2024
commit 9a615200d7eff669d73562516cbd88e98816be8f
diff --git a/java/core/src/main/java/org/brapi/schematools/core/graphql/GraphQLGenerator.java b/java/core/src/main/java/org/brapi/schematools/core/graphql/GraphQLGenerator.java
@@ -360,9 +360,12 @@ private Response<GraphQLNamedInputType> createInputObjectType(String name, BrAPI
                     name(name).
                     description(brAPIObjectType.getDescription());
 
-                return brAPIObjectType.getProperties().stream().map(this::createInputObjectField).collect(Response.toList()).
-                    onSuccessDoWithResult(builder::fields).
-                    map(() -> addInputObjectType(builder.build()));
+                boolean hasExternalReferences = brAPIObjectType.getProperties().stream().anyMatch(property -> property.getName().equals("externalReferences")) ;
+
+                return brAPIObjectType.getProperties().stream().map(this::createInputObjectField).collect(Response.toList())
+                    .onSuccessDoWithResult(builder::fields)
+                    .mapOnCondition(hasExternalReferences, () -> createExternalReferencesInputObjectField().onSuccessDoWithResult(builder::field))
+                    .map(() -> addInputObjectType(builder.build()));
             } else if (type instanceof BrAPIOneOfType brAPIOneOfType) {
                 GraphQLInputObjectType.Builder builder = newInputObject().
                     name(name).
@@ -411,6 +414,14 @@ private Response<GraphQLInputObjectField> createInputObjectField(BrAPIObjectProp
                 map(() -> success(builder.build()));
         }
 
+        private Response<GraphQLInputObjectField> createExternalReferencesInputObjectField() {
+            return success(newInputObjectField()
+                .name("externalReferences")
+                .description("Filter by External References")
+                .type(GraphQLList.list(GraphQLTypeReference.typeRef("ExternalReferenceInput")))
+                .build()) ;
+        }
+
         private Response<GraphQLUnionType> createUnionOutputType(BrAPIOneOfType type) {
 
             GraphQLUnionType existingType = unionTypes.

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/CallRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/CallRequest.json
@@ -1,69 +1,62 @@
 {
     "$defs": {
         "CallRequest": {
-            "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
+            "type": "object",
+            "properties": {
+                "callSetDbIds": {
+                    "description": "A list of IDs which uniquely identify `CallSets` within the given database server",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "example": [
+                        "a03202ec",
+                        "274e4f63"
+                    ]
                 },
-                {
-                    "type": "object",
-                    "properties": {
-                        "callSetDbIds": {
-                            "description": "A list of IDs which uniquely identify `CallSets` within the given database server",
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            },
-                            "example": [
-                                "a03202ec",
-                                "274e4f63"
-                            ]
-                        },
-                        "variantDbIds": {
-                            "description": "A list of IDs which uniquely identify `Variant` within the given database server",
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            },
-                            "example": [
-                                "bba0b258",
-                                "ff97d4f0"
-                            ]
-                        },
-                        "variantSetDbIds": {
-                            "description": "A list of IDs which uniquely identify `VariantSets` within the given database server",
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            },
-                            "example": [
-                                "407c0508",
-                                "49e24dfc"
-                            ]
-                        },
-                        "expandHomozygotes": {
-                            "description": "Should homozygotes be expanded (true) or collapsed into a single occurrence (false)",
-                            "type": "boolean",
-                            "example": true
-                        },
-                        "sepPhased": {
-                            "description": "The string used as a separator for phased allele calls.",
-                            "type": "string",
-                            "example": "|"
-                        },
-                        "sepUnphased": {
-                            "description": "The string used as a separator for unphased allele calls.",
-                            "type": "string",
-                            "example": "/"
-                        },
-                        "unknownString": {
-                            "description": "The string used as a representation for missing data.",
-                            "type": "string",
-                            "example": "."
-                        }
-                    }
+                "variantDbIds": {
+                    "description": "A list of IDs which uniquely identify `Variant` within the given database server",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "example": [
+                        "bba0b258",
+                        "ff97d4f0"
+                    ]
+                },
+                "variantSetDbIds": {
+                    "description": "A list of IDs which uniquely identify `VariantSets` within the given database server",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    },
+                    "example": [
+                        "407c0508",
+                        "49e24dfc"
+                    ]
+                },
+                "expandHomozygotes": {
+                    "description": "Should homozygotes be expanded (true) or collapsed into a single occurrence (false)",
+                    "type": "boolean",
+                    "example": true
+                },
+                "sepPhased": {
+                    "description": "The string used as a separator for phased allele calls.",
+                    "type": "string",
+                    "example": "|"
+                },
+                "sepUnphased": {
+                    "description": "The string used as a separator for unphased allele calls.",
+                    "type": "string",
+                    "example": "/"
+                },
+                "unknownString": {
+                    "description": "The string used as a representation for missing data.",
+                    "type": "string",
+                    "example": "."
                 }
-            ],
+            },
             "brapi-metadata": {
                 "request": true
             }

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/CallSetRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/CallSetRequest.json
@@ -2,9 +2,6 @@
     "$defs": {
         "CallSetRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "$ref": "Parameters/GermplasmParameters.json#/$defs/GermplasmParameters"
                 },
@@ -20,9 +17,6 @@
                 {
                     "$ref": "Parameters/StudyParameters.json#/$defs/StudyParameters"
                 },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "type": "object",
                     "properties": {

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/CrossRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/CrossRequest.json
@@ -2,12 +2,6 @@
     "$defs": {
         "CrossRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "$ref": "Parameters/CommonCropNamesParameters.json#/$defs/CommonCropNamesParameters"
                 },

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/CrossingProjectRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/CrossingProjectRequest.json
@@ -2,12 +2,6 @@
     "$defs": {
         "CrossingProjectRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "$ref": "Parameters/CommonCropNamesParameters.json#/$defs/CommonCropNamesParameters"
                 },

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/EventRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/EventRequest.json
@@ -2,9 +2,6 @@
     "$defs": {
         "EventRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "$ref": "Parameters/StudyParameters.json#/$defs/StudyParameters"
                 },

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/GenomeMapRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/GenomeMapRequest.json
@@ -2,9 +2,6 @@
     "$defs": {
         "GenomeMapRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "$ref": "Parameters/CommonCropNamesParameters.json#/$defs/CommonCropNamesParameters"
                 },

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/GermplasmAttributeValueRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/GermplasmAttributeValueRequest.json
@@ -2,9 +2,6 @@
     "$defs": {
         "GermplasmAttributeValueRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "$ref": "Parameters/GermplasmParameters.json#/$defs/GermplasmParameters"
                 },
@@ -14,9 +11,6 @@
                 {
                     "$ref": "Parameters/ProgramParameters.json#/$defs/ProgramParameters"
                 },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "type": "object",
                     "properties": {

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/GermplasmRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/GermplasmRequest.json
@@ -2,9 +2,6 @@
     "$defs": {
         "GermplasmRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "$ref": "Parameters/CommonCropNamesParameters.json#/$defs/CommonCropNamesParameters"
                 },
@@ -20,9 +17,6 @@
                 {
                     "$ref": "Parameters/StudyParameters.json#/$defs/StudyParameters"
                 },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "type": "object",
                     "properties": {

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/ImageRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/ImageRequest.json
@@ -2,12 +2,6 @@
     "$defs": {
         "ImageRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "$ref": "Parameters/CommonCropNamesParameters.json#/$defs/CommonCropNamesParameters"
                 },

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/LocationRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/LocationRequest.json
@@ -2,12 +2,6 @@
     "$defs": {
         "LocationRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "$ref": "Parameters/LocationParameters.json#/$defs/LocationParameters"
                 },

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/MarkerPositionRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/MarkerPositionRequest.json
@@ -2,9 +2,6 @@
     "$defs": {
         "MarkerPositionRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "type": "object",
                     "properties": {

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/MethodRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/MethodRequest.json
@@ -5,18 +5,12 @@
                 {
                     "$ref": "Parameters/OntologyParameters.json#/$defs/OntologyParameters"
                 },
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "$ref": "Parameters/CommonCropNamesParameters.json#/$defs/CommonCropNamesParameters"
                 },
                 {
                     "$ref": "Parameters/ProgramParameters.json#/$defs/ProgramParameters"
                 },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "type": "object",
                     "properties": {

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/ObservationRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/ObservationRequest.json
@@ -2,9 +2,6 @@
     "$defs": {
         "ObservationRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "$ref": "Parameters/CommonCropNamesParameters.json#/$defs/CommonCropNamesParameters"
                 },
@@ -26,9 +23,6 @@
                 {
                     "$ref": "Parameters/ObservationVariableParameters.json#/$defs/ObservationVariableParameters"
                 },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "type": "object",
                     "properties": {

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/ObservationUnitRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/ObservationUnitRequest.json
@@ -2,9 +2,6 @@
     "$defs": {
         "ObservationUnitRequest": {
             "allOf": [
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "$ref": "Parameters/CommonCropNamesParameters.json#/$defs/CommonCropNamesParameters"
                 },
@@ -26,9 +23,6 @@
                 {
                     "$ref": "Parameters/ObservationVariableParameters.json#/$defs/ObservationVariableParameters"
                 },
-                {
-                    "$ref": "Parameters/ExternalReferenceParameters.json#/$defs/ExternalReferenceParameters"
-                },
                 {
                     "type": "object",
                     "properties": {

diff --git a/java/core/src/test/resources/BrAPI-Schema/Requests/OntologyRequest.json b/java/core/src/test/resources/BrAPI-Schema/Requests/OntologyRequest.json
@@ -5,9 +5,6 @@
                 {
                     "$ref": "Parameters/OntologyParameters.json#/$defs/OntologyParameters"
                 },
-                {
-                    "$ref": "Parameters/PagingParameters.json#/$defs/PagingParameters"
-                },
                 {
                     "type": "object",
                     "properties": {