Configuration: OpenAPI improve (#30)

* fix: add openapi base

* Add OpenAPI base

config.yaml

@@ -9,12 +9,21 @@ ontologies:
     prefixUri: https://w3id.org/okn/o/sd#
 name: modelcatalog
 output_dir: outputs
-openapi_base: modelcatalog_info.yaml
 
-endpoint:
-  url: https://endpoint.mint.isi.edu/modelCatalog-1.2.0
-  prefix: https://w3id.org/okn/i/mint/
-  graph_base: http://ontosoft.isi.edu:3030/modelCatalog-1.2.0/data/
+openapi:
+  openapi: 3.0.1
+  info:
+    description: This is the API of the  Software Description Ontology
+      at [https://mintproject.github.io/Mint-ModelCatalog-Ontology/release/1.3.0/index-en.html](https://w3id.org/okn/o/sdm)
+    title: Model Catalog
+    version: v1.3.0
+  externalDocs:
+    description: Model Catalog
+    url: https://w3id.org/okn/o/sdm
+  servers:
+    - url: https://api.models.mint.isi.edu/v1.3.0
+    - url: https://dev.api.models.mint.isi.edu/v1.3.0
+    - url: http://localhost:8080/v1.3.0
 
 firebase:
   key:

config.yaml.sample

@@ -9,3 +9,18 @@ endpoint:
 url: https://endpoint.mint.isi.edu/modelCatalog-1.2.0
 prefix: https://w3id.org/okn/i/mint/
 graph_base: http://ontosoft.isi.edu:3030/modelCatalog-1.2.0/data/
+
+openapi:
+  openapi: 3.0.1
+  info:
+    description: This is the API of the  Software Description Ontology
+      at [https://mintproject.github.io/Mint-ModelCatalog-Ontology/release/1.3.0/index-en.html](https://w3id.org/okn/o/sdm)
+    title: Model Catalog
+    version: v1.3.0
+  externalDocs:
+    description: Model Catalog
+    url: https://w3id.org/okn/o/sdm
+  servers:
+    - url: https://api.models.mint.isi.edu/v1.3.0
+    - url: https://dev.api.models.mint.isi.edu/v1.3.0
+    - url: http://localhost:8080/v1.3.0

docs/configuration_file.md

@@ -16,7 +16,21 @@ ontologies:
     prefixUri: https://w3id.org/okn/o/sd#
 name: modelcatalog
 output_dir: outputs
-openapi_base: modelcatalog_info.yaml
+
+openapi:
+  openapi: 3.0.1
+  info:
+    description: This is the API of the  Software Description Ontology
+      at [https://mintproject.github.io/Mint-ModelCatalog-Ontology/release/1.3.0/index-en.html](https://w3id.org/okn/o/sdm)
+    title: Model Catalog
+    version: v1.3.0
+  externalDocs:
+    description: Model Catalog
+    url: https://w3id.org/okn/o/sdm
+  servers:
+    - url: https://api.models.mint.isi.edu/v1.3.0
+    - url: https://dev.api.models.mint.isi.edu/v1.3.0
+    - url: http://localhost:8080/v1.3.0
 
 endpoint:
   url: https://endpoint.mint.isi.edu/modelCatalog-1.2.0
@@ -62,21 +76,34 @@ output_dir: outputs
 ```
 
 
-### openapi_base
+### openapi
 
 The path of the [OpenAPI Base file](https://swagger.io/docs/specification/basic-structure/)
 
 | Field | Value |
 |---|---|
 | **Required:** | ``true`` |
-| **Type:** | ``path`` |
+| **Type:** | ``OpenAPI`` |
 
 
 Example:
 
 ```yaml
-openapi_base: modelcatalog_info.yaml
-```
+openapi:
+  openapi: 3.0.1
+  info:
+    description: This is the API of the  Software Description Ontology
+      at [https://mintproject.github.io/Mint-ModelCatalog-Ontology/release/1.3.0/index-en.html](https://w3id.org/okn/o/sdm)
+    title: Model Catalog
+    version: v1.3.0
+  externalDocs:
+    description: Model Catalog
+    url: https://w3id.org/okn/o/sdm
+  servers:
+    - url: https://api.models.mint.isi.edu/v1.3.0
+    - url: https://dev.api.models.mint.isi.edu/v1.3.0
+    - url: http://localhost:8080/v1.3.0
+  ```
 
 ### endpoint
 

src/main/java/edu/isi/oba/MapperDataProperty.java

@@ -85,9 +85,9 @@ public MapperDataProperty(String name, List<String> type, Boolean array, Boolean
 
   public Schema getSchemaByDataProperty(){
     //TODO: Assumption: only one type
-    if (this.name.equalsIgnoreCase("hasMaximumAcceptedValue")){
-      System.out.println("a");
-    }
+    //if (this.name.equalsIgnoreCase("hasMaximumAcceptedValue")){
+    //  System.out.println("a");
+    ////}
 
     if (this.type.size() == 0) {
       return (array) ? arraySchema(new StringSchema(), nullable) : new StringSchema().nullable(nullable);

src/main/java/edu/isi/oba/Oba.java

@@ -35,7 +35,7 @@ public static void main(String[] args) throws Exception {
     LinkedHashMap<String, PathItem> custom_paths = config_data.getCustom_paths();
 
     //get base of openapi
-    OpenAPI openapi_base = new OpenAPIV3Parser().read(config_data.getOpenapi_base());
+    OpenAPI openapi_base = config_data.getOpenapi();
     //obtain the output directory to write the openapi specification
     //write the openapi specification
     generate_openapi_spec(openapi_base, mappers, destination_dir, custom_paths);

src/main/java/edu/isi/oba/config/YamlConfig.java

@@ -1,8 +1,7 @@
 package edu.isi.oba.config;
 
-
+import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.Paths;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -13,9 +12,18 @@ public class YamlConfig {
   String DEFAULT_OUTPUT_DIRECTORY = "outputs";
   String DEFAULT_PROJECT_NAME = "default_project";
 
+  public OpenAPI getOpenapi() {
+    return openapi;
+  }
+
+  public void setOpenapi(OpenAPI openapi) {
+    this.openapi = openapi;
+  }
+
+  public OpenAPI openapi;
+
   public String output_dir = DEFAULT_OUTPUT_DIRECTORY;
   public String name = DEFAULT_PROJECT_NAME;
-  public String openapi_base;
   public List<String> paths;
   public Map<String, OntologyConfig> ontologies;
   public EndpointConfig endpoint;
@@ -40,14 +48,6 @@ public void setName(String name) {
     this.name = name;
   }
 
-  public String getOpenapi_base() {
-    return openapi_base;
-  }
-
-  public void setOpenapi_base(String openapi_base) {
-    this.openapi_base = openapi_base;
-  }
-
   public List<String> getPaths() {
     return paths;
   }