From c5b2232060e8e14ae1213a8c017c50a5eff8681f Mon Sep 17 00:00:00 2001 From: Yaroslav Lastivka Date: Thu, 16 Mar 2023 10:49:03 +0200 Subject: [PATCH] Change alignments in methods declaration Apply commonly accepted code style to some sal-rest-docgen classes to make further development easier. JIRA: NETCONF-981 Change-Id: Icbd59e052bf1be767bd114425397671f0adf7865 Signed-off-by: Yaroslav Lastivka --- .../doc/impl/BaseYangSwaggerGenerator.java | 46 +++++----- .../rest/doc/impl/DefinitionGenerator.java | 86 ++++++++----------- .../doc/model/builder/OperationBuilder.java | 30 +++---- .../doc/mountpoints/MountPointSwagger.java | 10 +-- 4 files changed, 74 insertions(+), 98 deletions(-) diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java index 4a345b66fa..5881b2d121 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java @@ -95,7 +95,7 @@ public abstract class BaseYangSwaggerGenerator { } public SwaggerObject getAllModulesDoc(final UriInfo uriInfo, final DefinitionNames definitionNames, - final OAversion oaversion) { + final OAversion oaversion) { final EffectiveModelContext schemaContext = schemaService.getGlobalContext(); Preconditions.checkState(schemaContext != null); return getAllModulesDoc(uriInfo, Optional.empty(), schemaContext, Optional.empty(), "", definitionNames, @@ -103,9 +103,8 @@ public abstract class BaseYangSwaggerGenerator { } public SwaggerObject getAllModulesDoc(final UriInfo uriInfo, final Optional> range, - final EffectiveModelContext schemaContext, final Optional deviceName, - final String context, final DefinitionNames definitionNames, - final OAversion oaversion) { + final EffectiveModelContext schemaContext, final Optional deviceName, final String context, + final DefinitionNames definitionNames, final OAversion oaversion) { final String schema = createSchemaFromUriInfo(uriInfo); final String host = createHostFromUriInfo(uriInfo); String name = "Controller"; @@ -124,9 +123,8 @@ public abstract class BaseYangSwaggerGenerator { } public void fillDoc(final SwaggerObject doc, final Optional> range, - final EffectiveModelContext schemaContext, final String context, - final Optional deviceName, final OAversion oaversion, - final DefinitionNames definitionNames) { + final EffectiveModelContext schemaContext, final String context, final Optional deviceName, + final OAversion oaversion, final DefinitionNames definitionNames) { final SortedSet modules = getSortedModules(schemaContext); final Set filteredModules; if (range.isPresent()) { @@ -170,7 +168,7 @@ public abstract class BaseYangSwaggerGenerator { } public CommonApiObject getApiDeclaration(final String module, final String revision, final UriInfo uriInfo, - final OAversion oaversion) { + final OAversion oaversion) { final EffectiveModelContext schemaContext = schemaService.getGlobalContext(); Preconditions.checkState(schemaContext != null); final SwaggerObject doc = getApiDeclaration(module, revision, uriInfo, schemaContext, "", oaversion); @@ -178,8 +176,7 @@ public abstract class BaseYangSwaggerGenerator { } public SwaggerObject getApiDeclaration(final String moduleName, final String revision, final UriInfo uriInfo, - final EffectiveModelContext schemaContext, final String context, - final OAversion oaversion) { + final EffectiveModelContext schemaContext, final String context, final OAversion oaversion) { final Optional rev; try { @@ -196,7 +193,7 @@ public abstract class BaseYangSwaggerGenerator { } public SwaggerObject getApiDeclaration(final Module module, final UriInfo uriInfo, final String context, - final EffectiveModelContext schemaContext, final OAversion oaversion) { + final EffectiveModelContext schemaContext, final OAversion oaversion) { final String schema = createSchemaFromUriInfo(uriInfo); final String host = createHostFromUriInfo(uriInfo); @@ -217,8 +214,8 @@ public abstract class BaseYangSwaggerGenerator { } public SwaggerObject getSwaggerDocSpec(final Module module, final String schema, final String host, - final String basePath, final String context, - final EffectiveModelContext schemaContext, final OAversion oaversion) { + final String basePath, final String context, final EffectiveModelContext schemaContext, + final OAversion oaversion) { final SwaggerObject doc = createSwaggerObject(schema, host, basePath, module.getName()); final DefinitionNames definitionNames = new DefinitionNames(); return getSwaggerDocSpec(module, context, Optional.empty(), schemaContext, oaversion, definitionNames, doc, @@ -226,9 +223,8 @@ public abstract class BaseYangSwaggerGenerator { } public SwaggerObject getSwaggerDocSpec(final Module module, final String context, final Optional deviceName, - final EffectiveModelContext schemaContext, final OAversion oaversion, - final DefinitionNames definitionNames, final SwaggerObject doc, - final boolean isForSingleModule) { + final EffectiveModelContext schemaContext, final OAversion oaversion, final DefinitionNames definitionNames, + final SwaggerObject doc, final boolean isForSingleModule) { final ObjectNode definitions; try { @@ -325,7 +321,7 @@ public abstract class BaseYangSwaggerGenerator { } public SwaggerObject createSwaggerObject(final String schema, final String host, final String basePath, - final String title) { + final String title) { final SwaggerObject doc = new SwaggerObject(); doc.setSwagger(SWAGGER_VERSION); final Info info = new Info(); @@ -369,9 +365,9 @@ public abstract class BaseYangSwaggerGenerator { public abstract String getResourcePathPart(String resourceType); private void addPaths(final DataSchemaNode node, final Optional deviceName, final String moduleName, - final ObjectNode paths, final ArrayNode parentPathParams, - final EffectiveModelContext schemaContext, final boolean isConfig, final String parentName, - final DefinitionNames definitionNames, final OAversion oaversion, final String resourcePath) { + final ObjectNode paths, final ArrayNode parentPathParams, final EffectiveModelContext schemaContext, + final boolean isConfig, final String parentName, final DefinitionNames definitionNames, + final OAversion oaversion, final String resourcePath) { LOG.debug("Adding path: [{}]", resourcePath); final ArrayNode pathParams = JsonUtil.copy(parentPathParams); @@ -418,10 +414,8 @@ public abstract class BaseYangSwaggerGenerator { } private static Map operations(final DataSchemaNode node, final String moduleName, - final Optional deviceName, final ArrayNode pathParams, - final boolean isConfig, final String parentName, - final DefinitionNames definitionNames, - final OAversion oaversion) { + final Optional deviceName, final ArrayNode pathParams, final boolean isConfig, + final String parentName, final DefinitionNames definitionNames, final OAversion oaversion) { final Map operations = new HashMap<>(); final String discriminator = definitionNames.getDiscriminator(node); @@ -449,7 +443,7 @@ public abstract class BaseYangSwaggerGenerator { protected abstract ListPathBuilder newListPathBuilder(); private String createPath(final DataSchemaNode schemaNode, final ArrayNode pathParams, - final OAversion oaversion, final String localName) { + final OAversion oaversion, final String localName) { final StringBuilder path = new StringBuilder(); path.append(localName); @@ -489,7 +483,7 @@ public abstract class BaseYangSwaggerGenerator { } private String createUniquePathParamName(final String clearName, final ArrayNode pathParams, - final int discriminator) { + final int discriminator) { final String newName = clearName + discriminator; for (final JsonNode pathParam : pathParams) { if (isNamePicked(newName, pathParam)) { diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGenerator.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGenerator.java index e49c7cf1f2..c6ae4a2697 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGenerator.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/DefinitionGenerator.java @@ -144,9 +144,8 @@ public class DefinitionGenerator { public ObjectNode convertToJsonSchema(final Module module, final EffectiveModelContext schemaContext, - final ObjectNode definitions, final DefinitionNames definitionNames, - final OAversion oaversion, final boolean isForSingleModule) - throws IOException { + final ObjectNode definitions, final DefinitionNames definitionNames, final OAversion oaversion, + final boolean isForSingleModule) throws IOException { topLevelModule = module; processIdentities(module, definitions, definitionNames, schemaContext); @@ -161,8 +160,7 @@ public class DefinitionGenerator { } public ObjectNode convertToJsonSchema(final Module module, final EffectiveModelContext schemaContext, - final DefinitionNames definitionNames, final OAversion oaversion, - final boolean isForSingleModule) + final DefinitionNames definitionNames, final OAversion oaversion, final boolean isForSingleModule) throws IOException { final ObjectNode definitions = JsonNodeFactory.instance.objectNode(); if (isForSingleModule) { @@ -172,7 +170,7 @@ public class DefinitionGenerator { } private void processModule(final Module module, final ObjectNode definitions, final DefinitionNames definitionNames, - final EffectiveModelContext schemaContext, final OAversion oaversion) { + final EffectiveModelContext schemaContext, final OAversion oaversion) { final ObjectNode definition = JsonNodeFactory.instance.objectNode(); final ObjectNode properties = JsonNodeFactory.instance.objectNode(); final ArrayNode required = JsonNodeFactory.instance.arrayNode(); @@ -230,8 +228,8 @@ public class DefinitionGenerator { } private void processContainersAndLists(final Module module, final ObjectNode definitions, - final DefinitionNames definitionNames, final EffectiveModelContext schemaContext, final OAversion oaversion) - throws IOException { + final DefinitionNames definitionNames, final EffectiveModelContext schemaContext, + final OAversion oaversion) throws IOException { final String moduleName = module.getName(); final SchemaInferenceStack stack = SchemaInferenceStack.of(schemaContext); for (final DataSchemaNode childNode : module.getChildNodes()) { @@ -251,9 +249,8 @@ public class DefinitionGenerator { } private void processActionNodeContainer(final DataSchemaNode childNode, final String moduleName, - final ObjectNode definitions, final DefinitionNames definitionNames, - final SchemaInferenceStack stack, final OAversion oaversion) - throws IOException { + final ObjectNode definitions, final DefinitionNames definitionNames, final SchemaInferenceStack stack, + final OAversion oaversion) throws IOException { for (final ActionDefinition actionDef : ((ActionNodeContainer) childNode).getActions()) { stack.enterSchemaTree(actionDef.getQName()); processOperations(actionDef, moduleName, definitions, definitionNames, stack, oaversion); @@ -262,7 +259,7 @@ public class DefinitionGenerator { } private void processRPCs(final Module module, final ObjectNode definitions, final DefinitionNames definitionNames, - final EffectiveModelContext schemaContext, final OAversion oaversion) throws IOException { + final EffectiveModelContext schemaContext, final OAversion oaversion) throws IOException { final String moduleName = module.getName(); final SchemaInferenceStack stack = SchemaInferenceStack.of(schemaContext); for (final RpcDefinition rpcDefinition : module.getRpcs()) { @@ -274,8 +271,7 @@ public class DefinitionGenerator { private void processOperations(final OperationDefinition operationDef, final String parentName, final ObjectNode definitions, final DefinitionNames definitionNames, - final SchemaInferenceStack stack, final OAversion oaversion) - throws IOException { + final SchemaInferenceStack stack, final OAversion oaversion) throws IOException { final String operationName = operationDef.getQName().getLocalName(); processOperationInputOutput(operationDef.getInput(), operationName, parentName, true, definitions, definitionNames, stack, oaversion); @@ -284,9 +280,8 @@ public class DefinitionGenerator { } private void processOperationInputOutput(final ContainerLike container, final String operationName, - final String parentName, final boolean isInput, - final ObjectNode definitions, final DefinitionNames definitionNames, - final SchemaInferenceStack stack, final OAversion oaversion) + final String parentName, final boolean isInput, final ObjectNode definitions, + final DefinitionNames definitionNames, final SchemaInferenceStack stack, final OAversion oaversion) throws IOException { stack.enterSchemaTree(container.getQName()); if (!container.getChildNodes().isEmpty()) { @@ -354,7 +349,7 @@ public class DefinitionGenerator { * @param definitionNames Store for definition names */ private static void processIdentities(final Module module, final ObjectNode definitions, - final DefinitionNames definitionNames, final EffectiveModelContext context) { + final DefinitionNames definitionNames, final EffectiveModelContext context) { final String moduleName = module.getName(); final Collection idNodes = module.getIdentities(); LOG.debug("Processing Identities for module {} . Found {} identity statements", moduleName, idNodes.size()); @@ -369,7 +364,7 @@ public class DefinitionGenerator { } private static void populateEnumWithDerived(final Collection derivedIds, - final ArrayNode enumPayload, final EffectiveModelContext context) { + final ArrayNode enumPayload, final EffectiveModelContext context) { for (final IdentitySchemaNode derivedId : derivedIds) { enumPayload.add(derivedId.getQName().getLocalName()); populateEnumWithDerived(context.getDerivedIdentities(derivedId), enumPayload, context); @@ -377,9 +372,8 @@ public class DefinitionGenerator { } private ObjectNode processDataNodeContainer(final DataNodeContainer dataNode, final String parentName, - final ObjectNode definitions, final DefinitionNames definitionNames, - final boolean isConfig, final SchemaInferenceStack stack, - final OAversion oaversion) throws IOException { + final ObjectNode definitions, final DefinitionNames definitionNames, final boolean isConfig, + final SchemaInferenceStack stack, final OAversion oaversion) throws IOException { if (dataNode instanceof ListSchemaNode || dataNode instanceof ContainerSchemaNode) { final Collection containerChildren = dataNode.getChildNodes(); final SchemaNode schemaNode = (SchemaNode) dataNode; @@ -473,10 +467,9 @@ public class DefinitionGenerator { /** * Processes the nodes. */ - private ObjectNode processChildren( - final ObjectNode parentNode, final Collection nodes, final String parentName, - final ObjectNode definitions, final DefinitionNames definitionNames, final boolean isConfig, - final SchemaInferenceStack stack, final OAversion oaversion) throws IOException { + private ObjectNode processChildren(final ObjectNode parentNode, final Collection nodes, + final String parentName, final ObjectNode definitions, final DefinitionNames definitionNames, + final boolean isConfig, final SchemaInferenceStack stack, final OAversion oaversion) throws IOException { final ObjectNode properties = JsonNodeFactory.instance.objectNode(); final ArrayNode required = JsonNodeFactory.instance.arrayNode(); for (final DataSchemaNode node : nodes) { @@ -490,11 +483,9 @@ public class DefinitionGenerator { return properties; } - private void processChildNode( - final DataSchemaNode node, final String parentName, final ObjectNode definitions, - final DefinitionNames definitionNames, final boolean isConfig, - final SchemaInferenceStack stack, final ObjectNode properties, final OAversion oaversion) - throws IOException { + private void processChildNode(final DataSchemaNode node, final String parentName, final ObjectNode definitions, + final DefinitionNames definitionNames, final boolean isConfig, final SchemaInferenceStack stack, + final ObjectNode properties, final OAversion oaversion) throws IOException { stack.enterSchemaTree(node.getQName()); @@ -549,8 +540,7 @@ public class DefinitionGenerator { } private ObjectNode processLeafListNode(final LeafListSchemaNode listNode, final SchemaInferenceStack stack, - final ObjectNode definitions, final DefinitionNames definitionNames, - final OAversion oaversion) { + final ObjectNode definitions, final DefinitionNames definitionNames, final OAversion oaversion) { final ObjectNode props = JsonNodeFactory.instance.objectNode(); props.put(TYPE_KEY, ARRAY_TYPE); @@ -587,9 +577,8 @@ public class DefinitionGenerator { } private ObjectNode processLeafNode(final LeafSchemaNode leafNode, final String jsonLeafName, - final ObjectNode properties, final ArrayNode required, - final SchemaInferenceStack stack, final ObjectNode definitions, - final DefinitionNames definitionNames, final OAversion oaversion) { + final ObjectNode properties, final ArrayNode required, final SchemaInferenceStack stack, + final ObjectNode definitions, final DefinitionNames definitionNames, final OAversion oaversion) { final ObjectNode property = JsonNodeFactory.instance.objectNode(); final String leafDescription = leafNode.getDescription().orElse(""); @@ -610,7 +599,7 @@ public class DefinitionGenerator { } private static ObjectNode processAnydataNode(final AnydataSchemaNode leafNode, final String name, - final ObjectNode properties, final ArrayNode required) { + final ObjectNode properties, final ArrayNode required) { final ObjectNode property = JsonNodeFactory.instance.objectNode(); final String leafDescription = leafNode.getDescription().orElse(""); @@ -627,7 +616,7 @@ public class DefinitionGenerator { } private static ObjectNode processAnyXMLNode(final AnyxmlSchemaNode leafNode, final String name, - final ObjectNode properties, final ArrayNode required) { + final ObjectNode properties, final ArrayNode required) { final ObjectNode property = JsonNodeFactory.instance.objectNode(); final String leafDescription = leafNode.getDescription().orElse(""); @@ -644,9 +633,8 @@ public class DefinitionGenerator { } private String processTypeDef(final TypeDefinition leafTypeDef, final DataSchemaNode node, - final ObjectNode property, final SchemaInferenceStack stack, - final ObjectNode definitions, final DefinitionNames definitionNames, - final OAversion oaversion) { + final ObjectNode property, final SchemaInferenceStack stack, final ObjectNode definitions, + final DefinitionNames definitionNames, final OAversion oaversion) { final String jsonType; if (leafTypeDef instanceof BinaryTypeDefinition) { jsonType = processBinaryType(property); @@ -717,7 +705,7 @@ public class DefinitionGenerator { } private static String processEnumType(final EnumTypeDefinition enumLeafType, - final ObjectNode property) { + final ObjectNode property) { final List enumPairs = enumLeafType.getValues(); final ArrayNode enumNames = new ArrayNode(JsonNodeFactory.instance); for (final EnumPair enumPair : enumPairs) { @@ -730,8 +718,8 @@ public class DefinitionGenerator { } private String processIdentityRefType(final IdentityrefTypeDefinition leafTypeDef, final ObjectNode property, - final ObjectNode definitions, final DefinitionNames definitionNames, - final OAversion oaversion, final EffectiveModelContext schemaContext) { + final ObjectNode definitions, final DefinitionNames definitionNames, final OAversion oaversion, + final EffectiveModelContext schemaContext) { final String definitionName; if (isImported(leafTypeDef)) { definitionName = addImportedIdentity(leafTypeDef, definitions, definitionNames, schemaContext); @@ -744,8 +732,7 @@ public class DefinitionGenerator { } private static String addImportedIdentity(final IdentityrefTypeDefinition leafTypeDef, - final ObjectNode definitions, final DefinitionNames definitionNames, - final EffectiveModelContext context) { + final ObjectNode definitions, final DefinitionNames definitionNames, final EffectiveModelContext context) { final IdentitySchemaNode idNode = leafTypeDef.getIdentities().iterator().next(); final String identityName = idNode.getQName().getLocalName(); if (!definitionNames.isListedNode(idNode)) { @@ -782,8 +769,7 @@ public class DefinitionGenerator { return !leafTypeDef.getQName().getModule().equals(topLevelModule.getQNameModule()); } - private static String processBitsType(final BitsTypeDefinition bitsType, - final ObjectNode property) { + private static String processBitsType(final BitsTypeDefinition bitsType, final ObjectNode property) { property.put(MIN_ITEMS, 0); property.put(UNIQUE_ITEMS_KEY, true); final ArrayNode enumNames = new ArrayNode(JsonNodeFactory.instance); @@ -797,7 +783,7 @@ public class DefinitionGenerator { } private static String processStringType(final TypeDefinition stringType, final ObjectNode property, - final String nodeName) { + final String nodeName) { StringTypeDefinition type = (StringTypeDefinition) stringType; Optional lengthConstraints = ((StringTypeDefinition) stringType).getLengthConstraint(); while (lengthConstraints.isEmpty() && type.getBaseType() != null) { @@ -874,7 +860,7 @@ public class DefinitionGenerator { } private static String processInstanceIdentifierType(final DataSchemaNode node, final ObjectNode property, - final EffectiveModelContext schemaContext) { + final EffectiveModelContext schemaContext) { // create example instance-identifier to the first container of node's module if exists or leave it empty final var module = schemaContext.findModule(node.getQName().getModule()); if (module.isPresent()) { diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java index 8ba66aa608..861888c7ab 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/model/builder/OperationBuilder.java @@ -78,9 +78,8 @@ public final class OperationBuilder { } public static ObjectNode buildPost(final String parentName, final String nodeName, final String discriminator, - final String moduleName, final Optional deviceName, - final String description, final ArrayNode pathParams, - final OAversion oaversion) { + final String moduleName, final Optional deviceName, final String description, + final ArrayNode pathParams, final OAversion oaversion) { final ObjectNode value = JsonNodeFactory.instance.objectNode(); value.put(DESCRIPTION_KEY, description); value.put(SUMMARY_KEY, buildSummaryValue(HttpMethod.POST, moduleName, deviceName, nodeName)); @@ -104,8 +103,8 @@ public final class OperationBuilder { } public static ObjectNode buildGet(final DataSchemaNode node, final String moduleName, - final Optional deviceName, final ArrayNode pathParams, - final String defName, final boolean isConfig, final OAversion oaversion) { + final Optional deviceName, final ArrayNode pathParams, final String defName, + final boolean isConfig, final OAversion oaversion) { final ObjectNode value = JsonNodeFactory.instance.objectNode(); value.put(DESCRIPTION_KEY, node.getDescription().orElse("")); value.put(SUMMARY_KEY, buildSummaryValue(HttpMethod.GET, moduleName, deviceName, @@ -128,7 +127,7 @@ public final class OperationBuilder { } private static void addQueryParameters(final ArrayNode parameters, final boolean isConfig, - final OAversion oaversion) { + final OAversion oaversion) { final ObjectNode contentParam = JsonNodeFactory.instance.objectNode(); final ArrayNode cases = JsonNodeFactory.instance.arrayNode(); cases.add(NONCONFIG_QUERY_PARAM); @@ -148,9 +147,8 @@ public final class OperationBuilder { } public static ObjectNode buildPut(final String parentName, final String nodeName, final String discriminator, - final String moduleName, final Optional deviceName, - final String description, final ArrayNode pathParams, - final OAversion oaversion) { + final String moduleName, final Optional deviceName, final String description, + final ArrayNode pathParams, final OAversion oaversion) { final ObjectNode value = JsonNodeFactory.instance.objectNode(); value.put(DESCRIPTION_KEY, description); value.put(SUMMARY_KEY, buildSummaryValue(HttpMethod.PUT, moduleName, deviceName, nodeName)); @@ -173,8 +171,7 @@ public final class OperationBuilder { } public static ObjectNode buildDelete(final DataSchemaNode node, final String moduleName, - final Optional deviceName, final ArrayNode pathParams, - final OAversion oaversion) { + final Optional deviceName, final ArrayNode pathParams, final OAversion oaversion) { final ObjectNode value = JsonNodeFactory.instance.objectNode(); value.put(SUMMARY_KEY, buildSummaryValue(HttpMethod.DELETE, moduleName, deviceName, node.getQName().getLocalName())); @@ -192,8 +189,8 @@ public final class OperationBuilder { } public static ObjectNode buildPostOperation(final OperationDefinition operDef, final String moduleName, - final Optional deviceName, final String parentName, - final DefinitionNames definitionNames, final OAversion oaversion) { + final Optional deviceName, final String parentName, final DefinitionNames definitionNames, + final OAversion oaversion) { final ObjectNode postOperation = JsonNodeFactory.instance.objectNode(); final ArrayNode parameters = JsonNodeFactory.instance.arrayNode(); final String operName = operDef.getQName().getLocalName(); @@ -266,8 +263,7 @@ public final class OperationBuilder { } private static void insertRequestBodyParameter(final ArrayNode parameters, final ObjectNode operation, - final String defName, final String xmlDefName, - final String name, final OAversion oaversion) { + final String defName, final String xmlDefName, final String name, final OAversion oaversion) { final ObjectNode payload = JsonNodeFactory.instance.objectNode(); if (oaversion.equals(OAversion.V3_0)) { final ObjectNode content = JsonNodeFactory.instance.objectNode(); @@ -297,7 +293,7 @@ public final class OperationBuilder { } public static ObjectNode buildResponse(final String description, final Optional schema, - final OAversion oaversion) { + final OAversion oaversion) { final ObjectNode response = JsonNodeFactory.instance.objectNode(); if (schema.isPresent()) { @@ -325,7 +321,7 @@ public final class OperationBuilder { } private static String buildSummaryValue(final String httpMethod, final String moduleName, - final Optional deviceName, final String nodeName) { + final Optional deviceName, final String nodeName) { return httpMethod + SUMMARY_SEPARATOR + deviceName.map(s -> s + SUMMARY_SEPARATOR).orElse("") + moduleName + SUMMARY_SEPARATOR + nodeName; } diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java index c51b485f4d..5287d7e675 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java @@ -69,7 +69,7 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable { private ListenerRegistration registration; public MountPointSwagger(final DOMSchemaService globalSchema, final DOMMountPointService mountService, - final BaseYangSwaggerGenerator swaggerGenerator) { + final BaseYangSwaggerGenerator swaggerGenerator) { this.globalSchema = requireNonNull(globalSchema); this.mountService = requireNonNull(mountService); this.swaggerGenerator = requireNonNull(swaggerGenerator); @@ -135,7 +135,7 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable { } public CommonApiObject getMountPointApi(final UriInfo uriInfo, final Long id, final String module, - final String revision, final OAversion oaversion) { + final String revision, final OAversion oaversion) { final YangInstanceIdentifier iid = getInstanceId(id); final EffectiveModelContext context = getSchemaContext(iid); final String urlPrefix = getYangMountUrl(iid); @@ -154,7 +154,7 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable { } public CommonApiObject getMountPointApi(final UriInfo uriInfo, final Long id, final Optional pageNum, - final OAversion oaversion) { + final OAversion oaversion) { final YangInstanceIdentifier iid = getInstanceId(id); final EffectiveModelContext context = getSchemaContext(iid); final String urlPrefix = getYangMountUrl(iid); @@ -203,7 +203,7 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable { } private SwaggerObject generateDataStoreApiDoc(final UriInfo uriInfo, final String context, - final String deviceName) { + final String deviceName) { final SwaggerObject declaration = swaggerGenerator.createSwaggerObject( swaggerGenerator.createSchemaFromUriInfo(uriInfo), swaggerGenerator.createHostFromUriInfo(uriInfo), @@ -225,7 +225,7 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable { } private void createGetPathItem(final String resourceType, final String description, final String context, - final String deviceName, final ObjectNode pathsObject) { + final String deviceName, final ObjectNode pathsObject) { final ObjectNode pathItem = JsonNodeFactory.instance.objectNode(); final ObjectNode operationObject = JsonNodeFactory.instance.objectNode(); pathItem.set("get", operationObject); -- 2.36.6