functionalities added

Author: Enrique Gomez

openapi-front-end/src/main/java/org/apiaddicts/apitools/dosonarapi/api/v31/OpenApi31Grammar.java

@@ -91,6 +91,7 @@ public static YamlGrammarBuilder create() {
       b.mandatoryProperty("info", INFO),
       b.property("servers", b.array(SERVER)),
       b.mandatoryProperty("paths", PATHS),
+      b.property("webhooks", WEBHOOKS),
       b.property("components", COMPONENTS),
       b.property("security", b.array(SECURITY_REQUIREMENT)),
       b.property("tags", b.array(TAG)),
@@ -107,6 +108,7 @@ public static YamlGrammarBuilder create() {
     buildInfo(b);
     buildServer(b);
     buildPaths(b);
+    buildWebhooks(b);
     buildComponents(b);
     buildSecurityDefinitions(b);
     buildTags(b);
@@ -311,7 +313,6 @@ private static void buildComponents(YamlGrammarBuilder b) {
     buildParameters(b);
     buildResponses(b);
     buildSchema(b);
-    buildWebhooks(b);
     buildCallbacks(b);
   }
 
@@ -343,15 +344,18 @@ private static void buildSchema(YamlGrammarBuilder b) {
       b.property("$schema", b.string()),
       b.property("additionalProperties", b.firstOf(b.bool(), REF, SCHEMA)),
       b.property("description", DESCRIPTION),
+      b.property("unevaluatedProperties", b.bool()),
       b.property("format", b.string()),
       b.property("default", b.anything()),
       b.property("nullable", b.bool()),
       b.property("discriminator", DISCRIMINATOR),
+      b.property("const", b.anything()),
       b.property("readOnly", b.bool()),
       b.property("writeOnly", b.bool()),
       b.property("xml", XML),
       b.property("externalDocs", EXTERNAL_DOC),
       b.property("examples", b.array(b.anything())),
+      b.property("example", b.anything()),
       b.property("deprecated", b.bool()),
       b.patternProperty(EXTENSION_PATTERN, b.anything())));
     b.rule(SCHEMA_PROPERTIES).is(b.object(b.patternProperty(".*", b.firstOf(REF, SCHEMA))));
@@ -370,7 +374,7 @@ private static void buildSchema(YamlGrammarBuilder b) {
 
   private static void buildWebhooks(YamlGrammarBuilder b) {
     b.rule(WEBHOOKS).is(b.object(
-      b.property("webhooks", WEBHOOK),  // Usar una propiedad simple en lugar de patternProperty
+      b.patternProperty("^.*", WEBHOOK),  
       b.patternProperty(EXTENSION_PATTERN, b.anything())));
     b.rule(WEBHOOK).is(b.object(
       b.property("$ref", b.string()),
@@ -477,6 +481,7 @@ private static void buildInfo(YamlGrammarBuilder b) {
     b.rule(LICENSE).is(b.object(
       b.mandatoryProperty("name", b.string()),
       b.property("url", b.string()),
+      b.property("identifier", b.string()),
       b.patternProperty(EXTENSION_PATTERN, b.anything())));
   }
 }

openapi-front-end/src/main/java/org/apiaddicts/apitools/dosonarapi/openapi/parser/OpenApiParser.java

@@ -21,6 +21,7 @@
 
 import org.apiaddicts.apitools.dosonarapi.api.v2.OpenApi2Grammar;
 import org.apiaddicts.apitools.dosonarapi.api.v3.OpenApi3Grammar;
+import org.apiaddicts.apitools.dosonarapi.api.v31.OpenApi31Grammar;
 import org.apiaddicts.apitools.dosonarapi.openapi.OpenApiConfiguration;
 import org.apiaddicts.apitools.dosonarapi.sslr.yaml.grammar.YamlParser;
 
@@ -37,6 +38,10 @@ public static YamlParser createV3(OpenApiConfiguration configuration) {
     return YamlParser.builder().withCharset(configuration.getCharset()).withGrammar(OpenApi3Grammar.create()).withStrictValidation(configuration.isStrict()).build();
   }
 
+  public static YamlParser createV31(OpenApiConfiguration configuration) {
+    return YamlParser.builder().withCharset(configuration.getCharset()).withGrammar(OpenApi31Grammar.create()).withStrictValidation(configuration.isStrict()).build();
+  }
+
   public static YamlParser createGeneric(OpenApiConfiguration configuration) {
     return YamlParser.builder().withCharset(configuration.getCharset()).withStrictValidation(configuration.isStrict()).build();
   }

openapi-front-end/src/test/java/org/apiaddicts/apitools/dosonarapi/api/v31/IdentifierTest.java

@@ -0,0 +1,5 @@
+package org.apiaddicts.apitools.dosonarapi.api.v31;
+
+public class IdentifierTest {
+    
+}

openapi-front-end/src/test/java/org/apiaddicts/apitools/dosonarapi/api/v3/LicenseTest.java renamed to openapi-front-end/src/test/java/org/apiaddicts/apitools/dosonarapi/api/v31/LicenseTest.java

@@ -17,19 +17,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.apiaddicts.apitools.dosonarapi.api.v3;
+package org.apiaddicts.apitools.dosonarapi.api.v31;
 
 import org.apiaddicts.apitools.dosonarapi.openapi.BaseNodeTest;
 import org.junit.Test;
 import org.apiaddicts.apitools.dosonarapi.sslr.yaml.grammar.JsonNode;
 
-public class LicenseTest extends BaseNodeTest<OpenApi3Grammar> {
-  @Test
-  public void can_parse_full_definition() {
-    JsonNode node = parseResource(OpenApi3Grammar.LICENSE, "/models/shared/license.yaml");
+public class LicenseTest extends BaseNodeTest<OpenApi31Grammar>{
 
-    assertEquals("Apache 2.0", node, "/name");
-    assertEquals("https://www.apache.org/licenses/LICENSE-2.0.html", node, "/url");
-  }
+    @Test
+    public void license_identifier() {
+        JsonNode node = parseResource(OpenApi31Grammar.COMPONENTS, "/models/v31/webhook.yaml");
 
+        assertPropertyKeys(node).containsOnly("webhooks");
+    }
+    
 }

openapi-front-end/src/test/java/org/apiaddicts/apitools/dosonarapi/api/v31/WebhooksTest.java

@@ -30,4 +30,11 @@ public void component_webhook() {
 
     assertPropertyKeys(node).containsOnly("webhooks");
   }
+
+  @Test
+  public void webhook_test() {
+    JsonNode node = parseResource(OpenApi31Grammar.WEBHOOKS, "/models/v31/webhookfirstlevel.yaml");
+
+    assertPropertyKeys(node).containsOnly("newBooking");
+  }
 }

openapi-front-end/src/test/resources/models/v31/webhookfirstlevel.yaml

@@ -0,0 +1,30 @@
+newBooking:
+  post:
+    operationId: new-booking
+    summary: New Booking
+    description: |
+      Subscribe to new bookings being created, to update integrations for your users.  Related data is available via the links provided in the request.
+    tags:
+      - Bookings
+    requestBody:
+      content:
+        application/json:
+          schema:
+            allOf:
+              - $ref: "#/components/schemas/Booking"
+              - properties:
+                  links:
+                    allOf:
+                      - $ref: "#/components/schemas/Links-Self"
+                      - $ref: "#/components/schemas/Links-Pagination"
+          example:
+            id: efdbb9d1-02c2-4bc3-afb7-6788d8782b1e
+            trip_id: efdbb9d1-02c2-4bc3-afb7-6788d8782b1e
+            passenger_name: John Doe
+            has_bicycle: true
+            has_dog: true
+            links:
+              self: https://api.example.com/bookings/1725ff48-ab45-4bb5-9d02-88745177dedb
+    responses:
+      "200":
+        description: Return a 200 status to indicate that the data was received successfully.

sonar-openapi-plugin/src/main/java/org/apiaddicts/apitools/dosonarapi/plugin/OpenApiAnalyzer.java

@@ -119,10 +119,20 @@ private void scanFile(InputFile inputFile) {
       if (!content.contains("swagger") && !content.contains("openapi")) return;
       JsonNode rootNode = OpenApiParser.createGeneric(configuration).parse(content);
       boolean isV2 = !rootNode.at("/swagger").isMissing();
-      boolean isV3 = !rootNode.at("/openapi").isMissing();
+      JsonNode openapiNode = rootNode.at("/openapi");
+      boolean isV3 = !openapiNode.isMissing() && (
+          openapiNode.getTokenValue().equals("3.0.0") ||
+          openapiNode.getTokenValue().equals("3.0.1") ||
+          openapiNode.getTokenValue().equals("3.0.2") ||
+          openapiNode.getTokenValue().equals("3.0.3")
+      );
+      
+      // Verificar si el nodo "/openapi" está presente y su valor es 3.1.0 para isV31
+      boolean isV31 = !openapiNode.isMissing() && openapiNode.getTokenValue().equals("3.1.0");
       YamlParser targetParser = null;
       if (isV2) targetParser = OpenApiParser.createV2(configuration);
       if (isV3) targetParser = OpenApiParser.createV3(configuration);
+      if (isV31) targetParser = OpenApiParser.createV31(configuration);
       if (targetParser == null) return;
 
       visitorContext = new OpenApiVisitorContext(targetParser.parse(content), targetParser.getIssues(), openApiFile);

sonar-openapi-plugin/src/test/java/org/apiaddicts/apitools/dosonarapi/plugin/OpenApiScannerSensorTest.java

@@ -177,6 +177,18 @@ public void parse_yaml_tabs_ok() {
     assertThat(context.allIssues()).hasSize(0);
     assertThat(context.allAnalysisErrors()).hasSize(0);
   }
+   
+  @Test
+  public void parse_yaml_tabs_ok_31() {
+    inputFile("file2.yaml");
+    activeRules = (new ActiveRulesBuilder())
+            .create(RuleKey.of(CheckList.REPOSITORY_KEY, ParsingErrorCheck.CHECK_KEY))
+            .activate()
+            .build();
+    sensor().execute(context);
+    assertThat(context.allIssues()).hasSize(0);
+    assertThat(context.allAnalysisErrors()).hasSize(0);
+  }
 
   //@Test
   public void test_folder() {