From afd75699880d08e40aa9f0367601b79b23e2584d Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Fri, 9 Feb 2024 15:17:06 +0100 Subject: [PATCH] OpenAPI: Delete no-op methods Delete no-op methods which are not used or make them abstract in case they are going to be implemented in child classes. These methods are remnants from NETCONF-938 reimplementation. Change-Id: I072717c5ef66329a5b202dc8804f51fdefad2c78 Signed-off-by: Ivan Hrasko --- .../restconf/openapi/model/DeleteEntity.java | 5 ++++ .../restconf/openapi/model/GetEntity.java | 5 ++++ .../openapi/model/OperationEntity.java | 8 ++---- .../restconf/openapi/model/SchemaEntity.java | 28 ------------------- 4 files changed, 12 insertions(+), 34 deletions(-) diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/DeleteEntity.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/DeleteEntity.java index d0fb02342e..a53f6731fc 100644 --- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/DeleteEntity.java +++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/DeleteEntity.java @@ -36,6 +36,11 @@ public final class DeleteEntity extends OperationEntity { return SUMMARY_TEMPLATE.formatted(HttpMethod.DELETE, deviceName(), moduleName(), nodeName()); } + @Override + void generateRequestBody(@NonNull JsonGenerator generator) throws IOException { + // no-op + } + @Override void generateResponses(final @NonNull JsonGenerator generator) throws IOException { generator.writeObjectFieldStart(RESPONSES); diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/GetEntity.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/GetEntity.java index d6b6627534..23baaba8f2 100644 --- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/GetEntity.java +++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/GetEntity.java @@ -40,6 +40,11 @@ public final class GetEntity extends OperationEntity { return SUMMARY_TEMPLATE.formatted(HttpMethod.GET, deviceName(), moduleName(), nodeName()); } + @Override + void generateRequestBody(@NonNull JsonGenerator generator) throws IOException { + // no-op + } + @Override void generateResponses(final @NonNull JsonGenerator generator) throws IOException { final var ref = COMPONENTS_PREFIX + moduleName() + "_" + refPath(); diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/OperationEntity.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/OperationEntity.java index 58a0cb406e..442958f789 100644 --- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/OperationEntity.java +++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/OperationEntity.java @@ -110,13 +110,9 @@ public abstract sealed class OperationEntity extends OpenApiEntity permits Delet @NonNull abstract String summary(); - void generateRequestBody(final @NonNull JsonGenerator generator) throws IOException { - // No-op - } + abstract void generateRequestBody(@NonNull JsonGenerator generator) throws IOException; - void generateResponses(final @NonNull JsonGenerator generator) throws IOException { - // No-op - } + abstract void generateResponses(@NonNull JsonGenerator generator) throws IOException; void generateTags(final @NonNull JsonGenerator generator) throws IOException { generator.writeArrayFieldStart("tags"); diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/SchemaEntity.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/SchemaEntity.java index d651560773..84c1d6f3ec 100644 --- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/SchemaEntity.java +++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/model/SchemaEntity.java @@ -67,14 +67,6 @@ public final class SchemaEntity extends OpenApiEntity { if (description != null) { generator.writeStringField("description", description); } - final var reference = reference(); - if (reference != null) { - generator.writeStringField("$ref", reference); - } - generateEnum(generator); - generateDiscriminator(generator); - generateExamples(generator); - generateExternalDocs(generator); generateProperties(generator); generateXml(generator); generator.writeEndObject(); @@ -94,14 +86,6 @@ public final class SchemaEntity extends OpenApiEntity { .orElse(value instanceof InputSchemaNode || value instanceof OutputSchemaNode ? null : ""); } - private @Nullable String reference() { - return null; - } - - private void generateEnum(final @NonNull JsonGenerator generator) throws IOException { - // No-op - } - private void generateRequired(final @NonNull JsonGenerator generator, final List required) throws IOException { if (!required.isEmpty()) { @@ -113,18 +97,6 @@ public final class SchemaEntity extends OpenApiEntity { } } - private void generateDiscriminator(final @NonNull JsonGenerator generator) throws IOException { - // No-op - } - - private void generateExamples(final @NonNull JsonGenerator generator) throws IOException { - // No-op - } - - private void generateExternalDocs(final @NonNull JsonGenerator generator) throws IOException { - // No-op - } - private void generateProperties(final @NonNull JsonGenerator generator) throws IOException { final var required = new ArrayList(); generator.writeObjectFieldStart("properties"); -- 2.36.6