Skip to content

Add logging to parser #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2018
Merged

Add logging to parser #660

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/OpenAPIV3Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import io.swagger.v3.parser.util.ResolverFully;
import org.apache.commons.io.FileUtils;
import javax.net.ssl.SSLHandshakeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.net.URI;
import java.nio.file.Files;
Expand All @@ -27,6 +29,7 @@

public class OpenAPIV3Parser implements SwaggerParserExtension {
private static ObjectMapper JSON_MAPPER, YAML_MAPPER;
private static final Logger LOGGER = LoggerFactory.getLogger(OpenAPIV3Parser.class);

static {
JSON_MAPPER = ObjectMapperFactory.createJson();
Expand Down Expand Up @@ -64,6 +67,7 @@ public SwaggerParseResult readLocation(String url, List<AuthorizationValue> auth
}

catch (Exception e) {
LOGGER.warn("Exception while reading:", e);
result.setMessages(Arrays.asList(e.getMessage()));
}
return result;
Expand All @@ -82,8 +86,13 @@ public OpenAPI read(String location, List<AuthorizationValue> auths, ParseOption
OpenAPI output;

List<SwaggerParserExtension> parserExtensions = getExtensions();
SwaggerParseResult parsed;
for (SwaggerParserExtension extension : parserExtensions) {
output = extension.readLocation(location, auths,resolve).getOpenAPI();
parsed = extension.readLocation(location, auths, resolve);
for (String message : parsed.getMessages()) {
LOGGER.info("{}: {}", extension, message);
}
output = parsed.getOpenAPI();
if (output != null) {
return output;
}
Expand Down Expand Up @@ -127,10 +136,10 @@ public SwaggerParseResult readWithInfo(String location, List<AuthorizationValue>
data = ClasspathHelper.loadFileFromClasspath(location);
}
}

LOGGER.debug("Loaded raw data: {}", data);
ObjectMapper mapper = getRightMapper(data);
JsonNode rootNode = mapper.readTree(data);

LOGGER.debug("Parsed rootNode: {}", rootNode);
return readWithInfo(rootNode);
}
catch (SSLHandshakeException e) {
Expand All @@ -141,6 +150,7 @@ public SwaggerParseResult readWithInfo(String location, List<AuthorizationValue>
return output;
}
catch (Exception e) {
LOGGER.warn("Exception while reading:", e);
SwaggerParseResult output = new SwaggerParseResult();
output.setMessages(Arrays.asList("unable to read location `" + location + "`"));
return output;
Expand Down