Skip to content

Commit

Permalink
Refactor RenderLinkDirective
Browse files Browse the repository at this point in the history
  • Loading branch information
@OndraZizka
OndraZizka committed Apr 21, 2016
1 parent 0da4067 commit 7e8c879
Show file tree
Hide file tree
Showing 4 changed files with 165 additions and 162 deletions.
8 changes: 2 additions & 6 deletions config/api/src/main/java/org/jboss/windup/config/query/Query.java
View file
Expand Up @@ -144,23 +144,19 @@ public boolean evaluate(final GraphRewrite event, final EvaluationContext contex
public Boolean execute()
{
Query.this.setInitialFramesSelector(createInitialFramesSelector(Query.this));
Iterable<? extends WindupVertexFrame> resultIterable = framesSelector.getFrames(event, context);

Iterable<? extends WindupVertexFrame> result = resultIterable;
Iterable<? extends WindupVertexFrame> result = framesSelector.getFrames(event, context);
if (resultFilter != null)
{
com.google.common.base.Predicate<WindupVertexFrame> guavaPred= new com.google.common.base.Predicate<WindupVertexFrame>() {

@Override public boolean apply(WindupVertexFrame input)
{
return resultFilter.accept(input);
}
};
result= Iterables.filter(result, guavaPred);
result = Iterables.filter(result, guavaPred);
}

setResults(event, outputVar, result);

return result.iterator().hasNext();
}
});
Expand Down
251 changes: 95 additions & 156 deletions .../main/java/org/jboss/windup/rules/apps/java/reporting/freemarker/RenderLinkDirective.java
View file
Expand Up @@ -31,12 +31,13 @@
import freemarker.template.TemplateDirectiveBody;
import freemarker.template.TemplateException;
import freemarker.template.TemplateModel;
import org.jboss.windup.util.IterableConverter;

/**
* Renders linkable elements as a list of links
*
* Renders linkable elements as a list of links.
*
* @author <a href="mailto:bradsdavis@gmail.com">Brad Davis</a>
*
* @author <a href="mailto:zizka@seznam.cz">Ondrej Zizka</a>
*/
public class RenderLinkDirective implements WindupFreeMarkerTemplateDirective
{
Expand Down Expand Up @@ -103,12 +104,11 @@ else if (model instanceof LinkableModel)

private String resolveCssClass(Map params)
{
SimpleScalar renderStyleModel = (SimpleScalar) params.get("class");
if (renderStyleModel != null)
{
return renderStyleModel.getAsString();
}
return "";
SimpleScalar css = (SimpleScalar) params.get("class");
if (css == null)
return "";
else
return css.getAsString();
}

private LayoutType resolveLayoutType(Map params) throws TemplateException
Expand Down Expand Up @@ -138,21 +138,19 @@ private void processFileLocationModel(Writer writer, String cssClass, FileLocati

SourceReportModel result = sourceReportService.getSourceReportForFileModel(obj.getFile());
if (result == null)
{
writer.write(linkText);
}
renderLink(writer, cssClass, result.getReportFilename() + "#" + anchor, linkText);
else
renderLink(writer, cssClass, result.getReportFilename() + "#" + anchor, linkText);
}

private void processLinkableModel(Writer writer, LayoutType layoutType, String cssClass, LinkableModel obj, String defaultText) throws IOException
{
List<Link> links = new LinkedList<>();
for (LinkModel model : obj.getLinks())
{
Link l = new Link(model.getLink(), model.getDescription());
links.add(l);
}
//List<Link> links = Link.fromLinkModels(obj.getLinks());
Iterable<Link> links = new IterableConverter<LinkModel, Link>(obj.getLinks()){
public Link from(LinkModel m){ return new Link(m.getLink(), m.getDescription()); }
};
renderLinks(writer, layoutType, cssClass, links);

}

private void processFileModel(Writer writer, String cssClass, FileModel fileModel, String defaultText) throws IOException
Expand All @@ -161,176 +159,119 @@ private void processFileModel(Writer writer, String cssClass, FileModel fileMode

SourceReportModel result = sourceReportService.getSourceReportForFileModel(fileModel);
if (result == null)
{
writer.write(linkText);
}
else
{
renderLink(writer, cssClass, result.getReportFilename(), linkText);
}
}

private void processJavaClassModel(Writer writer, LayoutType layoutType, String cssClass, JavaClassModel clz, String defaultText)
throws IOException
{
Iterator<JavaSourceFileModel> results = javaClassService.getJavaSource(clz.getQualifiedName()).iterator();

int i = 0;
if (results.hasNext())
{
while (results.hasNext())
{
if (i == 0)
{
String linkText = StringUtils.isBlank(defaultText) ? clz.getQualifiedName() : defaultText;
JavaSourceFileModel source = results.next();

SourceReportModel result = sourceReportService.getSourceReportForFileModel(source);
if (result == null)
{
writer.write(linkText);
}
else
{
renderLink(writer, cssClass, result.getReportFilename(), linkText);
}

}
else
{
JavaSourceFileModel source = results.next();
SourceReportModel result = sourceReportService.getSourceReportForFileModel(source);

if (result == null)
{
writer.write(" (" + (i + 1) + ")");
}
else
{
renderLink(writer, cssClass, result.getReportFilename(), " (" + (i + 1) + ")");
}

}
i++;
}
if (!results.hasNext()){
writer.write(clz.getQualifiedName());
return;
}
else

String linkText = StringUtils.isBlank(defaultText) ? clz.getQualifiedName() : defaultText;
int i = 2;
while (results.hasNext())
{
writer.write(clz.getQualifiedName());
JavaSourceFileModel source = results.next();
SourceReportModel result = sourceReportService.getSourceReportForFileModel(source);
if (result == null)
writer.write(linkText);
else
renderLink(writer, cssClass, result.getReportFilename(), linkText);
linkText = " (" + i++ + ")";
}
}

private void renderLinks(Writer writer, LayoutType layoutType, String cssClass, Iterable<Link> linkIterable) throws IOException
{
Iterator<Link> links = linkIterable.iterator();
if (layoutType == LayoutType.UL)
{
renderAsUL(writer, links);
}
if (layoutType == LayoutType.LI)
{
renderAsLI(writer, links);
}
else if (layoutType == LayoutType.DL)
{
renderAsDL(writer, links);
}
else if (layoutType == LayoutType.DT)
{
renderAsDT(writer, links);
}
else
{
renderAsHorizontal(writer, links);
if (null == layoutType)
layoutType = LayoutType.HORIZONTAL;
switch (layoutType)
{
case UL:
renderAsLI(writer, links, true);
break;
case LI:
renderAsLI(writer, links, false);
break;
case DL:
renderAsDT(writer, links, true);
break;
case DT:
renderAsDT(writer, links, false);
break;
default:
renderAsHorizontal(writer, links);
break;
}
}

private void renderLink(Writer writer, String cssClass, String href, String linkText) throws IOException
{
if (cssClass == null)
{
cssClass = "";
}

writer.append("<a class='" + cssClass + "' href='" + href + "'>");
writer.append(linkText);
writer.append("</a>");
writer.append("<a");
if (cssClass != null)
writer.append(" class='" + cssClass + "'");
writer.append(" href='").append(href).append("'>").append(linkText).append("</a>");
}

/*
* Wraps with UL tags
/**
* Renders in LI tags, Wraps with UL tags optionally.
*/
private void renderAsUL(Writer writer, Iterator<Link> links) throws IOException
private void renderAsLI(Writer writer, Iterator<Link> links, boolean wrap) throws IOException
{
if (links.hasNext())
{
writer.append("<ul>");
renderAsLI(writer, links);
writer.append("</ul>");
}
}
if (!links.hasNext())
return;

/*
* Renders only LI tags
*/
private void renderAsLI(Writer writer, Iterator<Link> links) throws IOException
{
if (links.hasNext())
if (wrap)
writer.append("<ul>");
while (links.hasNext())
{
while (links.hasNext())
{
Link link = links.next();
writer.append("<li>");
renderLink(writer, link);
writer.append("</li>");
}
Link link = links.next();
writer.append("<li>");
renderLink(writer, link);
writer.append("</li>");
}
if (wrap)
writer.append("</ul>");
}

/*
* Renders the full DL
* Renders as DT elements, optionally wraps in DL
*/
private void renderAsDL(Writer writer, Iterator<Link> links) throws IOException
private void renderAsDT(Writer writer, Iterator<Link> links, boolean wrap) throws IOException
{
if (links.hasNext())
{
writer.append("<dl>");
renderAsDT(writer, links);
writer.append("</dl>");
}
}
if (!links.hasNext())
return;

/*
* Renders as DT elements
*/
private void renderAsDT(Writer writer, Iterator<Link> links) throws IOException
{
if (links.hasNext())
if (wrap)
writer.append("<dl>");
while (links.hasNext())
{
while (links.hasNext())
{
Link link = links.next();
writer.append("<dt>");
writer.append(link.getDescription());
writer.append("</dt>");
writer.append("<dd>");
writer.append("<a href='" + link.getLink() + "'>Link</a>");
writer.append("</dd>");
}
Link link = links.next();
writer.append("<dt>").append(link.getDescription());
writer.append("</dt><dd><a href='" + link.getLink() + "'>Link</a></dd>");
}
if (wrap)
writer.append("</dl>");
}

private void renderAsHorizontal(Writer writer, Iterator<Link> links) throws IOException
{
if (links.hasNext())
return;

renderLink(writer, links.next());
while (links.hasNext())
{
Link link = links.next();
renderLink(writer, link);

if (links.hasNext())
{
writer.append(" | ");
}
writer.append(" | ");
renderLink(writer, links.next());
}
}

Expand Down Expand Up @@ -358,14 +299,8 @@ else if (fileModel instanceof ReportResourceFileModel)
else if (fileModel instanceof JavaSourceFileModel)
{
JavaSourceFileModel javaSourceModel = (JavaSourceFileModel) fileModel;
String filename = fileModel.getFileName();
String filename = StringUtils.removeEndIgnoreCase(fileModel.getFileName(), ".java");
String packageName = javaSourceModel.getPackageName();

if (filename.endsWith(".java"))
{
filename = filename.substring(0, filename.length() - 5);
}

return packageName == null || packageName.isEmpty() ? filename : packageName + "." + filename;
}
else
Expand Down Expand Up @@ -393,11 +328,6 @@ private static enum LayoutType
HORIZONTAL, UL, DL, LI, DT
}

public enum RenderStyleType
{
DEFAULT, LABEL
}

private static class Link
{
private final String link;
Expand All @@ -409,6 +339,15 @@ private static class Link
this.description = description;
}

private static List<Link> fromLinkModels(Iterable<LinkModel> links)
{
List<Link> links2 = new LinkedList<>();
for (LinkModel model : links)
links2.add(new Link(model.getLink(), model.getDescription()));
return links2;
}


public String getLink()
{
return link;
Expand Down
10 changes: 10 additions & 0 deletions utils/src/main/java/org/jboss/windup/util/Converter.java
View file
@@ -0,0 +1,10 @@
package org.jboss.windup.util;

/**
* @author <a href="mailto:zizka@seznam.cz">Ondrej Zizka</a>
*/
interface Converter<TFromC, TToC>
{
TToC from(TFromC m);

}

0 comments on commit 7e8c879

Please sign in to comment.