Skip to content

[WiP] [JENKINS-28728]: Support Pretty JSON outputs #19

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

Open
recena wants to merge 20 commits into
base: master
Choose a base branch
from
Open

[WiP] [JENKINS-28728]: Support Pretty JSON outputs #19

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2f09450
Related to [JENKINS-28728]: Support Pretty JSON outputs
Jun 6, 2015
fee3e43
Removing empty-line changes
Jun 7, 2015
f2a6a57
Included support to different response formats through a optional Que…
Jun 7, 2015
bcb9be3
The QueryParam format should be no required
Jun 7, 2015
6dc9f92
Added this feature ORDER_MAP_ENTRIES_BY_KEYS in jsonRoundTrip to be s…
Jun 7, 2015
ac87498
Removing empty-line changes
Jun 7, 2015
5a5d62c
When a format is not supported, an IllegalStateException is thrown
Jun 7, 2015
16c44c1
More consistency ResponseFormat (enum type) including if a format req…
Jun 8, 2015
603ed20
Some revisions suggested by Robert Sandell
Jun 8, 2015
2dd6705
Inconsistent returned type
Jun 8, 2015
e5b88e4
Merge from original repository
Jun 8, 2015
c5956b4
Ignoring autogenerated files
Jun 8, 2015
3f46457
Javadocs reviewed
Jun 9, 2015
fb5e79f
Javadocs revisions
Jun 9, 2015
181472c
Merge remote-tracking branch 'upstream/master'
Jun 19, 2015
8d7ef1f
Styling API Documentation
Jun 20, 2015
505f594
Included documentation related to the new queryParam: format
Jun 21, 2015
ee94c15
Minor revisions
Jun 21, 2015
a20b024
[JENKINS-28728] I don't want to lose info
recena Oct 19, 2015
123042e
Merged
recena Oct 19, 2015
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
7 changes: 7 additions & 0 deletions ...ain/java/org/jenkinsci/plugins/docker/traceability/core/DockerTraceabilityRootAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@
package org.jenkinsci.plugins.docker.traceability.core;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.github.dockerjava.api.command.InspectContainerResponse;
import com.github.dockerjava.api.command.InspectImageResponse;
import com.github.dockerjava.api.model.Event;
import com.github.dockerjava.api.model.Info;

Copy link
Member

@oleg-nenashev oleg-nenashev Jun 7, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please avoid empty-line changes

import hudson.BulkChange;
import hudson.Extension;
import hudson.XmlFile;
Expand All @@ -44,6 +46,7 @@
import hudson.search.SearchIndexBuilder;
import hudson.search.SearchableModelObject;
import hudson.security.Permission;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -58,11 +61,14 @@
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.servlet.ServletException;

import jenkins.model.Jenkins;
import static jenkins.model.Jenkins.XSTREAM;

import org.acegisecurity.AccessDeniedException;
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.plugins.docker.commons.fingerprint.DockerFingerprints;
Expand Down Expand Up @@ -579,6 +585,7 @@ private static HttpResponse toJSONResponse(final Object item) {
@Override
public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
ObjectMapper mapper = new ObjectMapper();
mapper.enable(SerializationFeature.INDENT_OUTPUT);
rsp.setContentType("application/json;charset=UTF-8");
mapper.writeValue(rsp.getWriter(), item);
}
Expand Down