This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch maven-xml
in repository https://gitbox.apache.org/repos/asf/maven-studies.git
commit 570004c8c22583d37c138809eded1df7b9a9ab42
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sat Jun 9 12:50:07 2018 +0200
Cleanup code
---
.../org/apache/maven/xml/filters/ModelFilter.java | 6 ++++
.../xml/filters/ReactorDependencyXMLFilter.java | 37 +++++++------------
.../maven/xml/filters/AbstractXMLFilterTests.java | 41 ----------------------
3 files changed, 18 insertions(+), 66 deletions(-)
diff --git a/src/main/java/org/apache/maven/xml/filters/ModelFilter.java
b/src/main/java/org/apache/maven/xml/filters/ModelFilter.java
index ee4422d..75d2d61 100644
--- a/src/main/java/org/apache/maven/xml/filters/ModelFilter.java
+++ b/src/main/java/org/apache/maven/xml/filters/ModelFilter.java
@@ -47,6 +47,12 @@ public class ModelFilter
setParent( builder.build() );
}
+
+ @Override
+ public void startDocument()
+ throws SAXException
+ {
+ }
public ModelFilter addFilter( XMLFilter filter )
{
diff --git
a/src/main/java/org/apache/maven/xml/filters/ReactorDependencyXMLFilter.java
b/src/main/java/org/apache/maven/xml/filters/ReactorDependencyXMLFilter.java
index cf14fd7..97a08b6 100644
--- a/src/main/java/org/apache/maven/xml/filters/ReactorDependencyXMLFilter.java
+++ b/src/main/java/org/apache/maven/xml/filters/ReactorDependencyXMLFilter.java
@@ -36,13 +36,7 @@ public class ReactorDependencyXMLFilter extends XMLFilterImpl
{
// states
- private static final int GROUPID = 1;
-
- private static final int ARTIFACTID = 2;
-
- private static final int OTHER = 0;
-
- private int state;
+ private String state;
private boolean hasVersion;
@@ -61,18 +55,7 @@ public class ReactorDependencyXMLFilter extends XMLFilterImpl
public void startElement( String uri, String localName, String qName,
Attributes atts )
throws SAXException
{
- if ( "groupId".equals( localName ) )
- {
- state = GROUPID;
- }
- else if ( "artifactId".equals( localName ) )
- {
- state = ARTIFACTID;
- }
- else
- {
- state = OTHER;
- }
+ state = localName;
if ( "version".equals( localName ) )
{
@@ -85,13 +68,17 @@ public class ReactorDependencyXMLFilter extends
XMLFilterImpl
public void characters( char[] ch, int start, int length )
throws SAXException
{
- if ( state == GROUPID )
- {
- groupId = new String( ch, start, length );
- }
- else if ( state == ARTIFACTID )
+ final String eventState = state;
+ switch ( eventState )
{
- artifactId = new String( ch, start, length );
+ case "groupId":
+ groupId = new String( ch, start, length );
+ break;
+ case "artifactId":
+ artifactId = new String( ch, start, length );
+ break;
+ default:
+ break;
}
super.characters( ch, start, length );
}
diff --git
a/src/test/java/org/apache/maven/xml/filters/AbstractXMLFilterTests.java
b/src/test/java/org/apache/maven/xml/filters/AbstractXMLFilterTests.java
index d19ec99..91f2eb0 100644
--- a/src/test/java/org/apache/maven/xml/filters/AbstractXMLFilterTests.java
+++ b/src/test/java/org/apache/maven/xml/filters/AbstractXMLFilterTests.java
@@ -30,12 +30,10 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamResult;
-import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
import org.xml.sax.helpers.XMLReaderFactory;
public class AbstractXMLFilterTests
@@ -71,43 +69,4 @@ public class AbstractXMLFilterTests
return writer.toString();
}
-
- protected static final class CharactersXMLFilter
- extends XMLFilterImpl
- {
- @Override
- public void characters( char[] ch, int start, int length )
- throws SAXException
- {
- super.characters( new char[] { '*', '*', '*' }, 0, 3 );
- }
- }
-
- protected static final class ElementXMLFilter
- extends XMLFilterImpl
- {
- public ElementXMLFilter()
- {
- super();
- }
-
- public ElementXMLFilter( XMLReader parent )
- {
- super( parent );
- }
-
- @Override
- public void startElement( String uri, String localName, String qName,
Attributes atts )
- throws SAXException
- {
- super.startElement( uri, "elm", "elm", atts );
- }
-
- @Override
- public void endElement( String uri, String localName, String qName )
- throws SAXException
- {
- super.endElement( uri, "elm", "elm" );
- }
- }
}
\ No newline at end of file
