From 1c08055637dab8cb0692829ac565a88a45c7491b Mon Sep 17 00:00:00 2001 From: Zafar Khaja Date: Sun, 1 Dec 2013 19:09:56 +0400 Subject: [PATCH] Rename UnexpectedElementTypeException --- .../com/github/zafarkhaja/semver/VersionParser.java | 11 ++++------- .../zafarkhaja/semver/expr/ExpressionParser.java | 5 ++--- .../com/github/zafarkhaja/semver/util/Stream.java | 4 ++-- ...Exception.java => UnexpectedElementException.java} | 6 +++--- .../zafarkhaja/semver/expr/ExpressionParserTest.java | 4 ++-- .../com/github/zafarkhaja/semver/util/StreamTest.java | 4 ++-- 6 files changed, 15 insertions(+), 19 deletions(-) rename src/main/java/com/github/zafarkhaja/semver/util/{UnexpectedElementTypeException.java => UnexpectedElementException.java} (91%) diff --git a/src/main/java/com/github/zafarkhaja/semver/VersionParser.java b/src/main/java/com/github/zafarkhaja/semver/VersionParser.java index 5d47e5f..11f85ed 100644 --- a/src/main/java/com/github/zafarkhaja/semver/VersionParser.java +++ b/src/main/java/com/github/zafarkhaja/semver/VersionParser.java @@ -24,10 +24,10 @@ package com.github.zafarkhaja.semver; import com.github.zafarkhaja.semver.util.Stream; +import com.github.zafarkhaja.semver.util.UnexpectedElementException; import java.util.ArrayList; import java.util.List; import static com.github.zafarkhaja.semver.VersionParser.Char.*; -import com.github.zafarkhaja.semver.util.UnexpectedElementTypeException; /** * A parser for the SemVer Version. @@ -140,8 +140,7 @@ class VersionParser implements Parser { * @return a valid version object * @throws GrammarException when there is an error defined in * the SemVer or the formal grammar - * @throws UnexpectedElementTypeException when encounters an unexpected - * character type + * @throws UnexpectedElementException when encounters an unexpected character type */ @Override public Version parse(String input) { @@ -155,8 +154,7 @@ class VersionParser implements Parser { * @return a valid version object * @throws GrammarException when there is an error defined in * the SemVer or the formal grammar - * @throws UnexpectedElementTypeException when encounters an unexpected - * character type + * @throws UnexpectedElementException when encounters an unexpected character type */ static Version parseValidSemVer(String version) { VersionParser parser = new VersionParser(version); @@ -170,8 +168,7 @@ class VersionParser implements Parser { * @return a valid normal version object * @throws GrammarException when there is an error defined in * the SemVer or the formal grammar - * @throws UnexpectedElementTypeException when encounters an unexpected - * character type + * @throws UnexpectedElementException when encounters an unexpected character type */ static NormalVersion parseVersionCore(String versionCore) { VersionParser parser = new VersionParser(versionCore); diff --git a/src/main/java/com/github/zafarkhaja/semver/expr/ExpressionParser.java b/src/main/java/com/github/zafarkhaja/semver/expr/ExpressionParser.java index 9599e9d..040fa52 100644 --- a/src/main/java/com/github/zafarkhaja/semver/expr/ExpressionParser.java +++ b/src/main/java/com/github/zafarkhaja/semver/expr/ExpressionParser.java @@ -28,7 +28,7 @@ import com.github.zafarkhaja.semver.Version; import com.github.zafarkhaja.semver.expr.Lexer.Token; import com.github.zafarkhaja.semver.util.Stream; import com.github.zafarkhaja.semver.util.Stream.ElementType; -import com.github.zafarkhaja.semver.util.UnexpectedElementTypeException; +import com.github.zafarkhaja.semver.util.UnexpectedElementException; import java.util.EnumSet; import java.util.Iterator; import static com.github.zafarkhaja.semver.expr.Lexer.Token.Type.*; @@ -78,8 +78,7 @@ public class ExpressionParser implements Parser { * @param input a string representing the SemVer Expression * @return the AST for the SemVer Expressions * @throws LexerException when encounters an illegal character - * @throws UnexpectedElementTypeException when consumes a token of an - * unexpected type + * @throws UnexpectedElementException when consumes a token of an unexpected type */ @Override public Expression parse(String input) { diff --git a/src/main/java/com/github/zafarkhaja/semver/util/Stream.java b/src/main/java/com/github/zafarkhaja/semver/util/Stream.java index 22142a9..9c11f05 100644 --- a/src/main/java/com/github/zafarkhaja/semver/util/Stream.java +++ b/src/main/java/com/github/zafarkhaja/semver/util/Stream.java @@ -103,7 +103,7 @@ public class Stream implements Iterable { * warnings * @param expected the types which are expected * @return the next element in this stream - * @throws UnexpectedElementTypeException if the next element is of an unexpected type + * @throws UnexpectedElementException if the next element is of an unexpected type */ public > E consume(T... expected) { E lookahead = lookahead(1); @@ -112,7 +112,7 @@ public class Stream implements Iterable { return consume(); } } - throw new UnexpectedElementTypeException(lookahead, expected); + throw new UnexpectedElementException(lookahead, expected); } /** diff --git a/src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementTypeException.java b/src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementException.java similarity index 91% rename from src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementTypeException.java rename to src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementException.java index e6bb827..a85e005 100644 --- a/src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementTypeException.java +++ b/src/main/java/com/github/zafarkhaja/semver/util/UnexpectedElementException.java @@ -33,7 +33,7 @@ import java.util.Arrays; * @see Stream#consume(Stream.ElementType...) * @since 0.7.0 */ -public class UnexpectedElementTypeException extends RuntimeException { +public class UnexpectedElementException extends RuntimeException { /** * The unexpected element in the stream. @@ -46,13 +46,13 @@ public class UnexpectedElementTypeException extends RuntimeException { private final ElementType[] expected; /** - * Constructs a {@code UnexpectedElementTypeException} instance + * Constructs a {@code UnexpectedElementException} instance * with the unexpected element and the expected types. * * @param element the unexpected element in the stream * @param expected an array of the expected element types */ - UnexpectedElementTypeException(Object element, ElementType... expected) { + UnexpectedElementException(Object element, ElementType... expected) { unexpected = element; this.expected = expected; } diff --git a/src/test/java/com/github/zafarkhaja/semver/expr/ExpressionParserTest.java b/src/test/java/com/github/zafarkhaja/semver/expr/ExpressionParserTest.java index e8cdd65..7c0e429 100644 --- a/src/test/java/com/github/zafarkhaja/semver/expr/ExpressionParserTest.java +++ b/src/test/java/com/github/zafarkhaja/semver/expr/ExpressionParserTest.java @@ -24,7 +24,7 @@ package com.github.zafarkhaja.semver.expr; import com.github.zafarkhaja.semver.Version; -import com.github.zafarkhaja.semver.util.UnexpectedElementTypeException; +import com.github.zafarkhaja.semver.util.UnexpectedElementException; import org.junit.Test; import static org.junit.Assert.*; @@ -197,7 +197,7 @@ public class ExpressionParserTest { ExpressionParser parser = new ExpressionParser(new Lexer()); try { parser.parse("((>=1.0.1 & < 2)"); - } catch (UnexpectedElementTypeException e) { + } catch (UnexpectedElementException e) { return; } fail("Should raise error if closing parenthesis is missing"); diff --git a/src/test/java/com/github/zafarkhaja/semver/util/StreamTest.java b/src/test/java/com/github/zafarkhaja/semver/util/StreamTest.java index 2ea8642..8947733 100644 --- a/src/test/java/com/github/zafarkhaja/semver/util/StreamTest.java +++ b/src/test/java/com/github/zafarkhaja/semver/util/StreamTest.java @@ -85,7 +85,7 @@ public class StreamTest { } @Test - public void shouldRaiseErrorWhenUnexpectedElementTypeConsumed() { + public void shouldRaiseErrorWhenUnexpectedElementConsumed() { Stream stream = new Stream( new Character[] {'a', 'b', 'c'} ); @@ -96,7 +96,7 @@ public class StreamTest { return false; } }); - } catch (UnexpectedElementTypeException e) { + } catch (UnexpectedElementException e) { return; } fail("Should raise error when unexpected element type is consumed");