This is an automated email from the ASF dual-hosted git repository. juanpablo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit a2da4a8caa30649b6f9ff84d7007f025daa15d14 Author: juanpablo <[email protected]> AuthorDate: Sun Jan 12 22:17:08 2020 +0100 format code --- .../apache/wiki/parser/JSPWikiMarkupParser.java | 47 +++++++++------------- .../main/java/org/apache/wiki/util/XmlUtil.java | 38 ++++++++--------- .../java/org/apache/wiki/util/XmlUtilTest.java | 2 +- 3 files changed, 38 insertions(+), 49 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java index fe14f59..7dad359 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java @@ -861,24 +861,19 @@ public class JSPWikiMarkupParser extends MarkupParser { return hd.m_titleAnchor; } - private String makeSectionTitle( String title ) - { + private String makeSectionTitle( String title ) { title = title.trim(); - String outTitle; - - try - { - JSPWikiMarkupParser dtr = getCleanTranslator(); - dtr.setInputReader( new StringReader(title) ); + final String outTitle; - CleanTextRenderer ctt = new CleanTextRenderer(m_context, dtr.parse()); + try { + final JSPWikiMarkupParser dtr = getCleanTranslator(); + dtr.setInputReader( new StringReader( title ) ); + final CleanTextRenderer ctt = new CleanTextRenderer( m_context, dtr.parse() ); outTitle = ctt.getString(); - } - catch( IOException e ) - { - log.fatal("CleanTranslator not working", e); - throw new InternalWikiException("CleanTranslator not working as expected, when cleaning title"+ e.getMessage() , e); + } catch( final IOException e ) { + log.fatal("CleanTranslator not working", e ); + throw new InternalWikiException( "CleanTranslator not working as expected, when cleaning title"+ e.getMessage() , e ); } return outTitle; @@ -892,35 +887,29 @@ public class JSPWikiMarkupParser extends MarkupParser { * @param hd a List to which heading should be added * @return An Element containing the heading */ - public Element makeHeading( int level, String title, Heading hd ) - { - Element el = null; - - String pageName = m_context.getPage().getName(); - - String outTitle = makeSectionTitle( title ); - + public Element makeHeading( final int level, final String title, final Heading hd ) { + final Element el; + final String pageName = m_context.getPage().getName(); + final String outTitle = makeSectionTitle( title ); hd.m_level = level; - switch( level ) - { + switch( level ) { case Heading.HEADING_SMALL: - el = new Element("h4").setAttribute("id",makeHeadingAnchor( pageName, outTitle, hd )); + el = new Element( "h4" ).setAttribute("id",makeHeadingAnchor( pageName, outTitle, hd ) ); break; case Heading.HEADING_MEDIUM: - el = new Element("h3").setAttribute("id",makeHeadingAnchor( pageName, outTitle, hd )); + el = new Element( "h3" ).setAttribute("id",makeHeadingAnchor( pageName, outTitle, hd ) ); break; case Heading.HEADING_LARGE: - el = new Element("h2").setAttribute("id",makeHeadingAnchor( pageName, outTitle, hd )); + el = new Element( "h2" ).setAttribute("id",makeHeadingAnchor( pageName, outTitle, hd ) ); break; default: - throw new InternalWikiException("Illegal heading type "+level); + throw new InternalWikiException( "Illegal heading type " + level ); } - return el; } diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/XmlUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/XmlUtil.java index 3bb76b5..2412b2c 100644 --- a/jspwiki-util/src/main/java/org/apache/wiki/util/XmlUtil.java +++ b/jspwiki-util/src/main/java/org/apache/wiki/util/XmlUtil.java @@ -57,28 +57,28 @@ public final class XmlUtil { * empty list is returned. * * @param xml file to parse; matches all resources from classpath, filters repeated items. - * @param requestedNodes requestd nodes on the xml file + * @param requestedNodes requested nodes on the xml file * @return the requested nodes of the XML file. */ - public static List<Element> parse( String xml, String requestedNodes ) + public static List<Element> parse( final String xml, final String requestedNodes ) { if( StringUtils.isNotEmpty( xml ) && StringUtils.isNotEmpty( requestedNodes ) ) { - Set<Element> readed = new HashSet<Element>(); - SAXBuilder builder = new SAXBuilder(); + final Set<Element> readed = new HashSet<>(); + final SAXBuilder builder = new SAXBuilder(); try { - Enumeration< URL > resources = XmlUtil.class.getClassLoader().getResources( xml ); + final Enumeration< URL > resources = XmlUtil.class.getClassLoader().getResources( xml ); while( resources.hasMoreElements() ) { - URL resource = resources.nextElement(); + final URL resource = resources.nextElement(); log.debug( "reading " + resource.toString() ); - Document doc = builder.build( resource ); - XPathFactory xpfac = XPathFactory.instance(); - XPathExpression<Element> xp = xpfac.compile( requestedNodes, Filters.element() ); + final Document doc = builder.build( resource ); + final XPathFactory xpfac = XPathFactory.instance(); + final XPathExpression<Element> xp = xpfac.compile( requestedNodes, Filters.element() ); readed.addAll( xp.evaluate( doc ) ); // filter out repeated items } - return new ArrayList<Element>( readed ); - } catch ( IOException ioe ) { + return new ArrayList<>( readed ); + } catch( final IOException ioe ) { log.error( "Couldn't load all " + xml + " resources", ioe ); - } catch ( JDOMException jdome ) { + } catch( final JDOMException jdome ) { log.error( "error parsing " + xml + " resources", jdome ); } } @@ -93,17 +93,17 @@ public final class XmlUtil { * @param requestedNodes requestd nodes on the xml stream. * @return the requested nodes of the XML stream. */ - public static List< Element > parse( InputStream xmlStream, String requestedNodes ) { + public static List< Element > parse( final InputStream xmlStream, final String requestedNodes ) { if( xmlStream != null && StringUtils.isNotEmpty( requestedNodes ) ) { - SAXBuilder builder = new SAXBuilder(); + final SAXBuilder builder = new SAXBuilder(); try { - Document doc = builder.build( xmlStream ); - XPathFactory xpfac = XPathFactory.instance(); - XPathExpression< Element > xp = xpfac.compile( requestedNodes,Filters.element() ); + final Document doc = builder.build( xmlStream ); + final XPathFactory xpfac = XPathFactory.instance(); + final XPathExpression< Element > xp = xpfac.compile( requestedNodes,Filters.element() ); return xp.evaluate( doc ); - } catch ( IOException ioe ) { + } catch( final IOException ioe ) { log.error( "Couldn't load all " + xmlStream + " resources", ioe ); - } catch ( JDOMException jdome ) { + } catch( final JDOMException jdome ) { log.error( "error parsing " + xmlStream + " resources", jdome ); } } diff --git a/jspwiki-util/src/test/java/org/apache/wiki/util/XmlUtilTest.java b/jspwiki-util/src/test/java/org/apache/wiki/util/XmlUtilTest.java index 5d19f6e..cefc0e9 100644 --- a/jspwiki-util/src/test/java/org/apache/wiki/util/XmlUtilTest.java +++ b/jspwiki-util/src/test/java/org/apache/wiki/util/XmlUtilTest.java @@ -59,7 +59,7 @@ public class XmlUtilTest { @Test public void testParseFromStream() throws IOException { - try( InputStream is = new FileInputStream( new File ("./src/test/resources/ini/jspwiki_module.xml" ) ) ) { + try( final InputStream is = new FileInputStream( new File ("./src/test/resources/ini/jspwiki_module.xml" ) ) ) { List< Element > elements = XmlUtil.parse( is, "/modules/plugin" ); Assertions.assertEquals( 2, elements.size() );
