Skip to content

Commit

Permalink
JENKINS-28428: Coverage 4.0 renames status.dat to status.json
Browse files Browse the repository at this point in the history
  • Loading branch information
@omansion
omansion committed Aug 26, 2015
1 parent 3c55a47 commit c62f502
Show file tree
Hide file tree
Showing 3 changed files with 294 additions and 318 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -3,3 +3,5 @@ target/
.classpath
.settings/
.project
*.pyc
.DS_Store
295 changes: 140 additions & 155 deletions src/main/java/jenkins/plugins/shiningpanda/actions/coverage/CoverageAction.java
View file
Expand Up @@ -21,9 +21,6 @@
*/
package jenkins.plugins.shiningpanda.actions.coverage;

import hudson.Util;
import hudson.model.Action;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
Expand All @@ -33,51 +30,49 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;

import jenkins.plugins.shiningpanda.Messages;
import jenkins.plugins.shiningpanda.publishers.CoveragePublisher;

import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.FileSet;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;

public abstract class CoverageAction implements Action
{
import hudson.Util;
import hudson.model.Action;
import jenkins.plugins.shiningpanda.Messages;
import jenkins.plugins.shiningpanda.publishers.CoveragePublisher;

public abstract class CoverageAction implements Action {

/*
* (non-Javadoc)
*
* @see hudson.model.Action#getDisplayName()
*/
public String getDisplayName()
{
return Messages.CoverageAction_DisplayName();
public String getDisplayName() {
return Messages.CoverageAction_DisplayName();
}

/*
* (non-Javadoc)
*
* @see hudson.model.Action#getUrlName()
*/
public String getUrlName()
{
return CoveragePublisher.BASENAME;
public String getUrlName() {
return CoveragePublisher.BASENAME;
}

/*
* (non-Javadoc)
*
* @see hudson.model.Action#getIconFileName()
*/
public String getIconFileName()
{
// Check if folder exists
if (show())
// If exists display the link
return "graph.png";
// Else hide the link
return null;
public String getIconFileName() {
// Check if folder exists
if (show())
// If exists display the link
return "graph.png";
// Else hide the link
return null;
}

/**
Expand All @@ -94,16 +89,15 @@ public String getIconFileName()
* The request
* @return The path
*/
protected String getPath(StaplerRequest req)
{
// Get the remaining part of the URL
String path = req.getRestOfPath();
// Check if nothing left to normalize it
if (path.length() == 0)
// Normalize it
path = "/";
// Return the path
return path;
protected String getPath(StaplerRequest req) {
// Get the remaining part of the URL
String path = req.getRestOfPath();
// Check if nothing left to normalize it
if (path.length() == 0)
// Normalize it
path = "/";
// Return the path
return path;
}

/**
Expand All @@ -113,10 +107,9 @@ protected String getPath(StaplerRequest req)
* The base directory
* @return True if contains reports, else false
*/
protected boolean hasReports(File base)
{
// If not null then check that at least one report
return base == null ? false : !getReports(base).isEmpty();
protected boolean hasReports(File base) {
// If not null then check that at least one report
return base == null ? false : !getReports(base).isEmpty();
}

/**
Expand All @@ -126,34 +119,32 @@ protected boolean hasReports(File base)
* The base directory
* @return The list of relative paths to reports
*/
protected List<String> getReports(File base)
{
// Store reports
List<String> dirs = new ArrayList<String>();
// Check is base folder was specified
if (base == null)
// If not return the empty list
return dirs;
// Check if the base folder is itself a report folder
if (isReport(base))
// If yes, return it
dirs.add("");
// Else look for multiple reports
else
{
// Get the file set to search reports
FileSet fs = Util.createFileSet(base, "**/" + CoveragePublisher.JS, null);
// Get a scanner
DirectoryScanner ds = fs.getDirectoryScanner(new Project());
// Go threw the found files
for (String file : ds.getIncludedFiles())
// Check if this is a report
if (isReport(new File(base, file).getParentFile()))
// If this is one, add to the list
dirs.add(new File(file).getParent());
}
// Return the list of relative paths to reports
return dirs;
protected List<String> getReports(File base) {
// Store reports
List<String> dirs = new ArrayList<String>();
// Check is base folder was specified
if (base == null)
// If not return the empty list
return dirs;
// Check if the base folder is itself a report folder
if (isReport(base))
// If yes, return it
dirs.add("");
// Else look for multiple reports
else {
// Get the file set to search reports
FileSet fs = Util.createFileSet(base, "**/" + CoveragePublisher.JS, null);
// Get a scanner
DirectoryScanner ds = fs.getDirectoryScanner(new Project());
// Go threw the found files
for (String file : ds.getIncludedFiles())
// Check if this is a report
if (isReport(new File(base, file).getParentFile()))
// If this is one, add to the list
dirs.add(new File(file).getParent());
}
// Return the list of relative paths to reports
return dirs;
}

/**
Expand All @@ -172,61 +163,56 @@ protected List<String> getReports(File base)
* @throws IOException
* @throws ServletException
*/
protected void serve(StaplerRequest req, StaplerResponse rsp, String title, File base, String path) throws IOException,
ServletException
{
// Check if base folder is specified
if (base == null)
{
// If not send a 404
rsp.sendError(HttpServletResponse.SC_NOT_FOUND);
// No need to go further
return;
}
// Check if an index generation is required
if (!isReport(base) && "/".equals(path))
{
// Get the reports
List<String> dirs = getReports(base);
// Create a list of bean to generate page
List<Entry> entries = new ArrayList<Entry>();
// For each report create an entry
for (String dir : dirs)
// Create the entry
entries.add(new Entry(dir, dir + "/"));
// Set the title in context
req.setAttribute("title", title);
// Set the entries in context
req.setAttribute("entries", entries);
// Render the page
req.getView(CoverageAction.class, "entries.jelly").forward(req, rsp);
// No need to go further
return;
}
// Serve a file, check that path is valid
if (path.replace('\\', '/').indexOf("/../") != -1)
{
// If not end a 500
rsp.sendError(HttpServletResponse.SC_BAD_REQUEST);
// No need to go further
return;
}
// Get the file to serve
File file = new File(base, path.substring(1));
// Check if this is a folder
if (file.isDirectory())
// If this is a folder append an index file
file = new File(file, CoveragePublisher.INDEX);
// Check if this file exists
if (!file.exists())
{
// If not send a 404
rsp.sendError(HttpServletResponse.SC_NOT_FOUND);
// No need to go further
return;
}
// Else serve the file
rsp.serveFile(req, new FileInputStream(file), file.lastModified(), -1, file.length(), file.getName());
protected void serve(StaplerRequest req, StaplerResponse rsp, String title, File base, String path)
throws IOException, ServletException {
// Check if base folder is specified
if (base == null) {
// If not send a 404
rsp.sendError(HttpServletResponse.SC_NOT_FOUND);
// No need to go further
return;
}
// Check if an index generation is required
if (!isReport(base) && "/".equals(path)) {
// Get the reports
List<String> dirs = getReports(base);
// Create a list of bean to generate page
List<Entry> entries = new ArrayList<Entry>();
// For each report create an entry
for (String dir : dirs)
// Create the entry
entries.add(new Entry(dir, dir + "/"));
// Set the title in context
req.setAttribute("title", title);
// Set the entries in context
req.setAttribute("entries", entries);
// Render the page
req.getView(CoverageAction.class, "entries.jelly").forward(req, rsp);
// No need to go further
return;
}
// Serve a file, check that path is valid
if (path.replace('\\', '/').indexOf("/../") != -1) {
// If not end a 500
rsp.sendError(HttpServletResponse.SC_BAD_REQUEST);
// No need to go further
return;
}
// Get the file to serve
File file = new File(base, path.substring(1));
// Check if this is a folder
if (file.isDirectory())
// If this is a folder append an index file
file = new File(file, CoveragePublisher.INDEX);
// Check if this file exists
if (!file.exists()) {
// If not send a 404
rsp.sendError(HttpServletResponse.SC_NOT_FOUND);
// No need to go further
return;
}
// Else serve the file
rsp.serveFile(req, new FileInputStream(file), file.lastModified(), -1, file.length(), file.getName());
}

/**
Expand All @@ -236,49 +222,48 @@ protected void serve(StaplerRequest req, StaplerResponse rsp, String title, File
* The folder to check
* @return True if this is a report, else false
*/
protected boolean isReport(File base)
{
// Check that not null and that the three file exists
return base != null && new File(base, CoveragePublisher.INDEX).exists()
&& new File(base, CoveragePublisher.JS).exists() && new File(base, CoveragePublisher.STATUS).exists();
protected boolean isReport(File base) {
// Check that not null and that the three file exists
return base != null && new File(base, CoveragePublisher.INDEX).exists()
&& new File(base, CoveragePublisher.JS).exists()
&& (new File(base, CoveragePublisher.STATUS_LTE_3).exists()
|| new File(base, CoveragePublisher.STATUS).exists());
}

/**
* Bean used to generate page.
*/
public class Entry
{
/**
* Children.
*/
public List<Entry> children = new ArrayList<Entry>();
public class Entry {
/**
* Children.
*/
public List<Entry> children = new ArrayList<Entry>();

/**
* The title.
*/
public String title;
/**
* The title.
*/
public String title;

/**
* The related link.
*/
public String target;
/**
* The related link.
*/
public String target;

/**
* Constructor using fields.
*
* @param title
* The title
* @param target
* The link
*/
public Entry(String title, String target)
{
// Call super
super();
// Store title
this.title = title;
// Store target
this.target = target;
}
/**
* Constructor using fields.
*
* @param title
* The title
* @param target
* The link
*/
public Entry(String title, String target) {
// Call super
super();
// Store title
this.title = title;
// Store target
this.target = target;
}
}
}

0 comments on commit c62f502

Please sign in to comment.