diff --git a/docs/src/orchid/resources/changelog/v3_2_0.md b/docs/src/orchid/resources/changelog/v3_2_0.md index 66201a495..5860b6409 100644 --- a/docs/src/orchid/resources/changelog/v3_2_0.md +++ b/docs/src/orchid/resources/changelog/v3_2_0.md @@ -4,4 +4,5 @@ version: '3.2.0' - Add support for spring framework 6 and spring-boot 3 (#630) - Bump minimum supported java version to 17 in pebble-spring6 and pebble-spring-boot-starter in order to work with spring (#630) -- Change default suffix to .peb instead of .pebble in spring boot autoconfiguration (#553) \ No newline at end of file +- **BREAKING CHANGE**: Change default suffix to .peb instead of .pebble in spring boot autoconfiguration (#553) +- **BREAKING CHANGE**: Rename method getInstance to createInstance in BinaryOperator interface (#521) \ No newline at end of file diff --git a/docs/src/orchid/resources/wiki/guide/extending-pebble.md b/docs/src/orchid/resources/wiki/guide/extending-pebble.md index 7e19ffa74..8f025e7fd 100644 --- a/docs/src/orchid/resources/wiki/guide/extending-pebble.md +++ b/docs/src/orchid/resources/wiki/guide/extending-pebble.md @@ -201,7 +201,7 @@ public class AdditionOperator implements BinaryOperator { return "+"; } - public BinaryExpression getInstance() { + public BinaryExpression createInstance() { return new AddExpression(); } diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperator.java b/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperator.java index c9f28ad6f..30d1dd6e5 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperator.java +++ b/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperator.java @@ -16,7 +16,7 @@ public interface BinaryOperator { String getSymbol(); - BinaryExpression getInstance(); + BinaryExpression createInstance(); BinaryOperatorType getType(); diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorImpl.java b/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorImpl.java index 114ce7315..21c33d360 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorImpl.java +++ b/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorImpl.java @@ -67,7 +67,7 @@ public String getSymbol() { } @Override - public BinaryExpression getInstance() { + public BinaryExpression createInstance() { return this.nodeSupplier.get(); } diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ExpressionParser.java b/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ExpressionParser.java index 9c2c7d359..24a3b2a25 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ExpressionParser.java +++ b/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ExpressionParser.java @@ -203,7 +203,7 @@ else if (operator.getType() == BinaryOperatorType.TEST) { BinaryExpression finalExpression; try { - finalExpression = operator.getInstance(); + finalExpression = operator.createInstance(); } catch (RuntimeException e) { throw new ParserException(e, "Error instantiating operator node",