From 0afd5723fdace8dd87375463d1cba3ed8176126f Mon Sep 17 00:00:00 2001 From: Bernardo Date: Sat, 26 Jun 2021 21:32:01 +0200 Subject: [PATCH 01/12] Corrected typo --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index b32c223f..d1b3e8e1 100644 --- a/readme.md +++ b/readme.md @@ -67,7 +67,7 @@ JDK 8 or higher is required. All other dependencies are handled through Maven, a ### Installing -The recommended way to install the project is by setting it up as a dependency. To get the configuration information for this check the [Maven Central Repository][maven-repo]. +The recommended way to install the project is by setting it up as a dependency. To get the configuration information for this check the [Maven Central Repository][maven-repo]. It is always possible installing it by using the usual Maven command: From fe1650af3cfdd2af088bb0aa409fa8e3d77da0e9 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Tue, 21 Sep 2021 12:20:10 +0200 Subject: [PATCH 02/12] Downloads dependencies before the main operation --- .github/workflows/deploy_docs.yml | 2 ++ .github/workflows/deploy_github.yml | 2 ++ .github/workflows/deploy_ossrh.yml | 2 ++ .github/workflows/testing.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index d592737a..ef997d08 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -37,6 +37,8 @@ jobs: DEPLOY_DOCS_DEVELOP_PASSWORD: ${{ secrets.DEPLOY_DOCS_DEVELOP_PASSWORD }} DEPLOY_DOCS_SITE: ${{ secrets.DEPLOY_DOCS_SITE }} DEPLOY_DOCS_DEVELOP_SITE: ${{ secrets.DEPLOY_DOCS_DEVELOP_SITE }} + - name: Get dependencies + run: mvn dependency:resolve - name: Deploy development docs if: steps.extract_branch.outputs.branch == 'develop' run: mvn verify site site:deploy -B -P deployment,deployment-development --settings settings.xml diff --git a/.github/workflows/deploy_github.yml b/.github/workflows/deploy_github.yml index eb1d9bfa..a5b99308 100644 --- a/.github/workflows/deploy_github.yml +++ b/.github/workflows/deploy_github.yml @@ -21,6 +21,8 @@ jobs: java-version: 11 distribution: 'adopt' server-id: github + - name: Get dependencies + run: mvn dependency:resolve - name: Deploy run: mvn deploy -B -P deployment,deployment-release,deployment-github env: diff --git a/.github/workflows/deploy_ossrh.yml b/.github/workflows/deploy_ossrh.yml index 2515bd66..ea6e4bfb 100644 --- a/.github/workflows/deploy_ossrh.yml +++ b/.github/workflows/deploy_ossrh.yml @@ -23,6 +23,8 @@ jobs: server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE + - name: Get dependencies + run: mvn dependency:resolve - name: Deploy run: mvn deploy -B -P deployment,deployment-release,deployment-ossrh env: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 56b99fbd..e7fb8ce8 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,5 +18,7 @@ jobs: with: java-version: ${{ matrix.jdk }} distribution: 'adopt' + - name: Get dependencies + run: mvn dependency:resolve - name: Run all tests run: mvn clean verify From 8ae069105db04c9b59a4394e1f9027d51976caaf Mon Sep 17 00:00:00 2001 From: Bernardo Date: Tue, 21 Sep 2021 13:34:36 +0200 Subject: [PATCH 03/12] Added cache action --- .github/workflows/testing.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e7fb8ce8..20912c3e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,6 +18,10 @@ jobs: with: java-version: ${{ matrix.jdk }} distribution: 'adopt' + - uses: actions/cache@v2.1.6 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Get dependencies run: mvn dependency:resolve - name: Run all tests From 2a615fe7432bf19a9ed66ba2ac6b8810134d28a0 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Tue, 21 Sep 2021 13:46:51 +0200 Subject: [PATCH 04/12] Added dependency cache --- .github/workflows/deploy_docs.yml | 6 ++++-- .github/workflows/deploy_github.yml | 6 ++++-- .github/workflows/deploy_ossrh.yml | 6 ++++-- .github/workflows/testing.yml | 2 -- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index ef997d08..ba04f317 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -37,8 +37,10 @@ jobs: DEPLOY_DOCS_DEVELOP_PASSWORD: ${{ secrets.DEPLOY_DOCS_DEVELOP_PASSWORD }} DEPLOY_DOCS_SITE: ${{ secrets.DEPLOY_DOCS_SITE }} DEPLOY_DOCS_DEVELOP_SITE: ${{ secrets.DEPLOY_DOCS_DEVELOP_SITE }} - - name: Get dependencies - run: mvn dependency:resolve + - uses: actions/cache@v2.1.6 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Deploy development docs if: steps.extract_branch.outputs.branch == 'develop' run: mvn verify site site:deploy -B -P deployment,deployment-development --settings settings.xml diff --git a/.github/workflows/deploy_github.yml b/.github/workflows/deploy_github.yml index a5b99308..79351107 100644 --- a/.github/workflows/deploy_github.yml +++ b/.github/workflows/deploy_github.yml @@ -21,8 +21,10 @@ jobs: java-version: 11 distribution: 'adopt' server-id: github - - name: Get dependencies - run: mvn dependency:resolve + - uses: actions/cache@v2.1.6 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Deploy run: mvn deploy -B -P deployment,deployment-release,deployment-github env: diff --git a/.github/workflows/deploy_ossrh.yml b/.github/workflows/deploy_ossrh.yml index ea6e4bfb..e0662d26 100644 --- a/.github/workflows/deploy_ossrh.yml +++ b/.github/workflows/deploy_ossrh.yml @@ -23,8 +23,10 @@ jobs: server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE - - name: Get dependencies - run: mvn dependency:resolve + - uses: actions/cache@v2.1.6 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Deploy run: mvn deploy -B -P deployment,deployment-release,deployment-ossrh env: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 20912c3e..84ea7746 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -22,7 +22,5 @@ jobs: with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - - name: Get dependencies - run: mvn dependency:resolve - name: Run all tests run: mvn clean verify From ef3b3708341f43c597bcc4a1bf3e1ae41615acaf Mon Sep 17 00:00:00 2001 From: Bernardo Date: Tue, 21 Sep 2021 13:48:45 +0200 Subject: [PATCH 05/12] Named cache step --- .github/workflows/deploy_docs.yml | 3 ++- .github/workflows/deploy_github.yml | 3 ++- .github/workflows/deploy_ossrh.yml | 3 ++- .github/workflows/testing.yml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index ba04f317..d158d3e2 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -37,7 +37,8 @@ jobs: DEPLOY_DOCS_DEVELOP_PASSWORD: ${{ secrets.DEPLOY_DOCS_DEVELOP_PASSWORD }} DEPLOY_DOCS_SITE: ${{ secrets.DEPLOY_DOCS_SITE }} DEPLOY_DOCS_DEVELOP_SITE: ${{ secrets.DEPLOY_DOCS_DEVELOP_SITE }} - - uses: actions/cache@v2.1.6 + - name: Dependency cache + uses: actions/cache@v2.1.6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/deploy_github.yml b/.github/workflows/deploy_github.yml index 79351107..090086aa 100644 --- a/.github/workflows/deploy_github.yml +++ b/.github/workflows/deploy_github.yml @@ -21,7 +21,8 @@ jobs: java-version: 11 distribution: 'adopt' server-id: github - - uses: actions/cache@v2.1.6 + - name: Dependency cache + uses: actions/cache@v2.1.6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/deploy_ossrh.yml b/.github/workflows/deploy_ossrh.yml index e0662d26..5a171f75 100644 --- a/.github/workflows/deploy_ossrh.yml +++ b/.github/workflows/deploy_ossrh.yml @@ -23,7 +23,8 @@ jobs: server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: GPG_PASSPHRASE - - uses: actions/cache@v2.1.6 + - name: Dependency cache + uses: actions/cache@v2.1.6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 84ea7746..bfdf3516 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,7 +18,8 @@ jobs: with: java-version: ${{ matrix.jdk }} distribution: 'adopt' - - uses: actions/cache@v2.1.6 + - name: Dependency cache + uses: actions/cache@v2.1.6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 712db3ae1af493399a6f2f3a8d768c791e5a4e48 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Mon, 20 Dec 2021 21:14:40 +0100 Subject: [PATCH 06/12] Updated dependencies --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 254dff45..00e3c21b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.bernardomg.maven base-pom - 1.4.2 + 1.4.4 @@ -260,8 +260,8 @@ 4.9.2 30.1.1-jre 5.7.2 - 3.11.0 - 2.14.1 + 4.2.0 + 2.17.0 1.7.30 @@ -272,7 +272,7 @@ - 2.2.0 + 2.2.5 http://mvnrepository.com/artifact/com.bernardomg.tabletop/dice From 3aeb0dc3ca89731cc33f746fc46ea062cbb1abc3 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Mon, 20 Dec 2021 21:34:08 +0100 Subject: [PATCH 07/12] Removed Guava, used Lombok --- pom.xml | 14 ++- .../bernardomg/tabletop/dice/DefaultDice.java | 91 ++----------------- .../dice/history/DefaultRollHistory.java | 29 +++--- .../dice/history/DefaultRollResult.java | 41 ++++----- .../interpreter/ConfigurableInterpreter.java | 10 +- .../dice/interpreter/ExpressionWrapper.java | 4 +- .../dice/interpreter/InorderTraverser.java | 6 +- .../dice/interpreter/PostorderTraverser.java | 6 +- .../dice/interpreter/PreorderTraverser.java | 6 +- .../notation/operand/DefaultDiceOperand.java | 57 +----------- .../dice/notation/operand/IntegerOperand.java | 56 +----------- .../operation/AbstractBinaryOperation.java | 75 +++------------ .../dice/parser/DefaultDiceParser.java | 12 +-- .../DefaultDiceExpressionBuilder.java | 17 ++-- .../dice/random/AbstractNumberGenerator.java | 5 +- .../dice/random/DiceToRollResult.java | 5 +- .../dice/visitor/DiceRollAccumulator.java | 12 ++- .../dice/ITParseAndDiceGatherer.java | 26 ++++-- ...eAndDiceRollerAdditionDiceRollResults.java | 11 ++- ...AndDiceRollerAdditionMixedRollResults.java | 14 ++- ...ndDiceRollerAdditionNumberRollResults.java | 14 ++- ...eRollerBinaryOperationDiceRollResults.java | 11 ++- ...ollerBinaryOperationNumberRollResults.java | 14 ++- .../ITParseAndDiceRollerDiceRollResults.java | 9 +- ...ceRollerMultiplicationDiceRollResults.java | 11 ++- ...dDiceRollerParenthesisDiceRollResults.java | 11 ++- ...dDiceRollerSubtractionDiceRollResults.java | 11 ++- ...iceRollerSubtractionNumberRollResults.java | 17 ++-- ...TDefaultDiceParserSignedDiceStructure.java | 6 +- ...DiceRollerAdditionOperationRollResult.java | 29 ++++-- .../TestDiceRollerConstantRollResult.java | 14 ++- .../results/TestDiceRollerDiceRollResult.java | 28 ++++-- .../traverser/TestInorderTraverser.java | 5 +- .../traverser/TestPostorderTraverser.java | 5 +- .../traverser/TestPreorderTraverser.java | 5 +- 35 files changed, 267 insertions(+), 420 deletions(-) diff --git a/pom.xml b/pom.xml index 00e3c21b..57f03e23 100644 --- a/pom.xml +++ b/pom.xml @@ -258,8 +258,8 @@ 4.9.2 - 30.1.1-jre 5.7.2 + 1.18.22 4.2.0 2.17.0 1.7.30 @@ -301,11 +301,15 @@ antlr4 ${antlr.version} + + + - - com.google.guava - guava - ${guava.version} + + org.projectlombok + lombok + ${lombok.version} + provided diff --git a/src/main/java/com/bernardomg/tabletop/dice/DefaultDice.java b/src/main/java/com/bernardomg/tabletop/dice/DefaultDice.java index 43996447..15249097 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/DefaultDice.java +++ b/src/main/java/com/bernardomg/tabletop/dice/DefaultDice.java @@ -16,10 +16,8 @@ package com.bernardomg.tabletop.dice; -import static com.google.common.base.Preconditions.checkNotNull; - -import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; +import lombok.Data; +import lombok.NonNull; /** * Immutable group of dice. @@ -30,6 +28,7 @@ * * @author Bernardo Martínez Garrido */ +@Data public final class DefaultDice implements Dice { /** @@ -37,91 +36,15 @@ public final class DefaultDice implements Dice { *

* This is greater or equal to zero. */ - private final Integer diceQuantity; + @NonNull + private final Integer quantity; /** * Number of sides in each die. *

* This is greater than zero. */ - private final Integer diceSides; - - /** - * Constructs a dice group with the specified quantity and number sides. - *

- * The quantity can't be a negative value, and the number of sides should be - * greater than zero. Otherwise an exception will be thrown. - * - * @param quantity - * the number of dice - * @param sides - * the number sides each die has - */ - public DefaultDice(final Integer quantity, final Integer sides) { - super(); - - diceQuantity = checkNotNull(quantity, - "Received a null pointer as quantity"); - diceSides = checkNotNull(sides, "Received a null pointer as sides"); - } - - @Override - public final boolean equals(final Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (getClass() != obj.getClass()) { - return false; - } - - final DefaultDice other; - - other = (DefaultDice) obj; - - return Objects.equal(diceQuantity, other.diceQuantity) - && Objects.equal(diceSides, other.diceSides); - } - - /** - * Returns the number of dice which compose this group. - *

- * This is a positive value or zero. - * - * @return the number of dice being rolled - */ - @Override - public final Integer getQuantity() { - return diceQuantity; - } - - /** - * Returns the number of sides of the dice in the group. - *

- * All the dice will have this same number of sides. - *

- * This is a positive value greater than zero. - * - * @return the dice's number of sides - */ - @Override - public final Integer getSides() { - return diceSides; - } - - @Override - public final int hashCode() { - return Objects.hashCode(diceQuantity, diceSides); - } - - @Override - public final String toString() { - return MoreObjects.toStringHelper(this).add("quantity", diceQuantity) - .add("sides", diceSides).toString(); - } + @NonNull + private final Integer sides; } diff --git a/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollHistory.java b/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollHistory.java index 518e6325..6662af38 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollHistory.java +++ b/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollHistory.java @@ -16,7 +16,10 @@ package com.bernardomg.tabletop.dice.history; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; + +import lombok.Data; +import lombok.NonNull; /** * Immutable roll history. @@ -28,6 +31,7 @@ * @author Bernardo Martínez Garrido * */ +@Data public final class DefaultRollHistory implements RollHistory { /** @@ -35,16 +39,19 @@ public final class DefaultRollHistory implements RollHistory { *

* Used as the string representation of the history. */ + @NonNull private final String historyText; /** * The results of each expression. */ + @NonNull private final Iterable rollResults; /** * Sum of all the generated values. */ + @NonNull private final Integer totalRoll; /** @@ -59,28 +66,18 @@ public final class DefaultRollHistory implements RollHistory { * @param total * sum of all the values */ - public DefaultRollHistory(final Iterable results, - final String text, final Integer total) { + public DefaultRollHistory(@NonNull final Iterable results, + @NonNull final String text, @NonNull final Integer total) { super(); - rollResults = checkNotNull(results, + rollResults = Objects.requireNonNull(results, "Received a null pointer as roll results"); - historyText = checkNotNull(text, + historyText = Objects.requireNonNull(text, "Received a null pointer as history text"); - totalRoll = checkNotNull(total, + totalRoll = Objects.requireNonNull(total, "Received a null pointer as total roll"); } - @Override - public final Iterable getRollResults() { - return rollResults; - } - - @Override - public final Integer getTotalRoll() { - return totalRoll; - } - @Override public final String toString() { return historyText; diff --git a/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollResult.java b/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollResult.java index 6f9a79a3..436e397d 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollResult.java +++ b/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollResult.java @@ -16,34 +16,40 @@ package com.bernardomg.tabletop.dice.history; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Arrays; +import java.util.Objects; import com.bernardomg.tabletop.dice.DefaultDice; import com.bernardomg.tabletop.dice.Dice; +import lombok.Data; +import lombok.NonNull; + /** * Immutable roll result. Contains all the values generated and the sum of them. * * @author Bernardo Martínez Garrido * */ +@Data public final class DefaultRollResult implements RollResult { /** * All the generated values. */ + @NonNull private final Iterable allRolls; /** * Rolled dice. */ + @NonNull private final Dice dice; /** * Sum of all the generated values. */ + @NonNull private final Integer totalRoll; /** @@ -56,13 +62,15 @@ public final class DefaultRollResult implements RollResult { * @param total * sum of all the values */ - public DefaultRollResult(final Dice d, final Iterable rolls, - final Integer total) { + public DefaultRollResult(@NonNull final Dice d, + @NonNull final Iterable rolls, + @NonNull final Integer total) { super(); - dice = checkNotNull(d, "Received a null pointer as dice"); - allRolls = checkNotNull(rolls, "Received a null pointer as rolls"); - totalRoll = checkNotNull(total, + dice = Objects.requireNonNull(d, "Received a null pointer as dice"); + allRolls = Objects.requireNonNull(rolls, + "Received a null pointer as rolls"); + totalRoll = Objects.requireNonNull(total, "Received a null pointer as total roll"); } @@ -72,29 +80,14 @@ public DefaultRollResult(final Dice d, final Iterable rolls, * @param total * sum of all the values */ - public DefaultRollResult(final Integer total) { + public DefaultRollResult(@NonNull final Integer total) { super(); dice = new DefaultDice(1, total); - totalRoll = checkNotNull(total, + totalRoll = Objects.requireNonNull(total, "Received a null pointer as total roll"); allRolls = Arrays.asList(total); } - @Override - public final Iterable getAllRolls() { - return allRolls; - } - - @Override - public final Dice getDice() { - return dice; - } - - @Override - public final Integer getTotalRoll() { - return totalRoll; - } - } diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/ConfigurableInterpreter.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/ConfigurableInterpreter.java index ca06f828..33d26b58 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/ConfigurableInterpreter.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/ConfigurableInterpreter.java @@ -16,7 +16,7 @@ package com.bernardomg.tabletop.dice.interpreter; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,8 +71,9 @@ public ConfigurableInterpreter( final NotationAccumulator accum) { super(); - traverser = checkNotNull(trav, "Received a null pointer as traverser"); - accumulator = checkNotNull(accum, + traverser = Objects.requireNonNull(trav, + "Received a null pointer as traverser"); + accumulator = Objects.requireNonNull(accum, "Received a null pointer as accumulator"); } @@ -81,7 +82,8 @@ public final V transform(final DiceNotationExpression expression) { final Iterable exps; final V result; - checkNotNull(expression, "Received a null pointer as expression"); + Objects.requireNonNull(expression, + "Received a null pointer as expression"); LOGGER.debug("Root expression {}", expression); diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/ExpressionWrapper.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/ExpressionWrapper.java index ea010898..76c5f5e5 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/ExpressionWrapper.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/ExpressionWrapper.java @@ -16,7 +16,7 @@ package com.bernardomg.tabletop.dice.interpreter; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; @@ -43,7 +43,7 @@ public final class ExpressionWrapper implements DiceNotationExpression { public ExpressionWrapper(final DiceNotationExpression exp) { super(); - wrappedExpression = checkNotNull(exp, + wrappedExpression = Objects.requireNonNull(exp, "Received a null pointer as expression"); } diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/InorderTraverser.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/InorderTraverser.java index 909bf6ee..3b09e2d0 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/InorderTraverser.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/InorderTraverser.java @@ -16,10 +16,9 @@ package com.bernardomg.tabletop.dice.interpreter; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.ArrayList; import java.util.Collection; +import java.util.Objects; import java.util.Stack; import org.slf4j.Logger; @@ -60,7 +59,8 @@ public InorderTraverser() { final Collection exps; DiceNotationExpression current; - checkNotNull(expression, "Received a null pointer as expression"); + Objects.requireNonNull(expression, + "Received a null pointer as expression"); current = expression; diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/PostorderTraverser.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/PostorderTraverser.java index 705a5fa3..fc4cbb5d 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/PostorderTraverser.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/PostorderTraverser.java @@ -16,10 +16,9 @@ package com.bernardomg.tabletop.dice.interpreter; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.ArrayList; import java.util.Collection; +import java.util.Objects; import java.util.Stack; import java.util.stream.Collectors; @@ -61,7 +60,8 @@ public PostorderTraverser() { final Collection exps; DiceNotationExpression current; - checkNotNull(expression, "Received a null pointer as expression"); + Objects.requireNonNull(expression, + "Received a null pointer as expression"); nodes = new Stack<>(); nodes.push(expression); diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/PreorderTraverser.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/PreorderTraverser.java index d500db0c..f9825be0 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/PreorderTraverser.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/PreorderTraverser.java @@ -16,10 +16,9 @@ package com.bernardomg.tabletop.dice.interpreter; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.ArrayList; import java.util.Collection; +import java.util.Objects; import java.util.Stack; import org.slf4j.Logger; @@ -60,7 +59,8 @@ public PreorderTraverser() { final Collection exps; DiceNotationExpression current; - checkNotNull(expression, "Received a null pointer as expression"); + Objects.requireNonNull(expression, + "Received a null pointer as expression"); nodes = new Stack<>(); nodes.push(expression); diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DefaultDiceOperand.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DefaultDiceOperand.java index 5de3b23f..ce4b98c5 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DefaultDiceOperand.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DefaultDiceOperand.java @@ -16,76 +16,29 @@ package com.bernardomg.tabletop.dice.notation.operand; -import static com.google.common.base.Preconditions.checkNotNull; - import com.bernardomg.tabletop.dice.Dice; -import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; + +import lombok.Data; +import lombok.NonNull; /** * Default implementation of the dice operand. * * @author Bernardo Martínez Garrido */ +@Data public final class DefaultDiceOperand implements DiceOperand { /** * Operand dice value. */ + @NonNull private final Dice dice; - /** - * Constructs a dice operand with the specified dice. - * - * @param diceSet - * dice for the operand - */ - public DefaultDiceOperand(final Dice diceSet) { - super(); - - dice = checkNotNull(diceSet, "Received a null pointer as dice"); - } - - @Override - public final boolean equals(final Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (getClass() != obj.getClass()) { - return false; - } - - final DefaultDiceOperand other; - - other = (DefaultDiceOperand) obj; - - return Objects.equal(dice, other.dice); - } - - @Override - public final Dice getDice() { - return dice; - } - @Override public final String getExpression() { return String.format("%dd%d", getDice().getQuantity(), getDice().getSides()); } - @Override - public final int hashCode() { - return Objects.hashCode(dice); - } - - @Override - public final String toString() { - return MoreObjects.toStringHelper(this).add("dice", dice).toString(); - } - } diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/IntegerOperand.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/IntegerOperand.java index a3f56e39..4d610442 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/IntegerOperand.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/IntegerOperand.java @@ -16,74 +16,26 @@ package com.bernardomg.tabletop.dice.notation.operand; -import static com.google.common.base.Preconditions.checkNotNull; - -import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; +import lombok.Data; +import lombok.NonNull; /** * Operand for an integer constant value. * * @author Bernardo Martínez Garrido */ +@Data public final class IntegerOperand implements ConstantOperand { /** * Operand value. */ + @NonNull private final Integer value; - /** - * Constructs an operand with the specified value. - * - * @param constant - * the operand value - */ - public IntegerOperand(final Integer constant) { - super(); - - value = checkNotNull(constant, "Received a null pointer as value"); - } - - @Override - public final boolean equals(final Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (getClass() != obj.getClass()) { - return false; - } - - final IntegerOperand other; - - other = (IntegerOperand) obj; - - return Objects.equal(value, other.value); - } - @Override public final String getExpression() { return getValue().toString(); } - @Override - public final Integer getValue() { - return value; - } - - @Override - public final int hashCode() { - return Objects.hashCode(value); - } - - @Override - public final String toString() { - return MoreObjects.toStringHelper(this).add("value", value).toString(); - } - } diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AbstractBinaryOperation.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AbstractBinaryOperation.java index 15e502f5..e3a21e43 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AbstractBinaryOperation.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AbstractBinaryOperation.java @@ -16,13 +16,12 @@ package com.bernardomg.tabletop.dice.notation.operation; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.function.BiFunction; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; -import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; + +import lombok.Data; +import lombok.NonNull; /** * Abstract class for binary operations, containing all the common fields. @@ -32,21 +31,25 @@ * * @author Bernardo Martínez Garrido */ +@Data public abstract class AbstractBinaryOperation implements BinaryOperation { /** * Left sided operand. */ + @NonNull private final DiceNotationExpression left; /** * Operation to apply. */ + @NonNull private final BiFunction operation; /** * Right sided operand. */ + @NonNull private final DiceNotationExpression right; /** @@ -59,65 +62,15 @@ public abstract class AbstractBinaryOperation implements BinaryOperation { * @param func * operation to apply */ - public AbstractBinaryOperation(final DiceNotationExpression leftOperand, - final DiceNotationExpression rightOperand, - final BiFunction func) { + public AbstractBinaryOperation( + @NonNull final DiceNotationExpression leftOperand, + @NonNull final DiceNotationExpression rightOperand, + @NonNull final BiFunction func) { super(); - left = checkNotNull(leftOperand, - "Received a null pointer as left operand"); - right = checkNotNull(rightOperand, - "Received a null pointer as right operand"); - operation = checkNotNull(func, "Received a null pointer as operation"); - } - - @Override - public final boolean equals(final Object obj) { - if (this == obj) { - return true; - } - - if (obj == null) { - return false; - } - - if (getClass() != obj.getClass()) { - return false; - } - - final AbstractBinaryOperation other; - - other = (AbstractBinaryOperation) obj; - - return Objects.equal(left, other.left) - && Objects.equal(right, other.right) - && Objects.equal(operation, other.operation); - } - - @Override - public final DiceNotationExpression getLeft() { - return left; - } - - @Override - public final BiFunction getOperation() { - return operation; - } - - @Override - public final DiceNotationExpression getRight() { - return right; - } - - @Override - public final int hashCode() { - return Objects.hashCode(left, right, operation); - } - - @Override - public final String toString() { - return MoreObjects.toStringHelper(this).add("left", left) - .add("right", right).add("operation", operation).toString(); + left = leftOperand; + right = rightOperand; + operation = func; } } diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java b/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java index 0344b4f0..d7476a68 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java +++ b/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java @@ -16,7 +16,7 @@ package com.bernardomg.tabletop.dice.parser; -import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Objects; import org.antlr.v4.runtime.ANTLRErrorListener; import org.antlr.v4.runtime.CharStream; @@ -81,7 +81,7 @@ public DefaultDiceParser() { public DefaultDiceParser(final ANTLRErrorListener listener) { super(); - errorListener = checkNotNull(listener, + errorListener = Objects.requireNonNull(listener, "Received a null pointer as listener"); expressionBuilder = new DefaultDiceExpressionBuilder(); } @@ -96,7 +96,7 @@ public DefaultDiceParser(final DiceExpressionBuilder builder) { super(); errorListener = new DefaultErrorListener(); - expressionBuilder = checkNotNull(builder, + expressionBuilder = Objects.requireNonNull(builder, "Received a null pointer as expression builder"); } @@ -112,9 +112,9 @@ public DefaultDiceParser(final DiceExpressionBuilder builder, final ANTLRErrorListener listener) { super(); - errorListener = checkNotNull(listener, + errorListener = Objects.requireNonNull(listener, "Received a null pointer as listener"); - expressionBuilder = checkNotNull(builder, + expressionBuilder = Objects.requireNonNull(builder, "Received a null pointer as expression builder"); } @@ -123,7 +123,7 @@ public final DiceNotationExpression parse(final String expression) { final DiceNotationParser parser; // ANTLR parser final DiceNotationExpression root; // Root expression - checkNotNull(expression, "Received a null pointer as string"); + Objects.requireNonNull(expression, "Received a null pointer as string"); // Creates the ANTLR parser parser = buildDiceNotationParser(expression); diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultDiceExpressionBuilder.java b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultDiceExpressionBuilder.java index 92c2e384..3e2b6199 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultDiceExpressionBuilder.java +++ b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultDiceExpressionBuilder.java @@ -16,12 +16,12 @@ package com.bernardomg.tabletop.dice.parser.listener; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.Collection; import java.util.Iterator; +import java.util.Objects; import java.util.Stack; import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import org.antlr.v4.runtime.tree.TerminalNode; import org.slf4j.Logger; @@ -43,7 +43,6 @@ import com.bernardomg.tabletop.dice.notation.operation.DivisionOperation; import com.bernardomg.tabletop.dice.notation.operation.MultiplicationOperation; import com.bernardomg.tabletop.dice.notation.operation.SubtractionOperation; -import com.google.common.collect.Iterables; /** * Visitor for an ANTLR4 parser tree. It can return the fully parsed @@ -103,7 +102,7 @@ public final void exitAddOp(final AddOpContext ctx) { final DiceNotationExpression expression; final Collection operators; - checkNotNull(ctx, "Received a null pointer as context"); + Objects.requireNonNull(ctx, "Received a null pointer as context"); // Operators are mapped into strings operators = ctx.ADDOPERATOR().stream().map(TerminalNode::getText) @@ -120,7 +119,7 @@ public final void exitAddOp(final AddOpContext ctx) { public final void exitDice(final DiceContext ctx) { final DiceNotationExpression expression; - checkNotNull(ctx, "Received a null pointer as context"); + Objects.requireNonNull(ctx, "Received a null pointer as context"); expression = getDiceOperand(ctx); @@ -134,7 +133,7 @@ public final void exitMultOp(final MultOpContext ctx) { final DiceNotationExpression expression; final Collection operators; - checkNotNull(ctx, "Received a null pointer as context"); + Objects.requireNonNull(ctx, "Received a null pointer as context"); // Operators are mapped into strings operators = ctx.MULTOPERATOR().stream().map(TerminalNode::getText) @@ -151,7 +150,7 @@ public final void exitMultOp(final MultOpContext ctx) { public final void exitNumber(final NumberContext ctx) { final DiceNotationExpression expression; - checkNotNull(ctx, "Received a null pointer as context"); + Objects.requireNonNull(ctx, "Received a null pointer as context"); expression = getIntegerOperand(ctx.getText()); @@ -250,11 +249,11 @@ private final DiceOperand getDiceOperand(final DiceContext ctx) { final Integer quantity; // Number of dice final Integer sides; // Number of sides final Iterator digits; // Parsed digits - final Integer size; // Size of the digit list + final long size; // Size of the digit list // Parses the dice data digits = ctx.DIGIT().iterator(); - size = Iterables.size(ctx.DIGIT()); + size = StreamSupport.stream(ctx.DIGIT().spliterator(), false).count(); if (size > 1) { // Contains the quantity of dice diff --git a/src/main/java/com/bernardomg/tabletop/dice/random/AbstractNumberGenerator.java b/src/main/java/com/bernardomg/tabletop/dice/random/AbstractNumberGenerator.java index dc3fd379..3278cc49 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/random/AbstractNumberGenerator.java +++ b/src/main/java/com/bernardomg/tabletop/dice/random/AbstractNumberGenerator.java @@ -16,10 +16,9 @@ package com.bernardomg.tabletop.dice.random; -import static com.google.common.base.Preconditions.checkNotNull; - import java.util.ArrayList; import java.util.Collection; +import java.util.Objects; import java.util.function.Supplier; import org.slf4j.Logger; @@ -57,7 +56,7 @@ public final Iterable generate(final Dice dice) { final Integer quantity; final Supplier rollSupplier; - checkNotNull(dice, "Received a null pointer as dice"); + Objects.requireNonNull(dice, "Received a null pointer as dice"); if (dice.getQuantity() < 0) { // Negative dice set (-1d6) diff --git a/src/main/java/com/bernardomg/tabletop/dice/random/DiceToRollResult.java b/src/main/java/com/bernardomg/tabletop/dice/random/DiceToRollResult.java index c61c39ee..4821f131 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/random/DiceToRollResult.java +++ b/src/main/java/com/bernardomg/tabletop/dice/random/DiceToRollResult.java @@ -16,8 +16,7 @@ package com.bernardomg.tabletop.dice.random; -import static com.google.common.base.Preconditions.checkNotNull; - +import java.util.Objects; import java.util.function.Function; import org.slf4j.Logger; @@ -68,7 +67,7 @@ public DiceToRollResult() { public DiceToRollResult(final NumberGenerator generator) { super(); - numberGenerator = checkNotNull(generator, + numberGenerator = Objects.requireNonNull(generator, "Received a null pointer as generator"); } diff --git a/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceRollAccumulator.java b/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceRollAccumulator.java index f91c46c4..9e126caf 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceRollAccumulator.java +++ b/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceRollAccumulator.java @@ -16,11 +16,11 @@ package com.bernardomg.tabletop.dice.visitor; -import static com.google.common.base.Preconditions.checkNotNull; - +import java.util.Objects; import java.util.Stack; import java.util.function.BiFunction; import java.util.function.Function; +import java.util.stream.StreamSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,6 @@ import com.bernardomg.tabletop.dice.notation.operation.DivisionOperation; import com.bernardomg.tabletop.dice.notation.operation.MultiplicationOperation; import com.bernardomg.tabletop.dice.notation.operation.SubtractionOperation; -import com.google.common.collect.Iterables; /** * Stores all the rolls generated from the expressions. @@ -97,7 +96,7 @@ public final class DiceRollAccumulator public DiceRollAccumulator(final Function generator) { super(); - rollGenerator = checkNotNull(generator, + rollGenerator = Objects.requireNonNull(generator, "Received a null pointer as roll generator"); } @@ -160,6 +159,7 @@ public final void constantOperand(final ConstantOperand exp) { @Override public final void diceOperand(final DiceOperand exp) { final RollResult rollResult; + final Long totalRolls; // Dice // Generates a random value @@ -171,7 +171,9 @@ public final void diceOperand(final DiceOperand exp) { values.push(rollResult.getTotalRoll()); - if (Iterables.size(rollResult.getAllRolls()) > 1) { + totalRolls = StreamSupport + .stream(rollResult.getAllRolls().spliterator(), false).count(); + if (totalRolls > 1) { texts.push(rollResult.getAllRolls().toString()); } else { texts.push(rollResult.getTotalRoll().toString()); diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/dice/ITParseAndDiceGatherer.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/dice/ITParseAndDiceGatherer.java index 01b4a7c8..a072010f 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/dice/ITParseAndDiceGatherer.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/dice/ITParseAndDiceGatherer.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.dice; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.Assert; import org.junit.jupiter.api.Assertions; @@ -27,7 +28,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceGatherer; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceGatherer with a parsed expression") public final class ITParseAndDiceGatherer { @@ -48,7 +48,8 @@ public final void testParse_Addition() { sets = new DiceGatherer().transform(parsed); - Assertions.assertEquals(2, Iterables.size(sets)); + Assertions.assertEquals(2, + StreamSupport.stream(sets.spliterator(), false).count()); itr = sets.iterator(); @@ -75,7 +76,8 @@ public final void testParse_Complex_ReturnsAll() { sets = new DiceGatherer().transform(parsed); - Assertions.assertEquals(4, Iterables.size(sets)); + Assertions.assertEquals(4, + StreamSupport.stream(sets.spliterator(), false).count()); itr = sets.iterator(); @@ -112,7 +114,8 @@ public final void testParse_Long_ReturnsAll() { sets = new DiceGatherer().transform(parsed); - Assertions.assertEquals(5, Iterables.size(sets)); + Assertions.assertEquals(5, + StreamSupport.stream(sets.spliterator(), false).count()); itr = sets.iterator(); @@ -183,7 +186,8 @@ public final void testParse_NoDice() { dice = new DiceGatherer().transform(parsed); - Assert.assertEquals(0, Iterables.size(dice)); + Assert.assertEquals(0, + StreamSupport.stream(dice.spliterator(), false).count()); } @Test @@ -226,7 +230,8 @@ public final void testParse_Subtraction() { sets = new DiceGatherer().transform(parsed); - Assertions.assertEquals(2, Iterables.size(sets)); + Assertions.assertEquals(2, + StreamSupport.stream(sets.spliterator(), false).count()); itr = sets.iterator(); @@ -253,7 +258,8 @@ public final void testParse_SubtractionAddition() { sets = new DiceGatherer().transform(parsed); - Assertions.assertEquals(3, Iterables.size(sets)); + Assertions.assertEquals(3, + StreamSupport.stream(sets.spliterator(), false).count()); itr = sets.iterator(); @@ -285,7 +291,8 @@ public final void testParse_SubtractionAddition_Dice_AllEqual() { sets = new DiceGatherer().transform(parsed); - Assertions.assertEquals(3, Iterables.size(sets)); + Assertions.assertEquals(3, + StreamSupport.stream(sets.spliterator(), false).count()); itr = sets.iterator(); @@ -317,7 +324,8 @@ public final void testParse_WithConstants() { sets = new DiceGatherer().transform(parsed); - Assertions.assertEquals(2, Iterables.size(sets)); + Assertions.assertEquals(2, + StreamSupport.stream(sets.spliterator(), false).count()); itr = sets.iterator(); diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionDiceRollResults.java index 1dbc5703..c25ae344 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionDiceRollResults.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -28,7 +29,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for addition operations") public final class ITParseAndDiceRollerAdditionDiceRollResults { @@ -79,7 +79,8 @@ public final void testParse_Quantity() { rolled = new DiceRoller().transform(expression).getRollResults(); - Assertions.assertEquals(2, Iterables.size(rolled)); + Assertions.assertEquals(2, + StreamSupport.stream(rolled.spliterator(), false).count()); } @Test @@ -101,13 +102,15 @@ public final void testParse_Rolls() { result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(1, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(1, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(2, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(2, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); } diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionMixedRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionMixedRollResults.java index 129cd4c1..f98d5fde 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionMixedRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionMixedRollResults.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -28,7 +29,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for addition operations including constants") public final class ITParseAndDiceRollerAdditionMixedRollResults { @@ -88,7 +88,8 @@ public final void testParse_Quantity() { rolled = new DiceRoller().transform(expression).getRollResults(); - Assertions.assertEquals(3, Iterables.size(rolled)); + Assertions.assertEquals(3, + StreamSupport.stream(rolled.spliterator(), false).count()); } @Test @@ -110,19 +111,22 @@ public final void testParse_Rolls() { result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(1, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(1, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(1, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(1, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(3), rolls.next()); result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(2, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(2, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); } diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionNumberRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionNumberRollResults.java index 8aeb4d22..b47c581d 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionNumberRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionNumberRollResults.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -27,7 +28,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for addition operations using only numbers") public final class ITParseAndDiceRollerAdditionNumberRollResults { @@ -52,7 +52,8 @@ public final void testParse_Quantity() { results = new DiceRoller().transform(operation).getRollResults(); - Assertions.assertEquals(3, Iterables.size(results)); + Assertions.assertEquals(3, + StreamSupport.stream(results.spliterator(), false).count()); } @Test @@ -119,21 +120,24 @@ public final void testParse_Value() { result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(1), rollValues.next()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(2), rollValues.next()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(3), rollValues.next()); diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationDiceRollResults.java index 07db1c92..16204a0e 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationDiceRollResults.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -28,7 +29,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for mixed binary operations") public final class ITParseAndDiceRollerBinaryOperationDiceRollResults { @@ -88,7 +88,8 @@ public final void testParse_Quantity() { rolled = new DiceRoller().transform(expression).getRollResults(); - Assertions.assertEquals(3, Iterables.size(rolled)); + Assertions.assertEquals(3, + StreamSupport.stream(rolled.spliterator(), false).count()); } @Test @@ -110,13 +111,15 @@ public final void testParse_Rolls() { result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(1, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(1, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(2, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(2, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); } diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationNumberRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationNumberRollResults.java index c4fd736b..d1a0449e 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationNumberRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationNumberRollResults.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -27,7 +28,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for mixed binary operations using only numbers") public final class ITParseAndDiceRollerBinaryOperationNumberRollResults { @@ -52,7 +52,8 @@ public final void testParse_Quantity() { results = new DiceRoller().transform(operation).getRollResults(); - Assertions.assertEquals(3, Iterables.size(results)); + Assertions.assertEquals(3, + StreamSupport.stream(results.spliterator(), false).count()); } @Test @@ -119,21 +120,24 @@ public final void testParse_Value() { result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(1), rollValues.next()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(-2), rollValues.next()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(3), rollValues.next()); diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerDiceRollResults.java index 5b0e71d2..70283381 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerDiceRollResults.java @@ -16,6 +16,8 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; +import java.util.stream.StreamSupport; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -26,7 +28,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for dice") public final class ITParseAndDiceRollerDiceRollResults { @@ -68,7 +69,8 @@ public final void testParse_SmallestDice_Quantity() { rolled = new DiceRoller().transform(expression).getRollResults(); - Assertions.assertEquals(1, Iterables.size(rolled)); + Assertions.assertEquals(1, + StreamSupport.stream(rolled.spliterator(), false).count()); } @Test @@ -87,7 +89,8 @@ public final void testParse_SmallestDice_Rolls() { .iterator().next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.iterator().next()); } diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerMultiplicationDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerMultiplicationDiceRollResults.java index 3f7a8451..f16ebbac 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerMultiplicationDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerMultiplicationDiceRollResults.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -28,7 +29,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for multiplication operations") public final class ITParseAndDiceRollerMultiplicationDiceRollResults { @@ -82,7 +82,8 @@ public final void testParse_Quantity() { rolled = new DiceRoller().transform(expression).getRollResults(); - Assertions.assertEquals(2, Iterables.size(rolled)); + Assertions.assertEquals(2, + StreamSupport.stream(rolled.spliterator(), false).count()); } @Test @@ -104,13 +105,15 @@ public final void testParse_Rolls() { result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(1, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(1, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(2, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(2, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); } diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerParenthesisDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerParenthesisDiceRollResults.java index 6366fd71..d3dd8324 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerParenthesisDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerParenthesisDiceRollResults.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -28,7 +29,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for operations using parenthesis") public final class ITParseAndDiceRollerParenthesisDiceRollResults { @@ -85,7 +85,8 @@ public final void testParse_Quantity() { rolled = new DiceRoller().transform(expression).getRollResults(); - Assertions.assertEquals(3, Iterables.size(rolled)); + Assertions.assertEquals(3, + StreamSupport.stream(rolled.spliterator(), false).count()); } @Test @@ -107,13 +108,15 @@ public final void testParse_Rolls() { result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(1, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(1, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(2, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(2, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); } diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionDiceRollResults.java index f92102df..5b1391f7 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionDiceRollResults.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -28,7 +29,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for subtraction operations") public final class ITParseAndDiceRollerSubtractionDiceRollResults { @@ -79,7 +79,8 @@ public final void testParse_Quantity() { rolled = new DiceRoller().transform(expression).getRollResults(); - Assertions.assertEquals(2, Iterables.size(rolled)); + Assertions.assertEquals(2, + StreamSupport.stream(rolled.spliterator(), false).count()); } @Test @@ -101,13 +102,15 @@ public final void testParse_Rolls() { result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(1, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(1, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); result = rolled.next(); rolls = result.getAllRolls().iterator(); - Assertions.assertEquals(2, Iterables.size(result.getAllRolls())); + Assertions.assertEquals(2, StreamSupport + .stream(result.getAllRolls().spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); Assertions.assertEquals(Integer.valueOf(1), rolls.next()); } diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionNumberRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionNumberRollResults.java index ade9a180..5cb1f89f 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionNumberRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionNumberRollResults.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.integration.interpreter.roll.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -27,7 +28,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.parser.DefaultDiceParser; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for subtraction operations using only numbers") public final class ITParseAndDiceRollerSubtractionNumberRollResults { @@ -52,7 +52,8 @@ public final void testParse_Quantity() { results = new DiceRoller().transform(operation).getRollResults(); - Assertions.assertEquals(3, Iterables.size(results)); + Assertions.assertEquals(3, + StreamSupport.stream(results.spliterator(), false).count()); } @Test @@ -117,25 +118,29 @@ public final void testParse_Value() { results = new DiceRoller().transform(operation).getRollResults(); resultsItr = results.iterator(); - Assertions.assertEquals(3, Iterables.size(results)); + Assertions.assertEquals(3, + StreamSupport.stream(results.spliterator(), false).count()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(-1), rollValues.next()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(-2), rollValues.next()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(-3), rollValues.next()); diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedDiceStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedDiceStructure.java index 53455dfd..e8675bb9 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedDiceStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedDiceStructure.java @@ -42,7 +42,8 @@ public final void testParse_OnesDice_SignedNegative() { Assertions.assertEquals(Integer.valueOf(-1), operation.getDice().getQuantity()); - Assertions.assertEquals(Integer.valueOf(1), operation.getDice().getSides()); + Assertions.assertEquals(Integer.valueOf(1), + operation.getDice().getSides()); } @Test @@ -54,7 +55,8 @@ public final void testParse_OnesDice_SignedPositive() { Assertions.assertEquals(Integer.valueOf(1), operation.getDice().getQuantity()); - Assertions.assertEquals(Integer.valueOf(1), operation.getDice().getSides()); + Assertions.assertEquals(Integer.valueOf(1), + operation.getDice().getSides()); } } diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerAdditionOperationRollResult.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerAdditionOperationRollResult.java index 7a164324..98dfefcc 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerAdditionOperationRollResult.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerAdditionOperationRollResult.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.unit.interpreter.roller.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -28,7 +29,6 @@ import com.bernardomg.tabletop.dice.notation.operand.IntegerOperand; import com.bernardomg.tabletop.dice.notation.operation.AdditionOperation; import com.bernardomg.tabletop.dice.notation.operation.SubtractionOperation; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for additions/subtractions") public final class TestDiceRollerAdditionOperationRollResult { @@ -58,18 +58,21 @@ public final void testRolls_Addition() { results = new DiceRoller().transform(expression).getRollResults(); resultsItr = results.iterator(); - Assertions.assertEquals(2, Iterables.size(results)); + Assertions.assertEquals(2, + StreamSupport.stream(results.spliterator(), false).count()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(1), rollValues.next()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(2), rollValues.next()); @@ -96,18 +99,21 @@ public final void testRolls_Addition_AddToNeg() { results = new DiceRoller().transform(expression).getRollResults(); resultsItr = results.iterator(); - Assertions.assertEquals(2, Iterables.size(results)); + Assertions.assertEquals(2, + StreamSupport.stream(results.spliterator(), false).count()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(-1), rollValues.next()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(2), rollValues.next()); @@ -134,18 +140,21 @@ public final void testRolls_Subtraction() { results = new DiceRoller().transform(expression).getRollResults(); resultsItr = results.iterator(); - Assertions.assertEquals(2, Iterables.size(results)); + Assertions.assertEquals(2, + StreamSupport.stream(results.spliterator(), false).count()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(1), rollValues.next()); result = resultsItr.next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(-2), rollValues.next()); diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerConstantRollResult.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerConstantRollResult.java index 372a0d1b..028d37c9 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerConstantRollResult.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerConstantRollResult.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.unit.interpreter.roller.results; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -27,7 +28,6 @@ import com.bernardomg.tabletop.dice.interpreter.DiceRoller; import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.notation.operand.IntegerOperand; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for constants") public final class TestDiceRollerConstantRollResult { @@ -51,8 +51,10 @@ public final void testRolls_Negative() { result = results.iterator().next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(results)); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(results.spliterator(), false).count()); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(-4), rollValues.next()); @@ -92,8 +94,10 @@ public final void testRolls_Positive() { result = results.iterator().next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(results)); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(results.spliterator(), false).count()); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(4), rollValues.next()); diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerDiceRollResult.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerDiceRollResult.java index ab96971e..8261922c 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerDiceRollResult.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerDiceRollResult.java @@ -18,6 +18,7 @@ import java.util.Arrays; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -31,7 +32,6 @@ import com.bernardomg.tabletop.dice.notation.DiceNotationExpression; import com.bernardomg.tabletop.dice.notation.operand.DefaultDiceOperand; import com.bernardomg.tabletop.dice.random.NumberGenerator; -import com.google.common.collect.Iterables; @DisplayName("DiceRoller returns the expected roll results for dice") public final class TestDiceRollerDiceRollResult { @@ -67,10 +67,14 @@ public final void testRoll_generator() { rolledValues = rolled.iterator().next(); // Single dice - Assertions.assertEquals(1, Iterables.size(rolled)); + Assertions.assertEquals(1, + StreamSupport.stream(rolled.spliterator(), false).count()); // Two values - Assertions.assertEquals(2, Iterables.size(rolledValues.getAllRolls())); + Assertions.assertEquals(2, + StreamSupport + .stream(rolledValues.getAllRolls().spliterator(), false) + .count()); rolls = rolledValues.getAllRolls().iterator(); @@ -137,7 +141,8 @@ public final void testRoll_SingleSide_Quantity() { rolled = new DiceRoller().transform(expression).getRollResults(); - Assertions.assertEquals(1, Iterables.size(rolled)); + Assertions.assertEquals(1, + StreamSupport.stream(rolled.spliterator(), false).count()); } @Test @@ -161,8 +166,10 @@ public final void testRoll_SingleSide_Rolls() { result = results.iterator().next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(results)); - Assertions.assertEquals(3, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(results.spliterator(), false).count()); + Assertions.assertEquals(3, + StreamSupport.stream(rolls.spliterator(), false).count()); rollValues = rolls.iterator(); Assertions.assertEquals(Integer.valueOf(1), rollValues.next()); @@ -229,7 +236,8 @@ public final void testRoll_SmallestDice_Quantity() { rolled = new DiceRoller().transform(expression).getRollResults(); - Assertions.assertEquals(1, Iterables.size(rolled)); + Assertions.assertEquals(1, + StreamSupport.stream(rolled.spliterator(), false).count()); } @Test @@ -252,8 +260,10 @@ public final void testRoll_SmallestDice_Rolls() { result = results.iterator().next(); rolls = result.getAllRolls(); - Assertions.assertEquals(1, Iterables.size(results)); - Assertions.assertEquals(1, Iterables.size(rolls)); + Assertions.assertEquals(1, + StreamSupport.stream(results.spliterator(), false).count()); + Assertions.assertEquals(1, + StreamSupport.stream(rolls.spliterator(), false).count()); Assertions.assertEquals(Integer.valueOf(1), rolls.iterator().next()); } diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestInorderTraverser.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestInorderTraverser.java index 075f7fec..106b32fe 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestInorderTraverser.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestInorderTraverser.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.unit.interpreter.traverser; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -27,7 +28,6 @@ import com.bernardomg.tabletop.dice.notation.operand.IntegerOperand; import com.bernardomg.tabletop.dice.notation.operation.AdditionOperation; import com.bernardomg.tabletop.dice.notation.operation.SubtractionOperation; -import com.google.common.collect.Iterables; @DisplayName("InorderTraverser parses the expression tree as expected") public final class TestInorderTraverser { @@ -65,7 +65,8 @@ public final void testList() { // 1 + 2 - 3 result = new InorderTraverser().transform(subtraction); - Assertions.assertEquals(5, Iterables.size(result)); + Assertions.assertEquals(5, + StreamSupport.stream(result.spliterator(), false).count()); exps = result.iterator(); diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPostorderTraverser.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPostorderTraverser.java index 3c459723..168ad88d 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPostorderTraverser.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPostorderTraverser.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.unit.interpreter.traverser; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -28,7 +29,6 @@ import com.bernardomg.tabletop.dice.notation.operation.AdditionOperation; import com.bernardomg.tabletop.dice.notation.operation.BinaryOperation; import com.bernardomg.tabletop.dice.notation.operation.SubtractionOperation; -import com.google.common.collect.Iterables; @DisplayName("PostorderTraverser parses the expression tree as expected") public final class TestPostorderTraverser { @@ -63,7 +63,8 @@ public final void testList() { // 1 2 + 3 - result = new PostorderTraverser().transform(subtraction); - Assertions.assertEquals(5, Iterables.size(result)); + Assertions.assertEquals(5, + StreamSupport.stream(result.spliterator(), false).count()); exps = result.iterator(); diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPreorderTraverser.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPreorderTraverser.java index 99becde0..4ed0150f 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPreorderTraverser.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPreorderTraverser.java @@ -17,6 +17,7 @@ package com.bernardomg.tabletop.dice.test.unit.interpreter.traverser; import java.util.Iterator; +import java.util.stream.StreamSupport; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -27,7 +28,6 @@ import com.bernardomg.tabletop.dice.notation.operand.IntegerOperand; import com.bernardomg.tabletop.dice.notation.operation.AdditionOperation; import com.bernardomg.tabletop.dice.notation.operation.SubtractionOperation; -import com.google.common.collect.Iterables; @DisplayName("PreorderTraverser parses the expression tree as expected") public final class TestPreorderTraverser { @@ -62,7 +62,8 @@ public final void testList() { // - + 1 2 3 result = new PreorderTraverser().transform(subtraction); - Assertions.assertEquals(5, Iterables.size(result)); + Assertions.assertEquals(5, + StreamSupport.stream(result.spliterator(), false).count()); exps = result.iterator(); From fcff8c0e520ba34dbc2a9b2b0917da347526843c Mon Sep 17 00:00:00 2001 From: Bernardo Date: Mon, 20 Dec 2021 21:34:50 +0100 Subject: [PATCH 08/12] Updated license dates --- .../com/bernardomg/tabletop/dice/generated/DiceNotation.g4 | 2 +- .../com/bernardomg/tabletop/dice/generated/DiceNotationLexer.g4 | 2 +- src/main/java/com/bernardomg/tabletop/dice/DefaultDice.java | 2 +- src/main/java/com/bernardomg/tabletop/dice/Dice.java | 2 +- .../bernardomg/tabletop/dice/history/DefaultRollHistory.java | 2 +- .../com/bernardomg/tabletop/dice/history/DefaultRollResult.java | 2 +- .../java/com/bernardomg/tabletop/dice/history/RollHistory.java | 2 +- .../java/com/bernardomg/tabletop/dice/history/RollResult.java | 2 +- .../java/com/bernardomg/tabletop/dice/history/package-info.java | 2 +- .../tabletop/dice/interpreter/ConfigurableInterpreter.java | 2 +- .../com/bernardomg/tabletop/dice/interpreter/DiceGatherer.java | 2 +- .../bernardomg/tabletop/dice/interpreter/DiceInterpreter.java | 2 +- .../com/bernardomg/tabletop/dice/interpreter/DiceRoller.java | 2 +- .../bernardomg/tabletop/dice/interpreter/ExpressionWrapper.java | 2 +- .../bernardomg/tabletop/dice/interpreter/InorderTraverser.java | 2 +- .../tabletop/dice/interpreter/PostorderTraverser.java | 2 +- .../bernardomg/tabletop/dice/interpreter/PreorderTraverser.java | 2 +- .../com/bernardomg/tabletop/dice/interpreter/package-info.java | 2 +- .../tabletop/dice/notation/DiceNotationExpression.java | 2 +- .../tabletop/dice/notation/operand/ConstantOperand.java | 2 +- .../tabletop/dice/notation/operand/DefaultDiceOperand.java | 2 +- .../bernardomg/tabletop/dice/notation/operand/DiceOperand.java | 2 +- .../tabletop/dice/notation/operand/IntegerOperand.java | 2 +- .../bernardomg/tabletop/dice/notation/operand/package-info.java | 2 +- .../dice/notation/operation/AbstractBinaryOperation.java | 2 +- .../tabletop/dice/notation/operation/AdditionOperation.java | 2 +- .../tabletop/dice/notation/operation/BinaryOperation.java | 2 +- .../tabletop/dice/notation/operation/DivisionOperation.java | 2 +- .../dice/notation/operation/MultiplicationOperation.java | 2 +- .../tabletop/dice/notation/operation/SubtractionOperation.java | 2 +- .../tabletop/dice/notation/operation/package-info.java | 2 +- .../com/bernardomg/tabletop/dice/notation/package-info.java | 2 +- .../com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java | 2 +- .../java/com/bernardomg/tabletop/dice/parser/DiceParser.java | 2 +- .../dice/parser/listener/DefaultDiceExpressionBuilder.java | 2 +- .../tabletop/dice/parser/listener/DefaultErrorListener.java | 2 +- .../tabletop/dice/parser/listener/DiceExpressionBuilder.java | 2 +- .../bernardomg/tabletop/dice/parser/listener/package-info.java | 2 +- .../java/com/bernardomg/tabletop/dice/parser/package-info.java | 2 +- .../tabletop/dice/random/AbstractNumberGenerator.java | 2 +- .../com/bernardomg/tabletop/dice/random/DiceToRollResult.java | 2 +- .../com/bernardomg/tabletop/dice/random/NumberGenerator.java | 2 +- .../bernardomg/tabletop/dice/random/RandomNumberGenerator.java | 2 +- .../java/com/bernardomg/tabletop/dice/random/package-info.java | 2 +- .../com/bernardomg/tabletop/dice/visitor/DiceAccumulator.java | 2 +- .../bernardomg/tabletop/dice/visitor/DiceRollAccumulator.java | 2 +- .../bernardomg/tabletop/dice/visitor/NotationAccumulator.java | 2 +- .../com/bernardomg/tabletop/dice/visitor/NotationVisitor.java | 2 +- .../java/com/bernardomg/tabletop/dice/visitor/package-info.java | 2 +- .../integration/interpreter/dice/ITParseAndDiceGatherer.java | 2 +- .../interpreter/roll/exception/ITDiceRollerException.java | 2 +- .../results/ITParseAndDiceRollerAdditionDiceRollResults.java | 2 +- .../results/ITParseAndDiceRollerAdditionMixedRollResults.java | 2 +- .../results/ITParseAndDiceRollerAdditionNumberRollResults.java | 2 +- .../ITParseAndDiceRollerBinaryOperationDiceRollResults.java | 2 +- .../ITParseAndDiceRollerBinaryOperationNumberRollResults.java | 2 +- .../roll/results/ITParseAndDiceRollerDiceRollResults.java | 2 +- .../ITParseAndDiceRollerMultiplicationDiceRollResults.java | 2 +- .../results/ITParseAndDiceRollerParenthesisDiceRollResults.java | 2 +- .../results/ITParseAndDiceRollerSubtractionDiceRollResults.java | 2 +- .../ITParseAndDiceRollerSubtractionNumberRollResults.java | 2 +- .../roll/text/ITParseAndDiceRollerAdditionDiceText.java | 2 +- .../roll/text/ITParseAndDiceRollerAdditionMixedText.java | 2 +- .../interpreter/roll/text/ITParseAndDiceRollerMixedText.java | 2 +- .../roll/value/ITParseAndDiceRollerAdditionDiceTotalRoll.java | 2 +- .../roll/value/ITParseAndDiceRollerAdditionNumberTotalRoll.java | 2 +- .../ITParseAndDiceRollerAdditionSignedNumberTotalRoll.java | 2 +- .../ITParseAndDiceRollerBinaryOperationNumberTotalRoll.java | 2 +- .../value/ITParseAndDiceRollerBinaryOperationTotalRoll.java | 2 +- .../roll/value/ITParseAndDiceRollerDiceTotalRoll.java | 2 +- .../roll/value/ITParseAndDiceRollerDivisionDiceTotalRoll.java | 2 +- .../roll/value/ITParseAndDiceRollerDivisionNumberTotalRoll.java | 2 +- .../value/ITParseAndDiceRollerMultiplicationDiceTotalRoll.java | 2 +- .../ITParseAndDiceRollerMultiplicationNumberTotalRoll.java | 2 +- .../roll/value/ITParseAndDiceRollerNumberTotalRoll.java | 2 +- .../roll/value/ITParseAndDiceRollerParenthesisTotalRoll.java | 2 +- .../value/ITParseAndDiceRollerSubstractionDiceTotalRoll.java | 2 +- .../value/ITParseAndDiceRollerSubstractionNumberTotalRoll.java | 2 +- .../parser/exception/ITDefaultDiceParserException.java | 2 +- .../parser/notation/ITDefaultDiceParserNotation.java | 2 +- .../parser/notation/ITDefaultDiceParserNumbersNotation.java | 2 +- .../structure/ITDefaultDiceParserAdditionDiceStructure.java | 2 +- .../structure/ITDefaultDiceParserAdditionNumberStructure.java | 2 +- .../ITDefaultDiceParserBinaryOperationNumberStructure.java | 2 +- .../parser/structure/ITDefaultDiceParserComplexStructure.java | 2 +- .../parser/structure/ITDefaultDiceParserDiceStructure.java | 2 +- .../structure/ITDefaultDiceParserDivisionDiceStructure.java | 2 +- .../ITDefaultDiceParserMultiplicationDiceStructure.java | 2 +- .../parser/structure/ITDefaultDiceParserNumberStructure.java | 2 +- .../structure/ITDefaultDiceParserParenthesisStructure.java | 2 +- .../structure/ITDefaultDiceParserSignedDiceStructure.java | 2 +- .../structure/ITDefaultDiceParserSignedNumberStructure.java | 2 +- .../structure/ITDefaultDiceParserSubstractionDiceStructure.java | 2 +- .../ITDefaultDiceParserSubstractionNumberStructure.java | 2 +- .../tabletop/dice/test/unit/history/TestDefaultRollHistory.java | 2 +- .../test/unit/interpreter/roller/call/TestDiceRollerCalls.java | 2 +- .../results/TestDiceRollerAdditionOperationRollResult.java | 2 +- .../roller/results/TestDiceRollerConstantRollResult.java | 2 +- .../roller/results/TestDiceRollerDiceRollResult.java | 2 +- .../roller/text/TestDiceRollerAdditionOperationRollText.java | 2 +- .../interpreter/roller/text/TestDiceRollerConstantText.java | 2 +- .../unit/interpreter/roller/text/TestDiceRollerDiceText.java | 2 +- .../roller/value/TestDiceRollerAdditionOperationValue.java | 2 +- .../unit/interpreter/roller/value/TestDiceRollerDiceValue.java | 2 +- .../roller/value/TestDiceRollerDivisionOperationValue.java | 2 +- .../value/TestDiceRollerMultiplicationOperationValue.java | 2 +- .../roller/value/TestDiceRollerSubtractionOperationValue.java | 2 +- .../test/unit/interpreter/traverser/TestInorderTraverser.java | 2 +- .../test/unit/interpreter/traverser/TestPostorderTraverser.java | 2 +- .../test/unit/interpreter/traverser/TestPreorderTraverser.java | 2 +- .../dice/test/unit/notation/operand/TestDefaultDiceOperand.java | 2 +- .../dice/test/unit/notation/operand/TestIntegerOperand.java | 2 +- .../test/unit/notation/operation/TestAdditionOperation.java | 2 +- .../test/unit/notation/operation/TestDivisionOperation.java | 2 +- .../unit/notation/operation/TestMultiplicationOperation.java | 2 +- .../test/unit/notation/operation/TestSubtractionOperation.java | 2 +- .../dice/test/unit/random/TestRandomNumberGenerator.java | 2 +- .../tabletop/dice/test/unit/roll/TestDiceToRollResult.java | 2 +- .../tabletop/dice/test/unit/roll/TestDiceToRollResultCalls.java | 2 +- 119 files changed, 119 insertions(+), 119 deletions(-) diff --git a/src/main/antlr4/com/bernardomg/tabletop/dice/generated/DiceNotation.g4 b/src/main/antlr4/com/bernardomg/tabletop/dice/generated/DiceNotation.g4 index 60e049a5..84d1ea4b 100644 --- a/src/main/antlr4/com/bernardomg/tabletop/dice/generated/DiceNotation.g4 +++ b/src/main/antlr4/com/bernardomg/tabletop/dice/generated/DiceNotation.g4 @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/antlr4/com/bernardomg/tabletop/dice/generated/DiceNotationLexer.g4 b/src/main/antlr4/com/bernardomg/tabletop/dice/generated/DiceNotationLexer.g4 index 519b5308..b795894b 100644 --- a/src/main/antlr4/com/bernardomg/tabletop/dice/generated/DiceNotationLexer.g4 +++ b/src/main/antlr4/com/bernardomg/tabletop/dice/generated/DiceNotationLexer.g4 @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/DefaultDice.java b/src/main/java/com/bernardomg/tabletop/dice/DefaultDice.java index 15249097..76732385 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/DefaultDice.java +++ b/src/main/java/com/bernardomg/tabletop/dice/DefaultDice.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/Dice.java b/src/main/java/com/bernardomg/tabletop/dice/Dice.java index d28c66c5..31f5cf8a 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/Dice.java +++ b/src/main/java/com/bernardomg/tabletop/dice/Dice.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollHistory.java b/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollHistory.java index 6662af38..c9380b29 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollHistory.java +++ b/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollHistory.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollResult.java b/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollResult.java index 436e397d..bad04d8f 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollResult.java +++ b/src/main/java/com/bernardomg/tabletop/dice/history/DefaultRollResult.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/history/RollHistory.java b/src/main/java/com/bernardomg/tabletop/dice/history/RollHistory.java index 3147cc94..14eef757 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/history/RollHistory.java +++ b/src/main/java/com/bernardomg/tabletop/dice/history/RollHistory.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/history/RollResult.java b/src/main/java/com/bernardomg/tabletop/dice/history/RollResult.java index bc04fc83..6b76cecc 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/history/RollResult.java +++ b/src/main/java/com/bernardomg/tabletop/dice/history/RollResult.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/history/package-info.java b/src/main/java/com/bernardomg/tabletop/dice/history/package-info.java index 53f91f9e..c7d915e4 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/history/package-info.java +++ b/src/main/java/com/bernardomg/tabletop/dice/history/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/ConfigurableInterpreter.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/ConfigurableInterpreter.java index 33d26b58..07f2041d 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/ConfigurableInterpreter.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/ConfigurableInterpreter.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceGatherer.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceGatherer.java index 2150ff48..46f1f226 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceGatherer.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceGatherer.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceInterpreter.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceInterpreter.java index 37c12912..4242b443 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceInterpreter.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceInterpreter.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceRoller.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceRoller.java index 75e7c5ff..3e8dc8b1 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceRoller.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/DiceRoller.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/ExpressionWrapper.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/ExpressionWrapper.java index 76c5f5e5..94f99dab 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/ExpressionWrapper.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/ExpressionWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/InorderTraverser.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/InorderTraverser.java index 3b09e2d0..c5d3a5ba 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/InorderTraverser.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/InorderTraverser.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/PostorderTraverser.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/PostorderTraverser.java index fc4cbb5d..b1617e19 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/PostorderTraverser.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/PostorderTraverser.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/PreorderTraverser.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/PreorderTraverser.java index f9825be0..6f57dc7e 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/PreorderTraverser.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/PreorderTraverser.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/interpreter/package-info.java b/src/main/java/com/bernardomg/tabletop/dice/interpreter/package-info.java index 4d685dfd..73774b8a 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/interpreter/package-info.java +++ b/src/main/java/com/bernardomg/tabletop/dice/interpreter/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/DiceNotationExpression.java b/src/main/java/com/bernardomg/tabletop/dice/notation/DiceNotationExpression.java index cb2e6d0d..091d8121 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/DiceNotationExpression.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/DiceNotationExpression.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/ConstantOperand.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/ConstantOperand.java index 588fa4d8..721dc92d 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/ConstantOperand.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/ConstantOperand.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DefaultDiceOperand.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DefaultDiceOperand.java index ce4b98c5..89f86c1f 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DefaultDiceOperand.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DefaultDiceOperand.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DiceOperand.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DiceOperand.java index 87c1b89f..e149e440 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DiceOperand.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/DiceOperand.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/IntegerOperand.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/IntegerOperand.java index 4d610442..5ce125ff 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/IntegerOperand.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/IntegerOperand.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/package-info.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/package-info.java index 713ab05b..98d87295 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operand/package-info.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operand/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AbstractBinaryOperation.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AbstractBinaryOperation.java index e3a21e43..3462825a 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AbstractBinaryOperation.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AbstractBinaryOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AdditionOperation.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AdditionOperation.java index a8b43f29..31881c48 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AdditionOperation.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/AdditionOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/BinaryOperation.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/BinaryOperation.java index 7f0d674c..688e38da 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/BinaryOperation.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/BinaryOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/DivisionOperation.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/DivisionOperation.java index 4adf37d8..b28923eb 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/DivisionOperation.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/DivisionOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/MultiplicationOperation.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/MultiplicationOperation.java index cf566699..da3ccc59 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/MultiplicationOperation.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/MultiplicationOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/SubtractionOperation.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/SubtractionOperation.java index a1b3aa9c..b9fcbd72 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/SubtractionOperation.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/SubtractionOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/package-info.java b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/package-info.java index 35c8a243..0196694e 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/operation/package-info.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/operation/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/notation/package-info.java b/src/main/java/com/bernardomg/tabletop/dice/notation/package-info.java index aef50e93..e1220bfc 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/notation/package-info.java +++ b/src/main/java/com/bernardomg/tabletop/dice/notation/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java b/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java index d7476a68..5a093726 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java +++ b/src/main/java/com/bernardomg/tabletop/dice/parser/DefaultDiceParser.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/DiceParser.java b/src/main/java/com/bernardomg/tabletop/dice/parser/DiceParser.java index 6ce11aee..f6b8ecda 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/parser/DiceParser.java +++ b/src/main/java/com/bernardomg/tabletop/dice/parser/DiceParser.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultDiceExpressionBuilder.java b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultDiceExpressionBuilder.java index 3e2b6199..bf8cc803 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultDiceExpressionBuilder.java +++ b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultDiceExpressionBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultErrorListener.java b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultErrorListener.java index af688e18..a4622c67 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultErrorListener.java +++ b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DefaultErrorListener.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DiceExpressionBuilder.java b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DiceExpressionBuilder.java index 8a66601f..c4a497f8 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DiceExpressionBuilder.java +++ b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/DiceExpressionBuilder.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/package-info.java b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/package-info.java index 3d9fe6bf..6293bab7 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/parser/listener/package-info.java +++ b/src/main/java/com/bernardomg/tabletop/dice/parser/listener/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/parser/package-info.java b/src/main/java/com/bernardomg/tabletop/dice/parser/package-info.java index fe94f0c1..1f4ae22b 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/parser/package-info.java +++ b/src/main/java/com/bernardomg/tabletop/dice/parser/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/random/AbstractNumberGenerator.java b/src/main/java/com/bernardomg/tabletop/dice/random/AbstractNumberGenerator.java index 3278cc49..43fc09c8 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/random/AbstractNumberGenerator.java +++ b/src/main/java/com/bernardomg/tabletop/dice/random/AbstractNumberGenerator.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/random/DiceToRollResult.java b/src/main/java/com/bernardomg/tabletop/dice/random/DiceToRollResult.java index 4821f131..3958fa88 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/random/DiceToRollResult.java +++ b/src/main/java/com/bernardomg/tabletop/dice/random/DiceToRollResult.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/random/NumberGenerator.java b/src/main/java/com/bernardomg/tabletop/dice/random/NumberGenerator.java index 9a8d359f..aa7bc6ed 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/random/NumberGenerator.java +++ b/src/main/java/com/bernardomg/tabletop/dice/random/NumberGenerator.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/random/RandomNumberGenerator.java b/src/main/java/com/bernardomg/tabletop/dice/random/RandomNumberGenerator.java index 5b39fccb..2a514ea6 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/random/RandomNumberGenerator.java +++ b/src/main/java/com/bernardomg/tabletop/dice/random/RandomNumberGenerator.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/random/package-info.java b/src/main/java/com/bernardomg/tabletop/dice/random/package-info.java index 72123289..f4e8353d 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/random/package-info.java +++ b/src/main/java/com/bernardomg/tabletop/dice/random/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceAccumulator.java b/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceAccumulator.java index 444033d5..4a85d1d9 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceAccumulator.java +++ b/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceAccumulator.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceRollAccumulator.java b/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceRollAccumulator.java index 9e126caf..f35d0e07 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceRollAccumulator.java +++ b/src/main/java/com/bernardomg/tabletop/dice/visitor/DiceRollAccumulator.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/visitor/NotationAccumulator.java b/src/main/java/com/bernardomg/tabletop/dice/visitor/NotationAccumulator.java index ca7d4c45..fc3f41f3 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/visitor/NotationAccumulator.java +++ b/src/main/java/com/bernardomg/tabletop/dice/visitor/NotationAccumulator.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/visitor/NotationVisitor.java b/src/main/java/com/bernardomg/tabletop/dice/visitor/NotationVisitor.java index 754d0bc6..8a2f4e7c 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/visitor/NotationVisitor.java +++ b/src/main/java/com/bernardomg/tabletop/dice/visitor/NotationVisitor.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/main/java/com/bernardomg/tabletop/dice/visitor/package-info.java b/src/main/java/com/bernardomg/tabletop/dice/visitor/package-info.java index 14416dd8..e8a977a8 100644 --- a/src/main/java/com/bernardomg/tabletop/dice/visitor/package-info.java +++ b/src/main/java/com/bernardomg/tabletop/dice/visitor/package-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/dice/ITParseAndDiceGatherer.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/dice/ITParseAndDiceGatherer.java index a072010f..40d9dd3e 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/dice/ITParseAndDiceGatherer.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/dice/ITParseAndDiceGatherer.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/exception/ITDiceRollerException.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/exception/ITDiceRollerException.java index e9792a32..c08de886 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/exception/ITDiceRollerException.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/exception/ITDiceRollerException.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionDiceRollResults.java index c25ae344..0c63d3b1 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionDiceRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionMixedRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionMixedRollResults.java index f98d5fde..dfb7b477 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionMixedRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionMixedRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionNumberRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionNumberRollResults.java index b47c581d..9a6f08ec 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionNumberRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerAdditionNumberRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationDiceRollResults.java index 16204a0e..925a6477 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationDiceRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationNumberRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationNumberRollResults.java index d1a0449e..dcce6b6f 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationNumberRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerBinaryOperationNumberRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerDiceRollResults.java index 70283381..f6d7e24c 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerDiceRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerMultiplicationDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerMultiplicationDiceRollResults.java index f16ebbac..e85d9d5a 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerMultiplicationDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerMultiplicationDiceRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerParenthesisDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerParenthesisDiceRollResults.java index d3dd8324..f0705a86 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerParenthesisDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerParenthesisDiceRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionDiceRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionDiceRollResults.java index 5b1391f7..52ce7d90 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionDiceRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionDiceRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionNumberRollResults.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionNumberRollResults.java index 5cb1f89f..a7e2898c 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionNumberRollResults.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/results/ITParseAndDiceRollerSubtractionNumberRollResults.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerAdditionDiceText.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerAdditionDiceText.java index 198c45b2..fdf8aef2 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerAdditionDiceText.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerAdditionDiceText.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerAdditionMixedText.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerAdditionMixedText.java index ef0a4c11..ee77abb6 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerAdditionMixedText.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerAdditionMixedText.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerMixedText.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerMixedText.java index 797308ed..47157de4 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerMixedText.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/text/ITParseAndDiceRollerMixedText.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionDiceTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionDiceTotalRoll.java index 5667c295..0873ddc9 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionDiceTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionDiceTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionNumberTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionNumberTotalRoll.java index b8de6cba..0397ce77 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionNumberTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionNumberTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionSignedNumberTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionSignedNumberTotalRoll.java index 047bf9e5..322856eb 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionSignedNumberTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerAdditionSignedNumberTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerBinaryOperationNumberTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerBinaryOperationNumberTotalRoll.java index d56d08db..8437a732 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerBinaryOperationNumberTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerBinaryOperationNumberTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerBinaryOperationTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerBinaryOperationTotalRoll.java index 167ceade..ed1aeda1 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerBinaryOperationTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerBinaryOperationTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDiceTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDiceTotalRoll.java index 12a3d39f..e6c2b95c 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDiceTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDiceTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDivisionDiceTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDivisionDiceTotalRoll.java index c3ef1fc1..79678935 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDivisionDiceTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDivisionDiceTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDivisionNumberTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDivisionNumberTotalRoll.java index 4728e331..c5fafc57 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDivisionNumberTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerDivisionNumberTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerMultiplicationDiceTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerMultiplicationDiceTotalRoll.java index 2f6465fe..ac2b45ac 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerMultiplicationDiceTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerMultiplicationDiceTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerMultiplicationNumberTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerMultiplicationNumberTotalRoll.java index 11691117..7dafd107 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerMultiplicationNumberTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerMultiplicationNumberTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerNumberTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerNumberTotalRoll.java index 4e26dada..2a0065d8 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerNumberTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerNumberTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerParenthesisTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerParenthesisTotalRoll.java index 2415aa5d..4532b505 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerParenthesisTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerParenthesisTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerSubstractionDiceTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerSubstractionDiceTotalRoll.java index fdb4fa5f..833b5250 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerSubstractionDiceTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerSubstractionDiceTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerSubstractionNumberTotalRoll.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerSubstractionNumberTotalRoll.java index fea068bb..71b5c29f 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerSubstractionNumberTotalRoll.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/interpreter/roll/value/ITParseAndDiceRollerSubstractionNumberTotalRoll.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/exception/ITDefaultDiceParserException.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/exception/ITDefaultDiceParserException.java index 8a702b78..c8179cb6 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/exception/ITDefaultDiceParserException.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/exception/ITDefaultDiceParserException.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/notation/ITDefaultDiceParserNotation.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/notation/ITDefaultDiceParserNotation.java index 65dd619a..ee97511a 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/notation/ITDefaultDiceParserNotation.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/notation/ITDefaultDiceParserNotation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/notation/ITDefaultDiceParserNumbersNotation.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/notation/ITDefaultDiceParserNumbersNotation.java index a3026ae7..284bab4f 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/notation/ITDefaultDiceParserNumbersNotation.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/notation/ITDefaultDiceParserNumbersNotation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserAdditionDiceStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserAdditionDiceStructure.java index 6edd78de..4b7fa99d 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserAdditionDiceStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserAdditionDiceStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserAdditionNumberStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserAdditionNumberStructure.java index 66b02a48..5227a000 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserAdditionNumberStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserAdditionNumberStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserBinaryOperationNumberStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserBinaryOperationNumberStructure.java index d1913fa8..800d8e72 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserBinaryOperationNumberStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserBinaryOperationNumberStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserComplexStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserComplexStructure.java index d46ac49a..9e1695c3 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserComplexStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserComplexStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserDiceStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserDiceStructure.java index ed238bf0..46a9a99c 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserDiceStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserDiceStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserDivisionDiceStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserDivisionDiceStructure.java index 998cb3eb..50100e79 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserDivisionDiceStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserDivisionDiceStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserMultiplicationDiceStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserMultiplicationDiceStructure.java index 41a369d6..89208bbc 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserMultiplicationDiceStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserMultiplicationDiceStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserNumberStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserNumberStructure.java index acca2dc9..d76ba0be 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserNumberStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserNumberStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserParenthesisStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserParenthesisStructure.java index bb0659c7..5044510d 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserParenthesisStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserParenthesisStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedDiceStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedDiceStructure.java index e8675bb9..6dfc1376 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedDiceStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedDiceStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedNumberStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedNumberStructure.java index 352f75ec..54e8daf0 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedNumberStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSignedNumberStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSubstractionDiceStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSubstractionDiceStructure.java index eb0c3812..28b68430 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSubstractionDiceStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSubstractionDiceStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSubstractionNumberStructure.java b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSubstractionNumberStructure.java index ae0d360f..a8cafe88 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSubstractionNumberStructure.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/integration/parser/structure/ITDefaultDiceParserSubstractionNumberStructure.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/history/TestDefaultRollHistory.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/history/TestDefaultRollHistory.java index bdc79cf2..87197e16 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/history/TestDefaultRollHistory.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/history/TestDefaultRollHistory.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/call/TestDiceRollerCalls.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/call/TestDiceRollerCalls.java index 8bfff754..af37b60a 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/call/TestDiceRollerCalls.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/call/TestDiceRollerCalls.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerAdditionOperationRollResult.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerAdditionOperationRollResult.java index 98dfefcc..d7a76a1a 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerAdditionOperationRollResult.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerAdditionOperationRollResult.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerConstantRollResult.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerConstantRollResult.java index 028d37c9..88dff3e0 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerConstantRollResult.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerConstantRollResult.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerDiceRollResult.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerDiceRollResult.java index 8261922c..dc36cc42 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerDiceRollResult.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/results/TestDiceRollerDiceRollResult.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerAdditionOperationRollText.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerAdditionOperationRollText.java index 4c4242ab..05fb38cf 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerAdditionOperationRollText.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerAdditionOperationRollText.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerConstantText.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerConstantText.java index 0f15c44d..ccc103e1 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerConstantText.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerConstantText.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerDiceText.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerDiceText.java index 9f2535d3..a3ecd7a3 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerDiceText.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/text/TestDiceRollerDiceText.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerAdditionOperationValue.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerAdditionOperationValue.java index 28d063cc..b30a125b 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerAdditionOperationValue.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerAdditionOperationValue.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerDiceValue.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerDiceValue.java index 637f1fe1..927d7b7b 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerDiceValue.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerDiceValue.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerDivisionOperationValue.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerDivisionOperationValue.java index e9814768..739de6e8 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerDivisionOperationValue.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerDivisionOperationValue.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerMultiplicationOperationValue.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerMultiplicationOperationValue.java index 93be7dd4..47e299c5 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerMultiplicationOperationValue.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerMultiplicationOperationValue.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerSubtractionOperationValue.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerSubtractionOperationValue.java index 6c47d984..61ceb00f 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerSubtractionOperationValue.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/roller/value/TestDiceRollerSubtractionOperationValue.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestInorderTraverser.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestInorderTraverser.java index 106b32fe..cf7c0b70 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestInorderTraverser.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestInorderTraverser.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPostorderTraverser.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPostorderTraverser.java index 168ad88d..348b9fea 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPostorderTraverser.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPostorderTraverser.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPreorderTraverser.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPreorderTraverser.java index 4ed0150f..97d172fb 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPreorderTraverser.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/interpreter/traverser/TestPreorderTraverser.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operand/TestDefaultDiceOperand.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operand/TestDefaultDiceOperand.java index 5d7145ba..594e7944 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operand/TestDefaultDiceOperand.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operand/TestDefaultDiceOperand.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operand/TestIntegerOperand.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operand/TestIntegerOperand.java index 23cdfe19..cbfc00c4 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operand/TestIntegerOperand.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operand/TestIntegerOperand.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestAdditionOperation.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestAdditionOperation.java index f3916df2..90a5b367 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestAdditionOperation.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestAdditionOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestDivisionOperation.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestDivisionOperation.java index 7dd8f892..f792142e 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestDivisionOperation.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestDivisionOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestMultiplicationOperation.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestMultiplicationOperation.java index 1e0ca190..235f717a 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestMultiplicationOperation.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestMultiplicationOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestSubtractionOperation.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestSubtractionOperation.java index 7554758f..1c7ce8ca 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestSubtractionOperation.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/notation/operation/TestSubtractionOperation.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/random/TestRandomNumberGenerator.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/random/TestRandomNumberGenerator.java index f546a4fb..4644d30c 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/random/TestRandomNumberGenerator.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/random/TestRandomNumberGenerator.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/roll/TestDiceToRollResult.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/roll/TestDiceToRollResult.java index dde8581d..3c286db0 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/roll/TestDiceToRollResult.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/roll/TestDiceToRollResult.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/src/test/java/com/bernardomg/tabletop/dice/test/unit/roll/TestDiceToRollResultCalls.java b/src/test/java/com/bernardomg/tabletop/dice/test/unit/roll/TestDiceToRollResultCalls.java index 7bdc2ca4..25cd73c1 100644 --- a/src/test/java/com/bernardomg/tabletop/dice/test/unit/roll/TestDiceToRollResultCalls.java +++ b/src/test/java/com/bernardomg/tabletop/dice/test/unit/roll/TestDiceToRollResultCalls.java @@ -1,5 +1,5 @@ /** - * Copyright 2014-2020 the original author or authors + * Copyright 2014-2021 the original author or authors *

* Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of From abf5ba68a5fc066bb97885589dd07e67751413c6 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Mon, 20 Dec 2021 21:35:54 +0100 Subject: [PATCH 09/12] Raised test JDKs --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index bfdf3516..2989df59 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - jdk: [ 11, 15 ] + jdk: [ 11, 16 ] steps: - name: Check-out From d528763e7642a38a3a66f7f110aaa0f3f9bfd792 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Mon, 20 Dec 2021 21:52:47 +0100 Subject: [PATCH 10/12] Updated changes log --- src/changes/changes.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index b7138d96..16bf1fb1 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -148,6 +148,15 @@ + + Removed Guava. + + + Applied Lombok for data objects. + + + Updated dependencies. + From 8d0831ed8df62920a78964298badbe817ba22efd Mon Sep 17 00:00:00 2001 From: Bernardo Date: Mon, 20 Dec 2021 21:53:50 +0100 Subject: [PATCH 11/12] Updated changes log --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 16bf1fb1..c1ab50d8 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -147,7 +147,7 @@ Updated CI deployment configuration. - + Removed Guava. From b0a9bf424f467735c7c5c0b660f15da7e6dda1d2 Mon Sep 17 00:00:00 2001 From: Bernardo Date: Mon, 20 Dec 2021 21:55:53 +0100 Subject: [PATCH 12/12] Release --- pom.xml | 2 +- src/changes/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 57f03e23..23529a95 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ com.bernardomg.tabletop dice - 2.2.0-SNAPSHOT + 2.2.0 jar Dice Notation Tools for Java diff --git a/src/changes/changes.xml b/src/changes/changes.xml index c1ab50d8..d96070f6 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -147,7 +147,7 @@ Updated CI deployment configuration. - + Removed Guava.