From dd0d79313bf27d6d32ac2b5a01f1ba73f28fa555 Mon Sep 17 00:00:00 2001 From: Eric Bussieres Date: Thu, 27 Oct 2022 14:45:36 -0400 Subject: [PATCH 1/8] Rename package from com.mitchellbosecke.pebble to io.pebbletemplates --- docs/src/orchid/resources/config.yml | 2 +- .../wiki/guide/spring-boot-integration.md | 2 +- .../AbstractPebbleConfiguration.java | 2 +- .../PebbleAutoConfiguration.java | 15 +- .../boot/autoconfigure/PebbleProperties.java | 2 +- .../PebbleReactiveWebConfiguration.java | 10 +- .../PebbleServletWebConfiguration.java | 10 +- .../PebbleTemplateAvailabilityProvider.java | 4 +- .../boot/autoconfigure/package-info.java | 2 +- .../main/resources/META-INF/spring.factories | 4 +- .../io/pebbletemplates}/boot/AppConfig.java | 12 +- .../pebbletemplates}/boot/Application.java | 2 +- .../io/pebbletemplates}/boot/Controllers.java | 2 +- .../pebbletemplates}/boot/Foo.java | 2 +- .../boot/autoconfigure/NonWebAppTests.java | 6 +- .../PebbleAutoConfigurationTest.java | 42 ++-- .../boot/autoconfigure/ReactiveAppTest.java | 4 +- .../boot/autoconfigure/ServletAppTest.java | 4 +- .../AbstractPebbleConfiguration.java | 2 +- .../PebbleAutoConfiguration.java | 15 +- .../boot/autoconfigure/PebbleProperties.java | 2 +- .../PebbleReactiveWebConfiguration.java | 8 +- .../PebbleServletWebConfiguration.java | 8 +- .../PebbleTemplateAvailabilityProvider.java | 4 +- .../boot/autoconfigure/package-info.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../io/pebbletemplates}/boot/AppConfig.java | 12 +- .../pebbletemplates}/boot/Application.java | 2 +- .../io/pebbletemplates}/boot/Controllers.java | 2 +- .../pebbletemplates}/boot/Foo.java | 2 +- .../boot/autoconfigure/NonWebAppTests.java | 6 +- .../PebbleAutoConfigurationTest.java | 19 +- .../boot/autoconfigure/ReactiveAppTest.java | 4 +- .../boot/autoconfigure/ServletAppTest.java | 4 +- .../spring/context/Beans.java | 2 +- .../spring/extension/SpringExtension.java | 23 ++- .../extension/function/HrefFunction.java | 11 +- .../function/MessageSourceFunction.java | 11 +- .../BaseBindingResultFunction.java | 8 +- .../bindingresult/GetAllErrorsFunction.java | 9 +- .../bindingresult/GetFieldErrorsFunction.java | 9 +- .../GetGlobalErrorsFunction.java | 9 +- .../bindingresult/HasErrorsFunction.java | 9 +- .../bindingresult/HasFieldErrorsFunction.java | 9 +- .../HasGlobalErrorsFunction.java | 9 +- .../spring/reactive/PebbleReactiveView.java | 11 +- .../reactive/PebbleReactiveViewResolver.java | 4 +- .../spring/servlet/PebbleView.java | 12 +- .../spring/servlet/PebbleViewResolver.java | 6 +- .../spring/PebbleViewResolverTest.java | 6 +- .../spring/bean/SomeBean.java | 2 +- .../spring/config/MVCConfig.java | 18 +- .../spring/expectedResponse/beansTest.html | 0 .../expectedResponse/bindingResultTest.html | 0 .../bindingResultWithMacroTest.html | 0 .../expectedResponse/hrefFunctionTest.html | 0 .../expectedResponse/messageEnTest.html | 0 .../expectedResponse/messageFrTest.html | 0 .../spring/expectedResponse/requestTest.html | 0 .../spring/expectedResponse/responseTest.html | 0 .../spring/expectedResponse/sessionTest.html | 0 .../spring/messages_en.properties | 0 .../spring/messages_fr.properties | 0 .../spring/template/beansTest.html | 0 .../spring/template/bindingResultTest.html | 0 .../template/bindingResultWithMacroTest.html | 0 .../spring/template/hrefFunctionTest.html | 0 .../spring/template/messageEnTest.html | 0 .../spring/template/messageFrTest.html | 0 .../spring/template/requestTest.html | 0 .../spring/template/responseTest.html | 0 .../spring/template/sessionTest.html | 0 .../spring/context/Beans.java | 2 +- .../spring/extension/SpringExtension.java | 23 ++- .../extension/function/HrefFunction.java | 11 +- .../function/MessageSourceFunction.java | 8 +- .../BaseBindingResultFunction.java | 8 +- .../bindingresult/GetAllErrorsFunction.java | 6 +- .../bindingresult/GetFieldErrorsFunction.java | 6 +- .../GetGlobalErrorsFunction.java | 6 +- .../bindingresult/HasErrorsFunction.java | 6 +- .../bindingresult/HasFieldErrorsFunction.java | 6 +- .../HasGlobalErrorsFunction.java | 6 +- .../spring/reactive/PebbleReactiveView.java | 10 +- .../reactive/PebbleReactiveViewResolver.java | 4 +- .../spring/servlet/PebbleView.java | 12 +- .../spring/servlet/PebbleViewResolver.java | 6 +- .../spring/PebbleViewResolverTest.java | 6 +- .../spring/bean/SomeBean.java | 2 +- .../spring/config/MVCConfig.java | 18 +- .../spring/expectedResponse/beansTest.html | 0 .../expectedResponse/bindingResultTest.html | 0 .../bindingResultWithMacroTest.html | 0 .../expectedResponse/hrefFunctionTest.html | 0 .../expectedResponse/messageEnTest.html | 0 .../expectedResponse/messageFrTest.html | 0 .../spring/expectedResponse/requestTest.html | 0 .../spring/expectedResponse/responseTest.html | 0 .../spring/expectedResponse/sessionTest.html | 0 .../spring/messages_en.properties | 0 .../spring/messages_fr.properties | 0 .../spring/template/beansTest.html | 0 .../spring/template/bindingResultTest.html | 0 .../template/bindingResultWithMacroTest.html | 0 .../spring/template/hrefFunctionTest.html | 0 .../spring/template/messageEnTest.html | 0 .../spring/template/messageFrTest.html | 0 .../spring/template/requestTest.html | 0 .../spring/template/responseTest.html | 0 .../spring/template/sessionTest.html | 0 .../pebbletemplates}/PebbleEngine.java | 61 +++--- .../attributes/ArrayResolver.java | 9 +- .../attributes/AttributeResolver.java | 6 +- .../attributes/DefaultAttributeResolver.java | 11 +- .../attributes/ListResolver.java | 9 +- .../attributes/MacroResolver.java | 8 +- .../attributes/MapResolver.java | 10 +- .../attributes/MemberCacheUtils.java | 9 +- .../attributes/ResolvedAttribute.java | 2 +- .../BlacklistMethodAccessValidator.java | 2 +- .../methodaccess/MethodAccessValidator.java | 2 +- .../NoOpMethodAccessValidator.java | 2 +- .../pebbletemplates}/cache/CacheKey.java | 4 +- .../pebbletemplates}/cache/PebbleCache.java | 2 +- .../cache/tag/CaffeineTagCache.java | 7 +- .../cache/tag/ConcurrentMapTagCache.java | 7 +- .../cache/tag/NoOpTagCache.java | 7 +- .../cache/template/CaffeineTemplateCache.java | 7 +- .../template/ConcurrentMapTemplateCache.java | 7 +- .../cache/template/NoOpTemplateCache.java | 7 +- .../error/AttributeNotFoundException.java | 2 +- .../error/ClassAccessException.java | 2 +- .../error/LoaderException.java | 2 +- .../error/ParserException.java | 2 +- .../error/PebbleException.java | 2 +- .../error/RootAttributeNotFoundException.java | 2 +- .../extension/AbstractExtension.java | 10 +- .../extension/AbstractNodeVisitor.java | 48 ++--- .../pebbletemplates}/extension/Extension.java | 10 +- .../extension/ExtensionCustomizer.java | 13 +- .../extension/ExtensionRegistry.java | 10 +- .../extension/ExtensionRegistryFactory.java | 15 +- .../pebbletemplates}/extension/Filter.java | 8 +- .../pebbletemplates}/extension/Function.java | 6 +- .../extension/NamedArguments.java | 2 +- .../extension/NodeVisitor.java | 42 ++-- .../extension/NodeVisitorFactory.java | 4 +- .../pebbletemplates}/extension/Test.java | 8 +- .../extension/core/AbbreviateFilter.java | 10 +- .../extension/core/AbsFilter.java | 10 +- .../core/AttributeResolverExtension.java | 8 +- .../extension/core/Base64DecoderFilter.java | 11 +- .../extension/core/Base64EncoderFilter.java | 10 +- .../extension/core/CapitalizeFilter.java | 8 +- .../extension/core/CoreExtension.java | 102 ++++----- .../extension/core/DateFilter.java | 12 +- .../extension/core/DefaultFilter.java | 12 +- .../extension/core/DefinedTest.java | 6 +- .../extension/core/EmptyTest.java | 8 +- .../extension/core/EvenTest.java | 11 +- .../extension/core/FirstFilter.java | 8 +- .../extension/core/IterableTest.java | 9 +- .../extension/core/JoinFilter.java | 10 +- .../extension/core/LastFilter.java | 8 +- .../extension/core/LengthFilter.java | 8 +- .../extension/core/LowerFilter.java | 8 +- .../MacroAndBlockRegistrantNodeVisitor.java | 12 +- ...oAndBlockRegistrantNodeVisitorFactory.java | 10 +- .../extension/core/MapTest.java | 9 +- .../extension/core/MaxFunction.java | 10 +- .../extension/core/MergeFilter.java | 10 +- .../extension/core/MinFunction.java | 10 +- .../extension/core/NullTest.java | 8 +- .../extension/core/NumberFormatFilter.java | 10 +- .../extension/core/OddTest.java | 11 +- .../extension/core/RangeFunction.java | 10 +- .../extension/core/ReplaceFilter.java | 10 +- .../extension/core/ReverseFilter.java | 8 +- .../extension/core/RsortFilter.java | 8 +- .../extension/core/Sha256Filter.java | 10 +- .../extension/core/SliceFilter.java | 10 +- .../extension/core/SortFilter.java | 10 +- .../extension/core/SplitFilter.java | 10 +- .../extension/core/TitleFilter.java | 8 +- .../extension/core/TrimFilter.java | 8 +- .../extension/core/UpperFilter.java | 8 +- .../extension/core/UrlEncoderFilter.java | 8 +- .../extension/debug/DebugExtension.java | 6 +- .../debug/PrettyPrintNodeVisitor.java | 56 ++--- .../debug/PrettyPrintNodeVisitorFactory.java | 10 +- .../extension/escaper/EscapeFilter.java | 15 +- .../extension/escaper/EscaperExtension.java | 13 +- .../extension/escaper/EscaperNodeVisitor.java | 33 +-- .../escaper/EscaperNodeVisitorFactory.java | 10 +- .../extension/escaper/EscapingStrategy.java | 2 +- .../extension/escaper/RawFilter.java | 11 +- .../extension/escaper/SafeString.java | 2 +- .../extension/i18n/I18nExtension.java | 6 +- .../extension/i18n/UTF8Control.java | 2 +- .../extension/i18n/i18nFunction.java | 8 +- .../writer/PooledSpecializedStringWriter.java | 2 +- .../extension/writer/SpecializedWriter.java | 2 +- .../StringWriterSpecializedAdapter.java | 2 +- .../pebbletemplates}/lexer/Lexer.java | 2 +- .../pebbletemplates}/lexer/LexerImpl.java | 19 +- .../pebbletemplates}/lexer/Syntax.java | 2 +- .../lexer/TemplateSource.java | 2 +- .../pebbletemplates}/lexer/Token.java | 2 +- .../pebbletemplates}/lexer/TokenStream.java | 6 +- .../loader/AbstractServletLoader.java | 6 +- .../loader/ClasspathLoader.java | 6 +- .../loader/DelegatingLoader.java | 4 +- .../loader/DelegatingLoaderCacheKey.java | 2 +- .../pebbletemplates}/loader/FileLoader.java | 6 +- .../pebbletemplates}/loader/Loader.java | 4 +- .../loader/Servlet5Loader.java | 2 +- .../loader/ServletLoader.java | 2 +- .../pebbletemplates}/loader/StringLoader.java | 2 +- .../node/AbstractRenderableNode.java | 9 +- .../pebbletemplates}/node/ArgumentsNode.java | 15 +- .../pebbletemplates}/node/AutoEscapeNode.java | 9 +- .../pebbletemplates}/node/BlockNode.java | 11 +- .../pebbletemplates}/node/BodyNode.java | 9 +- .../pebbletemplates}/node/CacheNode.java | 20 +- .../pebbletemplates}/node/EmbedNode.java | 16 +- .../pebbletemplates}/node/ExtendsNode.java | 13 +- .../pebbletemplates}/node/FlushNode.java | 9 +- .../pebbletemplates}/node/ForNode.java | 22 +- .../pebbletemplates}/node/FromNode.java | 13 +- .../node/FunctionOrMacroNameNode.java | 10 +- .../pebbletemplates}/node/IfNode.java | 19 +- .../pebbletemplates}/node/ImportNode.java | 13 +- .../pebbletemplates}/node/IncludeNode.java | 17 +- .../pebbletemplates}/node/MacroNode.java | 18 +- .../node/NamedArgumentNode.java | 6 +- .../pebbletemplates}/node/Node.java | 4 +- .../pebbletemplates}/node/ParallelNode.java | 13 +- .../node/PositionalArgumentNode.java | 6 +- .../pebbletemplates}/node/PrintNode.java | 23 ++- .../pebbletemplates}/node/RenderableNode.java | 7 +- .../pebbletemplates}/node/RootNode.java | 9 +- .../pebbletemplates}/node/SetNode.java | 11 +- .../node/TestInvocationExpression.java | 10 +- .../pebbletemplates}/node/TextNode.java | 9 +- .../node/expression/AddExpression.java | 10 +- .../node/expression/AndExpression.java | 10 +- .../node/expression/ArrayExpression.java | 9 +- .../node/expression/BinaryExpression.java | 4 +- .../expression/BlockFunctionExpression.java | 13 +- .../expression/ConcatenateExpression.java | 6 +- .../node/expression/ContainsExpression.java | 9 +- .../expression/ContextVariableExpression.java | 12 +- .../node/expression/DivideExpression.java | 10 +- .../node/expression/EqualsExpression.java | 10 +- .../node/expression/Expression.java | 8 +- .../node/expression/FilterExpression.java | 21 +- .../FilterInvocationExpression.java | 10 +- .../FunctionOrMacroInvocationExpression.java | 13 +- .../expression/GetAttributeExpression.java | 25 +-- .../GreaterThanEqualsExpression.java | 10 +- .../expression/GreaterThanExpression.java | 10 +- .../expression/LessThanEqualsExpression.java | 10 +- .../node/expression/LessThanExpression.java | 10 +- .../LiteralBigDecimalExpression.java | 8 +- .../expression/LiteralBooleanExpression.java | 8 +- .../expression/LiteralDoubleExpression.java | 8 +- .../expression/LiteralIntegerExpression.java | 8 +- .../expression/LiteralLongExpression.java | 8 +- .../expression/LiteralNullExpression.java | 8 +- .../expression/LiteralStringExpression.java | 8 +- .../node/expression/MapExpression.java | 9 +- .../node/expression/ModulusExpression.java | 10 +- .../node/expression/MultiplyExpression.java | 10 +- .../expression/NegativeTestExpression.java | 6 +- .../node/expression/NotEqualsExpression.java | 10 +- .../node/expression/OrExpression.java | 10 +- .../expression/ParentFunctionExpression.java | 13 +- .../expression/PositiveTestExpression.java | 19 +- .../node/expression/RangeExpression.java | 13 +- .../expression/RenderableNodeExpression.java | 12 +- .../node/expression/SubtractExpression.java | 10 +- .../node/expression/TernaryExpression.java | 13 +- .../node/expression/UnaryExpression.java | 4 +- .../node/expression/UnaryMinusExpression.java | 8 +- .../node/expression/UnaryNotExpression.java | 13 +- .../node/expression/UnaryPlusExpression.java | 8 +- .../node/fornode/LazyLength.java | 2 +- .../node/fornode/LazyRevIndex.java | 2 +- .../operator/Associativity.java | 2 +- .../operator/BinaryOperator.java | 4 +- .../operator/BinaryOperatorImpl.java | 12 +- .../operator/BinaryOperatorType.java | 2 +- .../operator/UnaryOperator.java | 4 +- .../operator/UnaryOperatorImpl.java | 4 +- .../parser/ExpressionParser.java | 68 +++--- .../pebbletemplates}/parser/Parser.java | 8 +- .../pebbletemplates}/parser/ParserImpl.java | 29 +-- .../parser/ParserOptions.java | 2 +- .../parser/StoppingCondition.java | 4 +- .../pebbletemplates}/template/Block.java | 2 +- .../template/EvaluationContext.java | 2 +- .../template/EvaluationContextImpl.java | 12 +- .../template/EvaluationOptions.java | 4 +- .../template/GlobalContext.java | 2 +- .../pebbletemplates}/template/Hierarchy.java | 2 +- .../pebbletemplates}/template/Macro.java | 4 +- .../template/MacroAttributeProvider.java | 4 +- .../template/PebbleTemplate.java | 10 +- .../template/PebbleTemplateImpl.java | 26 +-- .../template/RenderedSizeContext.java | 2 +- .../pebbletemplates}/template/Scope.java | 2 +- .../pebbletemplates}/template/ScopeChain.java | 2 +- .../tokenParser/AutoEscapeTokenParser.java | 16 +- .../tokenParser/BlockTokenParser.java | 18 +- .../tokenParser/CacheTokenParser.java | 18 +- .../tokenParser/EmbedTokenParser.java | 22 +- .../tokenParser/ExtendsTokenParser.java | 14 +- .../tokenParser/FilterTokenParser.java | 28 +-- .../tokenParser/FlushTokenParser.java | 12 +- .../tokenParser/ForTokenParser.java | 18 +- .../tokenParser/FromTokenParser.java | 21 +- .../tokenParser/IfTokenParser.java | 25 +-- .../tokenParser/ImportTokenParser.java | 16 +- .../tokenParser/IncludeTokenParser.java | 20 +- .../tokenParser/MacroTokenParser.java | 18 +- .../tokenParser/ParallelTokenParser.java | 16 +- .../tokenParser/SetTokenParser.java | 16 +- .../tokenParser/TokenParser.java | 12 +- .../tokenParser/VerbatimTokenParser.java | 8 +- .../pebbletemplates}/utils/Callbacks.java | 2 +- .../pebbletemplates}/utils/FutureWriter.java | 2 +- .../utils/LimitedSizeWriter.java | 6 +- .../pebbletemplates}/utils/OperatorUtils.java | 4 +- .../pebbletemplates}/utils/Pair.java | 2 +- .../pebbletemplates}/utils/PathUtils.java | 2 +- .../utils/StringLengthComparator.java | 2 +- .../pebbletemplates}/utils/StringUtils.java | 2 +- .../pebbletemplates}/utils/TypeUtils.java | 2 +- .../pebbletemplates}/ArgumentsNodeTest.java | 10 +- .../pebbletemplates}/ArraySyntaxTest.java | 11 +- .../AttributeSubscriptSyntaxTest.java | 8 +- .../pebbletemplates}/CacheTest.java | 6 +- .../pebbletemplates}/CompilerTest.java | 8 +- .../pebbletemplates}/ConcurrencyTest.java | 12 +- .../pebbletemplates}/ContextTest.java | 10 +- .../pebbletemplates}/CoreFiltersTest.java | 21 +- .../pebbletemplates}/CoreFunctionsTest.java | 8 +- .../pebbletemplates}/CoreTagsTest.java | 10 +- .../pebbletemplates}/CoreTestsTest.java | 8 +- .../pebbletemplates}/EmbedCachingTagTest.java | 12 +- .../pebbletemplates}/EmbedTagTest.java | 16 +- .../pebbletemplates}/EnumEqualsTest.java | 8 +- .../pebbletemplates}/ErrorReportingTest.java | 12 +- .../EscaperExtensionTest.java | 18 +- .../pebbletemplates}/ExtendingPebbleTest.java | 20 +- .../pebbletemplates}/ForTest.java | 8 +- .../pebbletemplates}/GetAttributeTest.java | 17 +- .../pebbletemplates}/I18nExtensionTest.java | 8 +- .../IncludeWithParameterTest.java | 7 +- .../pebbletemplates}/InheritanceTest.java | 8 +- .../pebbletemplates}/LoaderTest.java | 20 +- .../pebbletemplates}/LogicTest.java | 10 +- .../pebbletemplates}/MacroTest.java | 12 +- .../pebbletemplates}/MapSyntaxTest.java | 12 +- .../pebbletemplates}/MaxRenderedSizeTest.java | 6 +- .../MethodAccessTemplateTest.java | 12 +- .../pebbletemplates}/NewlineTrimmingTest.java | 8 +- .../OverloadedMethodTest.java | 8 +- .../OverrideCoreExtensionTest.java | 36 ++-- .../pebbletemplates}/ParsingOdditiesTest.java | 10 +- .../RenderSingleBlockTest.java | 8 +- .../RenderWithoutEndBlockTest.java | 8 +- .../pebbletemplates}/ScopeChainTest.java | 6 +- .../pebbletemplates}/ScopeTest.java | 4 +- .../pebbletemplates}/SplitFilterTest.java | 8 +- .../pebbletemplates}/StrictModeTest.java | 10 +- .../StringInterpolationTest.java | 6 +- .../TernaryExpressionTest.java | 10 +- .../pebbletemplates}/TestParallelParsing.java | 28 +-- .../pebbletemplates}/TestRelativePath.java | 8 +- .../WhitespaceControlTest.java | 8 +- .../pebbletemplates}/WritingTest.java | 8 +- .../BlacklistMethodAccessValidatorTest.java | 3 +- .../attributes/methodaccess/Foo.java | 2 +- .../methodaccess/InstanceProvider.java | 2 +- .../methodaccess/MethodsProvider.java | 2 +- .../NoOpMethodAccessValidatorTest.java | 2 +- .../extension/ArrayToStringFilter.java | 9 +- .../extension/ExtensionCustomizerTest.java | 8 +- .../extension/InvocationCountingFunction.java | 9 +- .../extension/ListToStringFilter.java | 11 +- .../extension/MapToStringFilter.java | 9 +- .../extension/TestingExtension.java | 2 +- .../extension/escaper/RawFilterTest.java | 10 +- .../lexer/IdentifierTest.java | 8 +- .../pebbletemplates}/lexer/LexerImplTest.java | 195 +++++++++--------- .../pebbletemplates}/lexer/SyntaxTest.java | 2 +- .../macro/MacroGlobalVariablesTest.java | 8 +- .../macro/PebbleExtension.java | 7 +- .../pebbletemplates}/macro/TestFilter.java | 11 +- .../macro/TestMacroCalls.java | 8 +- .../pebbletemplates}/node/ForNodeTest.java | 8 +- .../pebbletemplates}/node/IfNodeTest.java | 10 +- .../node/expression/AndExpressionTest.java | 2 +- .../node/expression/ExpressionTest.java | 8 +- .../node/expression/OrExpressionTest.java | 2 +- .../StringExpressionParserTest.java | 26 +-- .../expression/UnaryNotExpressionTest.java | 10 +- .../template/tests/PebbleTestContext.java | 10 +- ...eSpaceControlWithNewLineTrimmingTests.java | 8 +- .../template/tests/input/PebbleTestItem.java | 2 +- .../tests/input/PebbleTestItemType.java | 2 +- .../utils/LimitedSizeWriterTest.java | 6 +- .../pebbletemplates}/utils/PathUtilsTest.java | 2 +- pebble/src/test/resources/logback-test.xml | 4 +- .../security/allowedMethods.properties | 10 +- 417 files changed, 1945 insertions(+), 1867 deletions(-) rename pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/AbstractPebbleConfiguration.java (81%) rename pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/PebbleAutoConfiguration.java (85%) rename pebble-spring/{pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble => pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates}/boot/autoconfigure/PebbleProperties.java (95%) rename pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/PebbleReactiveWebConfiguration.java (80%) rename pebble-spring/{pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble => pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates}/boot/autoconfigure/PebbleServletWebConfiguration.java (78%) rename pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java (85%) rename pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/package-info.java (51%) rename pebble-spring/{pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/AppConfig.java (83%) rename pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/Application.java (86%) rename pebble-spring/{pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/Controllers.java (94%) rename pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/Foo.java (73%) rename pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/NonWebAppTests.java (80%) rename pebble-spring/{pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/autoconfigure/PebbleAutoConfigurationTest.java (86%) rename pebble-spring/{pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/autoconfigure/ReactiveAppTest.java (96%) rename pebble-spring/{pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/autoconfigure/ServletAppTest.java (96%) rename pebble-spring/pebble-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/AbstractPebbleConfiguration.java (81%) rename pebble-spring/pebble-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/PebbleAutoConfiguration.java (83%) rename pebble-spring/{pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble => pebble-spring-boot-starter/src/main/java/io/pebbletemplates}/boot/autoconfigure/PebbleProperties.java (95%) rename pebble-spring/pebble-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/PebbleReactiveWebConfiguration.java (84%) rename pebble-spring/{pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble => pebble-spring-boot-starter/src/main/java/io/pebbletemplates}/boot/autoconfigure/PebbleServletWebConfiguration.java (81%) rename pebble-spring/pebble-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java (85%) rename pebble-spring/pebble-spring-boot-starter/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/package-info.java (51%) rename pebble-spring/{pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/AppConfig.java (83%) rename pebble-spring/pebble-spring-boot-starter/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/Application.java (86%) rename pebble-spring/{pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/Controllers.java (94%) rename pebble-spring/pebble-spring-boot-starter/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/Foo.java (73%) rename pebble-spring/pebble-spring-boot-starter/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/boot/autoconfigure/NonWebAppTests.java (80%) rename pebble-spring/{pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/autoconfigure/PebbleAutoConfigurationTest.java (93%) rename pebble-spring/{pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/autoconfigure/ReactiveAppTest.java (96%) rename pebble-spring/{pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble => pebble-spring-boot-starter/src/test/java/io/pebbletemplates}/boot/autoconfigure/ServletAppTest.java (96%) rename pebble-spring/{pebble-spring6/src/main/java/com/mitchellbosecke/pebble => pebble-spring5/src/main/java/io/pebbletemplates}/spring/context/Beans.java (98%) rename pebble-spring/{pebble-spring6/src/main/java/com/mitchellbosecke/pebble => pebble-spring5/src/main/java/io/pebbletemplates}/spring/extension/SpringExtension.java (62%) rename pebble-spring/pebble-spring5/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/extension/function/HrefFunction.java (85%) rename pebble-spring/{pebble-spring6/src/main/java/com/mitchellbosecke/pebble => pebble-spring5/src/main/java/io/pebbletemplates}/spring/extension/function/MessageSourceFunction.java (85%) rename pebble-spring/pebble-spring5/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/extension/function/bindingresult/BaseBindingResultFunction.java (84%) rename pebble-spring/{pebble-spring6/src/main/java/com/mitchellbosecke/pebble => pebble-spring5/src/main/java/io/pebbletemplates}/spring/extension/function/bindingresult/GetAllErrorsFunction.java (88%) rename pebble-spring/{pebble-spring6/src/main/java/com/mitchellbosecke/pebble => pebble-spring5/src/main/java/io/pebbletemplates}/spring/extension/function/bindingresult/GetFieldErrorsFunction.java (89%) rename pebble-spring/{pebble-spring6/src/main/java/com/mitchellbosecke/pebble => pebble-spring5/src/main/java/io/pebbletemplates}/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java (88%) rename pebble-spring/pebble-spring5/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/extension/function/bindingresult/HasErrorsFunction.java (80%) rename pebble-spring/pebble-spring5/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/extension/function/bindingresult/HasFieldErrorsFunction.java (84%) rename pebble-spring/{pebble-spring6/src/main/java/com/mitchellbosecke/pebble => pebble-spring5/src/main/java/io/pebbletemplates}/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java (81%) rename pebble-spring/{pebble-spring6/src/main/java/com/mitchellbosecke/pebble => pebble-spring5/src/main/java/io/pebbletemplates}/spring/reactive/PebbleReactiveView.java (92%) rename pebble-spring/{pebble-spring6/src/main/java/com/mitchellbosecke/pebble => pebble-spring5/src/main/java/io/pebbletemplates}/spring/reactive/PebbleReactiveViewResolver.java (88%) rename pebble-spring/pebble-spring5/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/servlet/PebbleView.java (91%) rename pebble-spring/pebble-spring5/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/servlet/PebbleViewResolver.java (90%) rename pebble-spring/{pebble-spring6/src/test/java/com/mitchellbosecke/pebble => pebble-spring5/src/test/java/io/pebbletemplates}/spring/PebbleViewResolverTest.java (97%) rename pebble-spring/pebble-spring5/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/bean/SomeBean.java (86%) rename pebble-spring/pebble-spring5/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/config/MVCConfig.java (74%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/beansTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/bindingResultTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/bindingResultWithMacroTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/hrefFunctionTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/messageEnTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/messageFrTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/requestTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/responseTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/sessionTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/messages_en.properties (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/messages_fr.properties (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/beansTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/bindingResultTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/bindingResultWithMacroTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/hrefFunctionTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/messageEnTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/messageFrTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/requestTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/responseTest.html (100%) rename pebble-spring/pebble-spring5/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/sessionTest.html (100%) rename pebble-spring/{pebble-spring5/src/main/java/com/mitchellbosecke/pebble => pebble-spring6/src/main/java/io/pebbletemplates}/spring/context/Beans.java (98%) rename pebble-spring/{pebble-spring5/src/main/java/com/mitchellbosecke/pebble => pebble-spring6/src/main/java/io/pebbletemplates}/spring/extension/SpringExtension.java (62%) rename pebble-spring/pebble-spring6/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/extension/function/HrefFunction.java (85%) rename pebble-spring/{pebble-spring5/src/main/java/com/mitchellbosecke/pebble => pebble-spring6/src/main/java/io/pebbletemplates}/spring/extension/function/MessageSourceFunction.java (87%) rename pebble-spring/pebble-spring6/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/extension/function/bindingresult/BaseBindingResultFunction.java (84%) rename pebble-spring/{pebble-spring5/src/main/java/com/mitchellbosecke/pebble => pebble-spring6/src/main/java/io/pebbletemplates}/spring/extension/function/bindingresult/GetAllErrorsFunction.java (89%) rename pebble-spring/{pebble-spring5/src/main/java/com/mitchellbosecke/pebble => pebble-spring6/src/main/java/io/pebbletemplates}/spring/extension/function/bindingresult/GetFieldErrorsFunction.java (90%) rename pebble-spring/{pebble-spring5/src/main/java/com/mitchellbosecke/pebble => pebble-spring6/src/main/java/io/pebbletemplates}/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java (89%) rename pebble-spring/pebble-spring6/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/extension/function/bindingresult/HasErrorsFunction.java (82%) rename pebble-spring/pebble-spring6/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/extension/function/bindingresult/HasFieldErrorsFunction.java (85%) rename pebble-spring/{pebble-spring5/src/main/java/com/mitchellbosecke/pebble => pebble-spring6/src/main/java/io/pebbletemplates}/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java (83%) rename pebble-spring/{pebble-spring5/src/main/java/com/mitchellbosecke/pebble => pebble-spring6/src/main/java/io/pebbletemplates}/spring/reactive/PebbleReactiveView.java (92%) rename pebble-spring/{pebble-spring5/src/main/java/com/mitchellbosecke/pebble => pebble-spring6/src/main/java/io/pebbletemplates}/spring/reactive/PebbleReactiveViewResolver.java (88%) rename pebble-spring/pebble-spring6/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/servlet/PebbleView.java (91%) rename pebble-spring/pebble-spring6/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/servlet/PebbleViewResolver.java (90%) rename pebble-spring/{pebble-spring5/src/test/java/com/mitchellbosecke/pebble => pebble-spring6/src/test/java/io/pebbletemplates}/spring/PebbleViewResolverTest.java (97%) rename pebble-spring/pebble-spring6/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/bean/SomeBean.java (86%) rename pebble-spring/pebble-spring6/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/config/MVCConfig.java (74%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/beansTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/bindingResultTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/bindingResultWithMacroTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/hrefFunctionTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/messageEnTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/messageFrTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/requestTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/responseTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/expectedResponse/sessionTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/messages_en.properties (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/messages_fr.properties (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/beansTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/bindingResultTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/bindingResultWithMacroTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/hrefFunctionTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/messageEnTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/messageFrTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/requestTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/responseTest.html (100%) rename pebble-spring/pebble-spring6/src/test/resources/{com/mitchellbosecke/pebble => io/pebbletemplates}/spring/template/sessionTest.html (100%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/PebbleEngine.java (91%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/ArrayResolver.java (83%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/AttributeResolver.java (60%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/DefaultAttributeResolver.java (92%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/ListResolver.java (82%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/MacroResolver.java (73%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/MapResolver.java (88%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/MemberCacheUtils.java (97%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/ResolvedAttribute.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/methodaccess/BlacklistMethodAccessValidator.java (94%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/methodaccess/MethodAccessValidator.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/methodaccess/NoOpMethodAccessValidator.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/cache/CacheKey.java (93%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/cache/PebbleCache.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/cache/tag/CaffeineTagCache.java (83%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/cache/tag/ConcurrentMapTagCache.java (82%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/cache/tag/NoOpTagCache.java (67%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/cache/template/CaffeineTemplateCache.java (83%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/cache/template/ConcurrentMapTemplateCache.java (83%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/cache/template/NoOpTemplateCache.java (68%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/error/AttributeNotFoundException.java (94%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/error/ClassAccessException.java (93%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/error/LoaderException.java (91%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/error/ParserException.java (92%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/error/PebbleException.java (97%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/error/RootAttributeNotFoundException.java (93%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/AbstractExtension.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/AbstractNodeVisitor.java (72%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/Extension.java (87%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/ExtensionCustomizer.java (80%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/ExtensionRegistry.java (94%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/ExtensionRegistryFactory.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/Filter.java (66%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/Function.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/NamedArguments.java (87%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/NodeVisitor.java (58%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/NodeVisitorFactory.java (87%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/Test.java (66%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/AbbreviateFilter.java (82%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/AbsFilter.java (86%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/AttributeResolverExtension.java (58%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/Base64DecoderFilter.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/Base64EncoderFilter.java (71%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/CapitalizeFilter.java (83%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/CoreExtension.java (65%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/DateFilter.java (92%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/DefaultFilter.java (74%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/DefinedTest.java (74%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/EmptyTest.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/EvenTest.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/FirstFilter.java (84%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/IterableTest.java (73%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/JoinFilter.java (87%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/LastFilter.java (84%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/LengthFilter.java (84%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/LowerFilter.java (77%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/MacroAndBlockRegistrantNodeVisitor.java (69%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java (56%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/MapTest.java (71%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/MaxFunction.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/MergeFilter.java (93%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/MinFunction.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/NullTest.java (71%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/NumberFormatFilter.java (84%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/OddTest.java (73%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/RangeFunction.java (92%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/ReplaceFilter.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/ReverseFilter.java (73%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/RsortFilter.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/Sha256Filter.java (84%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/SliceFilter.java (93%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/SortFilter.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/SplitFilter.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/TitleFilter.java (82%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/TrimFilter.java (74%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/UpperFilter.java (77%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/core/UrlEncoderFilter.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/debug/DebugExtension.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/debug/PrettyPrintNodeVisitor.java (74%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/debug/PrettyPrintNodeVisitorFactory.java (52%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/escaper/EscapeFilter.java (86%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/escaper/EscaperExtension.java (85%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/escaper/EscaperNodeVisitor.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/escaper/EscaperNodeVisitorFactory.java (60%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/escaper/EscapingStrategy.java (57%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/escaper/RawFilter.java (66%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/escaper/SafeString.java (92%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/i18n/I18nExtension.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/i18n/UTF8Control.java (96%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/i18n/i18nFunction.java (86%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/writer/PooledSpecializedStringWriter.java (97%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/writer/SpecializedWriter.java (96%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/writer/StringWriterSpecializedAdapter.java (95%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/lexer/Lexer.java (88%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/lexer/LexerImpl.java (98%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/lexer/Syntax.java (99%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/lexer/TemplateSource.java (99%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/lexer/Token.java (97%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/lexer/TokenStream.java (95%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/loader/AbstractServletLoader.java (95%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/loader/ClasspathLoader.java (95%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/loader/DelegatingLoader.java (97%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/loader/DelegatingLoaderCacheKey.java (97%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/loader/FileLoader.java (95%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/loader/Loader.java (97%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/loader/Servlet5Loader.java (94%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/loader/ServletLoader.java (94%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/loader/StringLoader.java (96%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/AbstractRenderableNode.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/ArgumentsNode.java (89%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/AutoEscapeNode.java (82%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/BlockNode.java (83%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/BodyNode.java (89%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/CacheNode.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/EmbedNode.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/ExtendsNode.java (71%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/FlushNode.java (73%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/ForNode.java (91%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/FromNode.java (72%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/FunctionOrMacroNameNode.java (74%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/IfNode.java (83%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/ImportNode.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/IncludeNode.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/MacroNode.java (86%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/NamedArgumentNode.java (80%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/Node.java (74%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/ParallelNode.java (88%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/PositionalArgumentNode.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/PrintNode.java (69%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/RenderableNode.java (71%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/RootNode.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/SetNode.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/TestInvocationExpression.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/TextNode.java (82%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/AddExpression.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/AndExpression.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/ArrayExpression.java (85%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/BinaryExpression.java (93%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/BlockFunctionExpression.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/ConcatenateExpression.java (83%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/ContainsExpression.java (95%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/ContextVariableExpression.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/DivideExpression.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/EqualsExpression.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/Expression.java (69%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/FilterExpression.java (76%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/FilterInvocationExpression.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/FunctionOrMacroInvocationExpression.java (83%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/GetAttributeExpression.java (86%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/GreaterThanEqualsExpression.java (71%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/GreaterThanExpression.java (71%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/LessThanEqualsExpression.java (71%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/LessThanExpression.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/LiteralBigDecimalExpression.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/LiteralBooleanExpression.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/LiteralDoubleExpression.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/LiteralIntegerExpression.java (76%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/LiteralLongExpression.java (77%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/LiteralNullExpression.java (74%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/LiteralStringExpression.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/MapExpression.java (87%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/ModulusExpression.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/MultiplyExpression.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/NegativeTestExpression.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/NotEqualsExpression.java (71%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/OrExpression.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/ParentFunctionExpression.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/PositiveTestExpression.java (77%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/RangeExpression.java (69%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/RenderableNodeExpression.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/SubtractExpression.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/TernaryExpression.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/UnaryExpression.java (89%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/UnaryMinusExpression.java (66%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/UnaryNotExpression.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/UnaryPlusExpression.java (66%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/fornode/LazyLength.java (97%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/fornode/LazyRevIndex.java (93%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/operator/Associativity.java (85%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/operator/BinaryOperator.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/operator/BinaryOperatorImpl.java (86%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/operator/BinaryOperatorType.java (56%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/operator/UnaryOperator.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/operator/UnaryOperatorImpl.java (88%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/parser/ExpressionParser.java (90%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/parser/Parser.java (82%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/parser/ParserImpl.java (90%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/parser/ParserOptions.java (94%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/parser/StoppingCondition.java (86%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/Block.java (90%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/EvaluationContext.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/EvaluationContextImpl.java (96%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/EvaluationOptions.java (85%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/GlobalContext.java (97%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/Hierarchy.java (98%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/Macro.java (79%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/MacroAttributeProvider.java (87%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/PebbleTemplate.java (94%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/PebbleTemplateImpl.java (96%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/RenderedSizeContext.java (69%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/Scope.java (98%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/ScopeChain.java (99%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/AutoEscapeTokenParser.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/BlockTokenParser.java (82%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/CacheTokenParser.java (72%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/EmbedTokenParser.java (84%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/ExtendsTokenParser.java (67%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/FilterTokenParser.java (68%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/FlushTokenParser.java (68%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/ForTokenParser.java (77%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/FromTokenParser.java (81%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/IfTokenParser.java (80%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/ImportTokenParser.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/IncludeTokenParser.java (75%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/MacroTokenParser.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/ParallelTokenParser.java (70%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/SetTokenParser.java (69%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/TokenParser.java (84%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/tokenParser/VerbatimTokenParser.java (76%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/Callbacks.java (78%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/FutureWriter.java (98%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/LimitedSizeWriter.java (94%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/OperatorUtils.java (98%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/Pair.java (94%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/PathUtils.java (98%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/StringLengthComparator.java (92%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/StringUtils.java (95%) rename pebble/src/main/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/TypeUtils.java (98%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ArgumentsNodeTest.java (80%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ArraySyntaxTest.java (99%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/AttributeSubscriptSyntaxTest.java (95%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/CacheTest.java (97%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/CompilerTest.java (88%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ConcurrencyTest.java (97%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ContextTest.java (96%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/CoreFiltersTest.java (98%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/CoreFunctionsTest.java (98%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/CoreTagsTest.java (99%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/CoreTestsTest.java (97%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/EmbedCachingTagTest.java (85%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/EmbedTagTest.java (91%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/EnumEqualsTest.java (83%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ErrorReportingTest.java (89%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/EscaperExtensionTest.java (95%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ExtendingPebbleTest.java (83%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ForTest.java (92%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/GetAttributeTest.java (98%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/I18nExtensionTest.java (92%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/IncludeWithParameterTest.java (93%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/InheritanceTest.java (93%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/LoaderTest.java (90%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/LogicTest.java (99%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/MacroTest.java (95%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/MapSyntaxTest.java (98%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/MaxRenderedSizeTest.java (90%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/MethodAccessTemplateTest.java (93%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/NewlineTrimmingTest.java (96%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/OverloadedMethodTest.java (97%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/OverrideCoreExtensionTest.java (83%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ParsingOdditiesTest.java (95%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/RenderSingleBlockTest.java (94%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/RenderWithoutEndBlockTest.java (97%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ScopeChainTest.java (95%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/ScopeTest.java (87%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/SplitFilterTest.java (94%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/StrictModeTest.java (92%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/StringInterpolationTest.java (97%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/TernaryExpressionTest.java (97%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/TestParallelParsing.java (83%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/TestRelativePath.java (94%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/WhitespaceControlTest.java (97%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/WritingTest.java (93%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java (96%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/methodaccess/Foo.java (70%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/methodaccess/InstanceProvider.java (95%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/methodaccess/MethodsProvider.java (98%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/attributes/methodaccess/NoOpMethodAccessValidatorTest.java (87%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/ArrayToStringFilter.java (80%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/ExtensionCustomizerTest.java (87%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/InvocationCountingFunction.java (75%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/ListToStringFilter.java (78%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/MapToStringFilter.java (86%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/TestingExtension.java (94%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/extension/escaper/RawFilterTest.java (91%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/lexer/IdentifierTest.java (92%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/lexer/LexerImplTest.java (61%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/lexer/SyntaxTest.java (99%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/macro/MacroGlobalVariablesTest.java (80%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/macro/PebbleExtension.java (64%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/macro/TestFilter.java (68%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/macro/TestMacroCalls.java (96%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/ForNodeTest.java (94%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/IfNodeTest.java (90%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/AndExpressionTest.java (94%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/ExpressionTest.java (72%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/OrExpressionTest.java (94%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/StringExpressionParserTest.java (92%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/node/expression/UnaryNotExpressionTest.java (90%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/tests/PebbleTestContext.java (96%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java (95%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/tests/input/PebbleTestItem.java (93%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/template/tests/input/PebbleTestItemType.java (59%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/LimitedSizeWriterTest.java (94%) rename pebble/src/test/java/{com/mitchellbosecke/pebble => io/pebbletemplates}/utils/PathUtilsTest.java (98%) diff --git a/docs/src/orchid/resources/config.yml b/docs/src/orchid/resources/config.yml index 0b829a135..b1671024b 100644 --- a/docs/src/orchid/resources/config.yml +++ b/docs/src/orchid/resources/config.yml @@ -32,7 +32,7 @@ theme: title: 'API Docs' - type: 'page' title: 'Javadocs' - itemId: 'com.mitchellbosecke.pebble' + itemId: 'io.pebbletemplates' extraCss: - 'assets/css/pygments.scss' - 'assets/css/orchidJavadoc.scss' diff --git a/docs/src/orchid/resources/wiki/guide/spring-boot-integration.md b/docs/src/orchid/resources/wiki/guide/spring-boot-integration.md index eaf63f53e..74d12b807 100644 --- a/docs/src/orchid/resources/wiki/guide/spring-boot-integration.md +++ b/docs/src/orchid/resources/wiki/guide/spring-boot-integration.md @@ -43,7 +43,7 @@ This is enough for autoconfiguration to kick in. This includes: PLEASE NOTE: the starter depends on ``spring-boot-starter-web`` but is marked as optional, you'll need to add the dependency yourself or configure Spring MVC appropriately. ## Boot externalized configuration -A number of properties can be defined in Spring Boot externalized configuration, eg. ``application.properties``, starting with the prefix ``pebble``. See the corresponding [PebbleProperties.java](https://github.com/PebbleTemplates/pebble/blob/master/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleProperties.java) for your starter version. Notable properties are: +A number of properties can be defined in Spring Boot externalized configuration, eg. ``application.properties``, starting with the prefix ``pebble``. See the corresponding [PebbleProperties.java](https://github.com/PebbleTemplates/pebble/blob/master/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleProperties.java) for your starter version. Notable properties are: * ``pebble.prefix``: defines the prefix that will be prepended to the mvc view name. Defaults to ``/templates/`` * ``pebble.suffix``: defines the suffix that will be appended to the mvc view name. Defaults to ``.pebble`` diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/AbstractPebbleConfiguration.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/AbstractPebbleConfiguration.java similarity index 81% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/AbstractPebbleConfiguration.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/AbstractPebbleConfiguration.java index b8b9b5406..f2eb83776 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/AbstractPebbleConfiguration.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/AbstractPebbleConfiguration.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; abstract class AbstractPebbleConfiguration { diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfiguration.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java similarity index 85% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfiguration.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java index 1e56d8c9b..82a928beb 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfiguration.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java @@ -1,12 +1,13 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.attributes.methodaccess.MethodAccessValidator; -import com.mitchellbosecke.pebble.extension.Extension; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.spring.extension.SpringExtension; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.extension.Extension; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.spring.extension.SpringExtension; import java.util.List; + import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleProperties.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleProperties.java similarity index 95% rename from pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleProperties.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleProperties.java index e3cfcdc54..30dd9d56b 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleProperties.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleProperties.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import java.util.Locale; import org.springframework.boot.autoconfigure.template.AbstractTemplateViewResolverProperties; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleReactiveWebConfiguration.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java similarity index 80% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleReactiveWebConfiguration.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java index 4d40b79ff..9effc62d9 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleReactiveWebConfiguration.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.spring.reactive.PebbleReactiveViewResolver; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.spring.reactive.PebbleReactiveViewResolver; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type; @@ -16,7 +16,7 @@ class PebbleReactiveWebConfiguration extends AbstractPebbleConfiguration { @Bean @ConditionalOnMissingBean PebbleReactiveViewResolver pebbleReactiveViewResolver(PebbleProperties properties, - PebbleEngine pebbleEngine) { + PebbleEngine pebbleEngine) { String prefix = properties.getPrefix(); if (pebbleEngine.getLoader() instanceof ClasspathLoader) { // classpathloader doesn't like leading slashes in paths diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleServletWebConfiguration.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java similarity index 78% rename from pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleServletWebConfiguration.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java index b42b16a4e..93f283092 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleServletWebConfiguration.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.spring.servlet.PebbleViewResolver; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.spring.servlet.PebbleViewResolver; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type; @@ -16,7 +16,7 @@ class PebbleServletWebConfiguration extends AbstractPebbleConfiguration { @Bean @ConditionalOnMissingBean PebbleViewResolver pebbleViewResolver(PebbleProperties properties, - PebbleEngine pebbleEngine) { + PebbleEngine pebbleEngine) { PebbleViewResolver pvr = new PebbleViewResolver(pebbleEngine); properties.applyToMvcViewResolver(pvr); if (pebbleEngine.getLoader() instanceof ClasspathLoader) { diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java similarity index 85% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java index b3a52f6f3..643c3a383 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider; import org.springframework.core.env.Environment; @@ -12,7 +12,7 @@ public class PebbleTemplateAvailabilityProvider implements TemplateAvailabilityP @Override public boolean isTemplateAvailable(String view, Environment environment, ClassLoader classLoader, ResourceLoader resourceLoader) { - if (ClassUtils.isPresent("com.mitchellbosecke.pebble.PebbleEngine", classLoader)) { + if (ClassUtils.isPresent("io.pebbletemplates.PebbleEngine", classLoader)) { String prefix = environment.getProperty("pebble.prefix", PebbleProperties.DEFAULT_PREFIX); String suffix = environment.getProperty("pebble.suffix", PebbleProperties.DEFAULT_SUFFIX); return resourceLoader.getResource(CLASSPATH_URL_PREFIX + prefix + view + suffix).exists(); diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/package-info.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/package-info.java similarity index 51% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/package-info.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/package-info.java index 2066b0801..0bc3c6096 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/package-info.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/package-info.java @@ -1,4 +1,4 @@ /** * Auto-configuration for Pebble Template Engine. */ -package com.mitchellbosecke.pebble.boot.autoconfigure; \ No newline at end of file +package io.pebbletemplates.boot.autoconfigure; \ No newline at end of file diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring.factories b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring.factories index 803001fae..ebc9a97e6 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,6 +1,6 @@ # Auto Configure org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.mitchellbosecke.pebble.boot.autoconfigure.PebbleAutoConfiguration +io.pebbletemplates.boot.autoconfigure.PebbleAutoConfiguration # Template availability providers org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider=\ -com.mitchellbosecke.pebble.boot.autoconfigure.PebbleTemplateAvailabilityProvider \ No newline at end of file +io.pebbletemplates.boot.autoconfigure.PebbleTemplateAvailabilityProvider \ No newline at end of file diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/AppConfig.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java similarity index 83% rename from pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/AppConfig.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java index eca8f60f7..ef4ff5456 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/AppConfig.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java @@ -1,10 +1,10 @@ -package com.mitchellbosecke.pebble.boot; +package io.pebbletemplates.boot; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Extension; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Extension; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Application.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Application.java similarity index 86% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Application.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Application.java index 5a8c365d1..846f36d1d 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Application.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Application.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot; +package io.pebbletemplates.boot; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Controllers.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Controllers.java similarity index 94% rename from pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Controllers.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Controllers.java index 795b843de..771e7e915 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Controllers.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Controllers.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot; +package io.pebbletemplates.boot; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Foo.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Foo.java similarity index 73% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Foo.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Foo.java index f45315082..31a000ed2 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Foo.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Foo.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot; +package io.pebbletemplates.boot; import org.springframework.stereotype.Component; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/NonWebAppTests.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java similarity index 80% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/NonWebAppTests.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java index 007e81269..2a1a71da8 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/NonWebAppTests.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import static org.assertj.core.api.Assertions.assertThat; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.boot.Application; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.boot.Application; import java.io.StringWriter; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfigurationTest.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java similarity index 86% rename from pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfigurationTest.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java index 9ed885476..abdd523be 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfigurationTest.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java @@ -1,18 +1,20 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import static java.util.Locale.CHINESE; import static java.util.Locale.FRENCH; import static org.assertj.core.api.Assertions.assertThat; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.attributes.methodaccess.BlacklistMethodAccessValidator; -import com.mitchellbosecke.pebble.attributes.methodaccess.MethodAccessValidator; -import com.mitchellbosecke.pebble.attributes.methodaccess.NoOpMethodAccessValidator; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.spring.extension.SpringExtension; -import com.mitchellbosecke.pebble.spring.reactive.PebbleReactiveViewResolver; -import com.mitchellbosecke.pebble.spring.servlet.PebbleViewResolver; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.attributes.methodaccess.BlacklistMethodAccessValidator; +import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.attributes.methodaccess.NoOpMethodAccessValidator; +import io.pebbletemplates.spring.extension.SpringExtension; +import io.pebbletemplates.spring.reactive.PebbleReactiveViewResolver; +import io.pebbletemplates.spring.servlet.PebbleViewResolver; import java.util.Locale; + +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebApplicationContext; @@ -33,19 +35,19 @@ class PebbleAutoConfigurationTest { @Test void registerBeansForServletApp() { this.loadWithServlet(null); - assertThat(this.webContext.getBeansOfType(Loader.class)).hasSize(1); - assertThat(this.webContext.getBeansOfType(SpringExtension.class)).hasSize(1); - assertThat(this.webContext.getBeansOfType(PebbleEngine.class)).hasSize(1); + Assertions.assertThat(this.webContext.getBeansOfType(Loader.class)).hasSize(1); + Assertions.assertThat(this.webContext.getBeansOfType(SpringExtension.class)).hasSize(1); + Assertions.assertThat(this.webContext.getBeansOfType(PebbleEngine.class)).hasSize(1); assertThat(this.webContext.getBean(PebbleEngine.class).getDefaultLocale()) .isEqualTo(DEFAULT_LOCALE); assertThat(this.webContext.getBean(PebbleEngine.class).isStrictVariables()).isTrue(); - assertThat( + Assertions.assertThat( this.webContext.getBean(PebbleEngine.class).getEvaluationOptions().isGreedyMatchMethod()) .isTrue(); assertThat(this.webContext.getBean(PebbleEngine.class).getEvaluationOptions() .getMethodAccessValidator()).isInstanceOf( BlacklistMethodAccessValidator.class); - assertThat(this.webContext.getBeansOfType(PebbleViewResolver.class)).hasSize(1); + Assertions.assertThat(this.webContext.getBeansOfType(PebbleViewResolver.class)).hasSize(1); } @Test @@ -57,14 +59,14 @@ void registerCompilerForServletApp() { assertThat(this.webContext.getBean(PebbleEngine.class).getDefaultLocale()) .isEqualTo(CUSTOM_LOCALE); assertThat(this.webContext.getBean(PebbleEngine.class).isStrictVariables()).isFalse(); - assertThat( + Assertions.assertThat( this.webContext.getBean(PebbleEngine.class).getEvaluationOptions().isGreedyMatchMethod()) .isFalse(); assertThat(this.webContext.getBean(PebbleEngine.class).getEvaluationOptions() .getMethodAccessValidator()).isInstanceOf( BlacklistMethodAccessValidator.class); assertThat(this.webContext.getBeansOfType(PebbleViewResolver.class)).hasSize(1); - assertThat(this.webContext.getBeansOfType(PebbleReactiveViewResolver.class)).isEmpty(); + Assertions.assertThat(this.webContext.getBeansOfType(PebbleReactiveViewResolver.class)).isEmpty(); } @Test @@ -76,7 +78,7 @@ void registerCustomMethodAccessValidatorForServletApp() { assertThat(this.webContext.getBean(PebbleEngine.class).getDefaultLocale()) .isEqualTo(DEFAULT_LOCALE); assertThat(this.webContext.getBean(PebbleEngine.class).isStrictVariables()).isTrue(); - assertThat( + Assertions.assertThat( this.webContext.getBean(PebbleEngine.class).getEvaluationOptions().isGreedyMatchMethod()) .isTrue(); assertThat(this.webContext.getBean(PebbleEngine.class).getEvaluationOptions() @@ -95,7 +97,7 @@ void registerBeansForReactiveApp() { assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getDefaultLocale()) .isEqualTo(DEFAULT_LOCALE); assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).isStrictVariables()).isTrue(); - assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getEvaluationOptions() + Assertions.assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getEvaluationOptions() .isGreedyMatchMethod()).isTrue(); assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getEvaluationOptions() .getMethodAccessValidator()).isInstanceOf( @@ -114,7 +116,7 @@ void registerCompilerForReactiveApp() { assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getDefaultLocale()) .isEqualTo(CUSTOM_LOCALE); assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).isStrictVariables()).isFalse(); - assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getEvaluationOptions() + Assertions.assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getEvaluationOptions() .isGreedyMatchMethod()).isFalse(); assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getEvaluationOptions() .getMethodAccessValidator()).isInstanceOf( @@ -132,7 +134,7 @@ void registerCustomMethodAccessValidatorForReactiveApp() { assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getDefaultLocale()) .isEqualTo(DEFAULT_LOCALE); assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).isStrictVariables()).isTrue(); - assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getEvaluationOptions() + Assertions.assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getEvaluationOptions() .isGreedyMatchMethod()).isTrue(); assertThat(this.reactiveWebContext.getBean(PebbleEngine.class).getEvaluationOptions() .getMethodAccessValidator()).isInstanceOf( diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ReactiveAppTest.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ReactiveAppTest.java similarity index 96% rename from pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ReactiveAppTest.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ReactiveAppTest.java index 60d6a8b26..1ee290e54 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ReactiveAppTest.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ReactiveAppTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import static org.assertj.core.api.Assertions.assertThat; -import com.mitchellbosecke.pebble.boot.Application; +import io.pebbletemplates.boot.Application; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ServletAppTest.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ServletAppTest.java similarity index 96% rename from pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ServletAppTest.java rename to pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ServletAppTest.java index b4bdeb587..d0da2a1f8 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ServletAppTest.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ServletAppTest.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment; @@ -6,7 +6,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import com.mitchellbosecke.pebble.boot.Application; +import io.pebbletemplates.boot.Application; import java.util.Locale; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/AbstractPebbleConfiguration.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/AbstractPebbleConfiguration.java similarity index 81% rename from pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/AbstractPebbleConfiguration.java rename to pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/AbstractPebbleConfiguration.java index b8b9b5406..f2eb83776 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/AbstractPebbleConfiguration.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/AbstractPebbleConfiguration.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; abstract class AbstractPebbleConfiguration { diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfiguration.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java similarity index 83% rename from pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfiguration.java rename to pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java index b22b3c306..1779ef40c 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfiguration.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java @@ -1,11 +1,11 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.attributes.methodaccess.MethodAccessValidator; -import com.mitchellbosecke.pebble.extension.Extension; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.spring.extension.SpringExtension; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.extension.Extension; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.spring.extension.SpringExtension; import java.util.List; import org.springframework.boot.autoconfigure.AutoConfiguration; @@ -14,7 +14,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.lang.Nullable; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleProperties.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleProperties.java similarity index 95% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleProperties.java rename to pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleProperties.java index e3cfcdc54..30dd9d56b 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleProperties.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleProperties.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import java.util.Locale; import org.springframework.boot.autoconfigure.template.AbstractTemplateViewResolverProperties; diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleReactiveWebConfiguration.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java similarity index 84% rename from pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleReactiveWebConfiguration.java rename to pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java index 4d40b79ff..99728dd73 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleReactiveWebConfiguration.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.spring.reactive.PebbleReactiveViewResolver; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.spring.reactive.PebbleReactiveViewResolver; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleServletWebConfiguration.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java similarity index 81% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleServletWebConfiguration.java rename to pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java index b42b16a4e..99e767c16 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleServletWebConfiguration.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.spring.servlet.PebbleViewResolver; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.spring.servlet.PebbleViewResolver; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type; diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java similarity index 85% rename from pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java rename to pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java index b3a52f6f3..643c3a383 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider; import org.springframework.core.env.Environment; @@ -12,7 +12,7 @@ public class PebbleTemplateAvailabilityProvider implements TemplateAvailabilityP @Override public boolean isTemplateAvailable(String view, Environment environment, ClassLoader classLoader, ResourceLoader resourceLoader) { - if (ClassUtils.isPresent("com.mitchellbosecke.pebble.PebbleEngine", classLoader)) { + if (ClassUtils.isPresent("io.pebbletemplates.PebbleEngine", classLoader)) { String prefix = environment.getProperty("pebble.prefix", PebbleProperties.DEFAULT_PREFIX); String suffix = environment.getProperty("pebble.suffix", PebbleProperties.DEFAULT_SUFFIX); return resourceLoader.getResource(CLASSPATH_URL_PREFIX + prefix + view + suffix).exists(); diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/package-info.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/package-info.java similarity index 51% rename from pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/package-info.java rename to pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/package-info.java index 2066b0801..0bc3c6096 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/com/mitchellbosecke/pebble/boot/autoconfigure/package-info.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/package-info.java @@ -1,4 +1,4 @@ /** * Auto-configuration for Pebble Template Engine. */ -package com.mitchellbosecke.pebble.boot.autoconfigure; \ No newline at end of file +package io.pebbletemplates.boot.autoconfigure; \ No newline at end of file diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring.factories b/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring.factories index 8092dd538..8505e1ab1 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Template availability providers org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider=\ -com.mitchellbosecke.pebble.boot.autoconfigure.PebbleTemplateAvailabilityProvider \ No newline at end of file +io.pebbletemplates.boot.autoconfigure.PebbleTemplateAvailabilityProvider \ No newline at end of file diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 758828757..e5e1f6606 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.mitchellbosecke.pebble.boot.autoconfigure.PebbleAutoConfiguration \ No newline at end of file +io.pebbletemplates.boot.autoconfigure.PebbleAutoConfiguration \ No newline at end of file diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/AppConfig.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java similarity index 83% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/AppConfig.java rename to pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java index eca8f60f7..ef4ff5456 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/AppConfig.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java @@ -1,10 +1,10 @@ -package com.mitchellbosecke.pebble.boot; +package io.pebbletemplates.boot; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Extension; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Extension; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Application.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Application.java similarity index 86% rename from pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Application.java rename to pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Application.java index 5a8c365d1..846f36d1d 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Application.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Application.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot; +package io.pebbletemplates.boot; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Controllers.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Controllers.java similarity index 94% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Controllers.java rename to pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Controllers.java index 795b843de..771e7e915 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Controllers.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Controllers.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot; +package io.pebbletemplates.boot; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Foo.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Foo.java similarity index 73% rename from pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Foo.java rename to pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Foo.java index f45315082..31a000ed2 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/Foo.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/Foo.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot; +package io.pebbletemplates.boot; import org.springframework.stereotype.Component; diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/NonWebAppTests.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java similarity index 80% rename from pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/NonWebAppTests.java rename to pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java index 007e81269..2a1a71da8 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/NonWebAppTests.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import static org.assertj.core.api.Assertions.assertThat; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.boot.Application; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.boot.Application; import java.io.StringWriter; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfigurationTest.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java similarity index 93% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfigurationTest.java rename to pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java index 9ed885476..8cac3be8b 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/PebbleAutoConfigurationTest.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java @@ -1,17 +1,18 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import static java.util.Locale.CHINESE; import static java.util.Locale.FRENCH; import static org.assertj.core.api.Assertions.assertThat; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.attributes.methodaccess.BlacklistMethodAccessValidator; -import com.mitchellbosecke.pebble.attributes.methodaccess.MethodAccessValidator; -import com.mitchellbosecke.pebble.attributes.methodaccess.NoOpMethodAccessValidator; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.spring.extension.SpringExtension; -import com.mitchellbosecke.pebble.spring.reactive.PebbleReactiveViewResolver; -import com.mitchellbosecke.pebble.spring.servlet.PebbleViewResolver; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.attributes.methodaccess.BlacklistMethodAccessValidator; +import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.attributes.methodaccess.NoOpMethodAccessValidator; +import io.pebbletemplates.boot.autoconfigure.PebbleAutoConfiguration; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.spring.extension.SpringExtension; +import io.pebbletemplates.spring.reactive.PebbleReactiveViewResolver; +import io.pebbletemplates.spring.servlet.PebbleViewResolver; import java.util.Locale; import org.junit.jupiter.api.Test; import org.springframework.boot.test.util.TestPropertyValues; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ReactiveAppTest.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ReactiveAppTest.java similarity index 96% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ReactiveAppTest.java rename to pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ReactiveAppTest.java index 60d6a8b26..1ee290e54 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ReactiveAppTest.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ReactiveAppTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import static org.assertj.core.api.Assertions.assertThat; -import com.mitchellbosecke.pebble.boot.Application; +import io.pebbletemplates.boot.Application; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ServletAppTest.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ServletAppTest.java similarity index 96% rename from pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ServletAppTest.java rename to pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ServletAppTest.java index b4bdeb587..d0da2a1f8 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/com/mitchellbosecke/pebble/boot/autoconfigure/ServletAppTest.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/ServletAppTest.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.boot.autoconfigure; +package io.pebbletemplates.boot.autoconfigure; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment; @@ -6,7 +6,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import com.mitchellbosecke.pebble.boot.Application; +import io.pebbletemplates.boot.Application; import java.util.Locale; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/context/Beans.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/context/Beans.java similarity index 98% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/context/Beans.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/context/Beans.java index f15751127..16f3fd08d 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/context/Beans.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/context/Beans.java @@ -4,7 +4,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.context; +package io.pebbletemplates.spring.context; import java.util.Arrays; import java.util.Collection; diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/SpringExtension.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java similarity index 62% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/SpringExtension.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java index 888be297c..f6c626600 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/SpringExtension.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java @@ -4,20 +4,21 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension; +package io.pebbletemplates.spring.extension; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.spring.extension.function.HrefFunction; -import com.mitchellbosecke.pebble.spring.extension.function.MessageSourceFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.GetAllErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.GetFieldErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.GetGlobalErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.HasErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.HasFieldErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.HasGlobalErrorsFunction; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.spring.extension.function.HrefFunction; +import io.pebbletemplates.spring.extension.function.MessageSourceFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.GetAllErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.GetFieldErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.GetGlobalErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.HasErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.HasFieldErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.HasGlobalErrorsFunction; import java.util.HashMap; import java.util.Map; + import org.springframework.context.MessageSource; /** diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java similarity index 85% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java index 84988d19a..2136f335d 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java @@ -1,8 +1,9 @@ -package com.mitchellbosecke.pebble.spring.extension.function; +package io.pebbletemplates.spring.extension.function; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.extension.NamedArguments; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import org.springframework.util.StringUtils; import org.springframework.web.context.request.RequestContextHolder; @@ -74,7 +75,7 @@ private HttpServletRequest getRequest() { /** * {@inheritDoc} * - * @see com.mitchellbosecke.pebble.extension.NamedArguments#getArgumentNames() + * @see NamedArguments#getArgumentNames() */ @Override public List getArgumentNames() { diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/MessageSourceFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java similarity index 85% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/MessageSourceFunction.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java index 6ec6f5f73..78b150244 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/MessageSourceFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java @@ -4,15 +4,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function; +package io.pebbletemplates.spring.extension.function; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; + import org.springframework.context.MessageSource; /** @@ -35,7 +36,7 @@ public MessageSourceFunction(MessageSource messageSource) { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { String key = this.extractKey(args); List arguments = this.extractArguments(args); Locale locale = context.getLocale(); diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/BaseBindingResultFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java similarity index 84% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/BaseBindingResultFunction.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java index 4a42f71d0..35645a0fd 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/BaseBindingResultFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java @@ -4,11 +4,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.GlobalContext; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.GlobalContext; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetAllErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java similarity index 88% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetAllErrorsFunction.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java index cb7d7881b..e9540d92b 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetAllErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java @@ -4,14 +4,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; + import org.springframework.context.MessageSource; import org.springframework.validation.BindingResult; import org.springframework.validation.ObjectError; @@ -37,7 +38,7 @@ public GetAllErrorsFunction(MessageSource messageSource) { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { String formName = (String) args.get(PARAM_FORM_NAME); Locale locale = context.getLocale(); diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetFieldErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java similarity index 89% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetFieldErrorsFunction.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java index e29e0291e..88f256e9c 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetFieldErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java @@ -4,14 +4,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; + import org.springframework.context.MessageSource; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; @@ -37,7 +38,7 @@ public GetFieldErrorsFunction(MessageSource messageSource) { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { String formName = (String) args.get(PARAM_FORM_NAME); String field = (String) args.get(PARAM_FIELD_NAME); diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java similarity index 88% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java index 2baee6a73..bbb8a9a33 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java @@ -4,14 +4,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; + import org.springframework.context.MessageSource; import org.springframework.validation.BindingResult; import org.springframework.validation.ObjectError; @@ -37,7 +38,7 @@ public GetGlobalErrorsFunction(MessageSource messageSource) { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { String formName = (String) args.get(PARAM_FORM_NAME); Locale locale = context.getLocale(); diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java similarity index 80% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasErrorsFunction.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java index 9ed0016e3..91a99840f 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java @@ -4,11 +4,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; + import org.springframework.validation.BindingResult; /** @@ -29,7 +30,7 @@ public HasErrorsFunction() { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { String formName = (String) args.get(PARAM_FORM_NAME); BindingResult bindingResult = this.getBindingResult(formName, context); diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasFieldErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java similarity index 84% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasFieldErrorsFunction.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java index 894960ea8..f7c33461d 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasFieldErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java @@ -4,11 +4,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; + import org.springframework.validation.BindingResult; /** @@ -29,7 +30,7 @@ public HasFieldErrorsFunction() { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { String formName = (String) args.get(PARAM_FORM_NAME); String fieldName = (String) args.get(PARAM_FIELD_NAME); diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java similarity index 81% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java index bc9253aa3..7eab92535 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java @@ -4,11 +4,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; + import org.springframework.validation.BindingResult; /** @@ -29,7 +30,7 @@ public HasGlobalErrorsFunction() { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { String formName = (String) args.get(PARAM_FORM_NAME); BindingResult bindingResult = this.getBindingResult(formName, context); diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveView.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java similarity index 92% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveView.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java index 48c2c51d8..86015a756 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveView.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java @@ -1,17 +1,18 @@ -package com.mitchellbosecke.pebble.spring.reactive; +package io.pebbletemplates.spring.reactive; import static java.util.Optional.ofNullable; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.spring.context.Beans; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.spring.context.Beans; +import io.pebbletemplates.template.PebbleTemplate; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.Charset; import java.util.Locale; import java.util.Map; + import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferUtils; diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveViewResolver.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java similarity index 88% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveViewResolver.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java index 3f4a4734d..d11581687 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveViewResolver.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java @@ -1,6 +1,6 @@ -package com.mitchellbosecke.pebble.spring.reactive; +package io.pebbletemplates.spring.reactive; -import com.mitchellbosecke.pebble.PebbleEngine; +import io.pebbletemplates.PebbleEngine; import org.springframework.web.reactive.result.view.AbstractUrlBasedView; import org.springframework.web.reactive.result.view.UrlBasedViewResolver; diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleView.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java similarity index 91% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleView.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java index 34535f76a..4cddeeb28 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleView.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java @@ -4,12 +4,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.servlet; +package io.pebbletemplates.spring.servlet; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.spring.context.Beans; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.spring.context.Beans; +import io.pebbletemplates.template.PebbleTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ public class PebbleView extends AbstractTemplateView { *

*

* The value of this constant is - * com.mitchellbosecke.pebble.spring.servlet.PebbleView.timer. This allows + * io.pebbletemplates.spring.servlet.PebbleView.timer. This allows * you to set a specific configuration and/or appenders for timing info at your logging system * configuration. *

diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleViewResolver.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java similarity index 90% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleViewResolver.java rename to pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java index 01271123d..f4d04599f 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleViewResolver.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java @@ -4,10 +4,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.servlet; +package io.pebbletemplates.spring.servlet; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.Loader; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.PebbleEngine; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.servlet.view.AbstractTemplateViewResolver; import org.springframework.web.servlet.view.AbstractUrlBasedView; diff --git a/pebble-spring/pebble-spring6/src/test/java/com/mitchellbosecke/pebble/spring/PebbleViewResolverTest.java b/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/PebbleViewResolverTest.java similarity index 97% rename from pebble-spring/pebble-spring6/src/test/java/com/mitchellbosecke/pebble/spring/PebbleViewResolverTest.java rename to pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/PebbleViewResolverTest.java index e9602e64a..b7d926f44 100644 --- a/pebble-spring/pebble-spring6/src/test/java/com/mitchellbosecke/pebble/spring/PebbleViewResolverTest.java +++ b/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/PebbleViewResolverTest.java @@ -4,9 +4,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring; +package io.pebbletemplates.spring; -import com.mitchellbosecke.pebble.spring.config.MVCConfig; +import io.pebbletemplates.spring.config.MVCConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,7 +49,7 @@ class PebbleViewResolverTest { private static final String CONTEXT_PATH = "/testContextPath"; private static final Locale DEFAULT_LOCALE = Locale.CANADA; - private static final String EXPECTED_RESPONSE_PATH = "/com/mitchellbosecke/pebble/spring/expectedResponse"; + private static final String EXPECTED_RESPONSE_PATH = "/io/pebbletemplates/spring/expectedResponse"; private static final String FORM_NAME = "formName"; private BindingResult mockBindingResult = mock(BindingResult.class); diff --git a/pebble-spring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/bean/SomeBean.java b/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/bean/SomeBean.java similarity index 86% rename from pebble-spring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/bean/SomeBean.java rename to pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/bean/SomeBean.java index 21bce7b34..9a042a56a 100644 --- a/pebble-spring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/bean/SomeBean.java +++ b/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/bean/SomeBean.java @@ -4,7 +4,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.bean; +package io.pebbletemplates.spring.bean; /** * Spring bean for unit test diff --git a/pebble-spring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/config/MVCConfig.java b/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java similarity index 74% rename from pebble-spring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/config/MVCConfig.java rename to pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java index 10122412e..01c61facb 100644 --- a/pebble-spring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/config/MVCConfig.java +++ b/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java @@ -4,14 +4,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.config; +package io.pebbletemplates.spring.config; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.spring.bean.SomeBean; -import com.mitchellbosecke.pebble.spring.extension.SpringExtension; -import com.mitchellbosecke.pebble.spring.servlet.PebbleViewResolver; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.spring.bean.SomeBean; +import io.pebbletemplates.spring.extension.SpringExtension; +import io.pebbletemplates.spring.servlet.PebbleViewResolver; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -34,7 +34,7 @@ public SomeBean foo() { @Bean public MessageSource messageSource() { ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource(); - messageSource.setBasename("com.mitchellbosecke.pebble.spring.messages"); + messageSource.setBasename("io.pebbletemplates.spring.messages"); return messageSource; } @@ -62,7 +62,7 @@ public Loader templateLoader() { @Bean public ViewResolver viewResolver(PebbleEngine pebbleEngine) { PebbleViewResolver viewResolver = new PebbleViewResolver(pebbleEngine); - viewResolver.setPrefix("com/mitchellbosecke/pebble/spring/template/"); + viewResolver.setPrefix("io/pebbletemplates/spring/template/"); viewResolver.setSuffix(".html"); viewResolver.setContentType("text/html"); return viewResolver; diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/beansTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/beansTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/beansTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/beansTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/bindingResultTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/bindingResultTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/bindingResultTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/bindingResultTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/bindingResultWithMacroTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/bindingResultWithMacroTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/bindingResultWithMacroTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/bindingResultWithMacroTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/hrefFunctionTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/hrefFunctionTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/hrefFunctionTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/hrefFunctionTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/messageEnTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/messageEnTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/messageEnTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/messageEnTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/messageFrTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/messageFrTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/messageFrTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/messageFrTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/requestTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/requestTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/requestTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/requestTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/responseTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/responseTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/responseTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/responseTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/sessionTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/sessionTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/sessionTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/expectedResponse/sessionTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/messages_en.properties b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/messages_en.properties similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/messages_en.properties rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/messages_en.properties diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/messages_fr.properties b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/messages_fr.properties similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/messages_fr.properties rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/messages_fr.properties diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/beansTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/beansTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/beansTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/beansTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/bindingResultTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/bindingResultTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/bindingResultTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/bindingResultTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/bindingResultWithMacroTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/bindingResultWithMacroTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/bindingResultWithMacroTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/bindingResultWithMacroTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/hrefFunctionTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/hrefFunctionTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/hrefFunctionTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/hrefFunctionTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/messageEnTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/messageEnTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/messageEnTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/messageEnTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/messageFrTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/messageFrTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/messageFrTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/messageFrTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/requestTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/requestTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/requestTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/requestTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/responseTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/responseTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/responseTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/responseTest.html diff --git a/pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/sessionTest.html b/pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/sessionTest.html similarity index 100% rename from pebble-spring/pebble-spring5/src/test/resources/com/mitchellbosecke/pebble/spring/template/sessionTest.html rename to pebble-spring/pebble-spring5/src/test/resources/io/pebbletemplates/spring/template/sessionTest.html diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/context/Beans.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/context/Beans.java similarity index 98% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/context/Beans.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/context/Beans.java index f15751127..16f3fd08d 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/context/Beans.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/context/Beans.java @@ -4,7 +4,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.context; +package io.pebbletemplates.spring.context; import java.util.Arrays; import java.util.Collection; diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/SpringExtension.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java similarity index 62% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/SpringExtension.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java index 888be297c..f6c626600 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/SpringExtension.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java @@ -4,20 +4,21 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension; +package io.pebbletemplates.spring.extension; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.spring.extension.function.HrefFunction; -import com.mitchellbosecke.pebble.spring.extension.function.MessageSourceFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.GetAllErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.GetFieldErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.GetGlobalErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.HasErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.HasFieldErrorsFunction; -import com.mitchellbosecke.pebble.spring.extension.function.bindingresult.HasGlobalErrorsFunction; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.spring.extension.function.HrefFunction; +import io.pebbletemplates.spring.extension.function.MessageSourceFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.GetAllErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.GetFieldErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.GetGlobalErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.HasErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.HasFieldErrorsFunction; +import io.pebbletemplates.spring.extension.function.bindingresult.HasGlobalErrorsFunction; import java.util.HashMap; import java.util.Map; + import org.springframework.context.MessageSource; /** diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java similarity index 85% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java index 2219994c5..2f1ec7883 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/HrefFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java @@ -1,8 +1,9 @@ -package com.mitchellbosecke.pebble.spring.extension.function; +package io.pebbletemplates.spring.extension.function; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.extension.NamedArguments; import jakarta.servlet.http.HttpServletRequest; import org.springframework.util.StringUtils; import org.springframework.web.context.request.RequestContextHolder; @@ -72,7 +73,7 @@ private HttpServletRequest getRequest() { /** * {@inheritDoc} * - * @see com.mitchellbosecke.pebble.extension.NamedArguments#getArgumentNames() + * @see NamedArguments#getArgumentNames() */ @Override public List getArgumentNames() { diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/MessageSourceFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java similarity index 87% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/MessageSourceFunction.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java index 6ec6f5f73..a4365ec9b 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/MessageSourceFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java @@ -4,11 +4,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function; +package io.pebbletemplates.spring.extension.function; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/BaseBindingResultFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java similarity index 84% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/BaseBindingResultFunction.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java index 4a42f71d0..35645a0fd 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/BaseBindingResultFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java @@ -4,11 +4,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.GlobalContext; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.GlobalContext; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetAllErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java similarity index 89% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetAllErrorsFunction.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java index cb7d7881b..a656cdf80 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetAllErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java @@ -4,10 +4,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetFieldErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java similarity index 90% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetFieldErrorsFunction.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java index e29e0291e..dfc7f3856 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetFieldErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java @@ -4,10 +4,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java similarity index 89% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java index 2baee6a73..562d1d61c 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java @@ -4,10 +4,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java similarity index 82% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasErrorsFunction.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java index 9ed0016e3..80ac4e4fb 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java @@ -4,10 +4,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasFieldErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java similarity index 85% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasFieldErrorsFunction.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java index 894960ea8..d8eec6a22 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasFieldErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java @@ -4,10 +4,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java similarity index 83% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java index bc9253aa3..5fa598e95 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java @@ -4,10 +4,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.extension.function.bindingresult; +package io.pebbletemplates.spring.extension.function.bindingresult; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveView.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java similarity index 92% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveView.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java index 48c2c51d8..9820751f0 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveView.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java @@ -1,11 +1,11 @@ -package com.mitchellbosecke.pebble.spring.reactive; +package io.pebbletemplates.spring.reactive; import static java.util.Optional.ofNullable; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.spring.context.Beans; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.spring.context.Beans; +import io.pebbletemplates.template.PebbleTemplate; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; diff --git a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveViewResolver.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java similarity index 88% rename from pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveViewResolver.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java index 3f4a4734d..d11581687 100644 --- a/pebble-spring/pebble-spring5/src/main/java/com/mitchellbosecke/pebble/spring/reactive/PebbleReactiveViewResolver.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java @@ -1,6 +1,6 @@ -package com.mitchellbosecke.pebble.spring.reactive; +package io.pebbletemplates.spring.reactive; -import com.mitchellbosecke.pebble.PebbleEngine; +import io.pebbletemplates.PebbleEngine; import org.springframework.web.reactive.result.view.AbstractUrlBasedView; import org.springframework.web.reactive.result.view.UrlBasedViewResolver; diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleView.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java similarity index 91% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleView.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java index 80404b4bc..6fee497f2 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleView.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java @@ -4,12 +4,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.servlet; +package io.pebbletemplates.spring.servlet; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.spring.context.Beans; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.spring.context.Beans; +import io.pebbletemplates.template.PebbleTemplate; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; @@ -37,7 +37,7 @@ public class PebbleView extends AbstractTemplateView { *

*

* The value of this constant is - * com.mitchellbosecke.pebble.spring.servlet.PebbleView.timer. This allows + * io.pebbletemplates.servlet.spring.PebbleView.timer. This allows * you to set a specific configuration and/or appenders for timing info at your logging system * configuration. *

diff --git a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleViewResolver.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java similarity index 90% rename from pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleViewResolver.java rename to pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java index 01271123d..9bf7b4b3b 100644 --- a/pebble-spring/pebble-spring6/src/main/java/com/mitchellbosecke/pebble/spring/servlet/PebbleViewResolver.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java @@ -4,10 +4,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.servlet; +package io.pebbletemplates.spring.servlet; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.Loader; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.loader.Loader; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.servlet.view.AbstractTemplateViewResolver; import org.springframework.web.servlet.view.AbstractUrlBasedView; diff --git a/pebble-spring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/PebbleViewResolverTest.java b/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/PebbleViewResolverTest.java similarity index 97% rename from pebble-spring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/PebbleViewResolverTest.java rename to pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/PebbleViewResolverTest.java index e9602e64a..b7d926f44 100644 --- a/pebble-spring/pebble-spring5/src/test/java/com/mitchellbosecke/pebble/spring/PebbleViewResolverTest.java +++ b/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/PebbleViewResolverTest.java @@ -4,9 +4,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring; +package io.pebbletemplates.spring; -import com.mitchellbosecke.pebble.spring.config.MVCConfig; +import io.pebbletemplates.spring.config.MVCConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,7 +49,7 @@ class PebbleViewResolverTest { private static final String CONTEXT_PATH = "/testContextPath"; private static final Locale DEFAULT_LOCALE = Locale.CANADA; - private static final String EXPECTED_RESPONSE_PATH = "/com/mitchellbosecke/pebble/spring/expectedResponse"; + private static final String EXPECTED_RESPONSE_PATH = "/io/pebbletemplates/spring/expectedResponse"; private static final String FORM_NAME = "formName"; private BindingResult mockBindingResult = mock(BindingResult.class); diff --git a/pebble-spring/pebble-spring6/src/test/java/com/mitchellbosecke/pebble/spring/bean/SomeBean.java b/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/bean/SomeBean.java similarity index 86% rename from pebble-spring/pebble-spring6/src/test/java/com/mitchellbosecke/pebble/spring/bean/SomeBean.java rename to pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/bean/SomeBean.java index 21bce7b34..9a042a56a 100644 --- a/pebble-spring/pebble-spring6/src/test/java/com/mitchellbosecke/pebble/spring/bean/SomeBean.java +++ b/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/bean/SomeBean.java @@ -4,7 +4,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.bean; +package io.pebbletemplates.spring.bean; /** * Spring bean for unit test diff --git a/pebble-spring/pebble-spring6/src/test/java/com/mitchellbosecke/pebble/spring/config/MVCConfig.java b/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java similarity index 74% rename from pebble-spring/pebble-spring6/src/test/java/com/mitchellbosecke/pebble/spring/config/MVCConfig.java rename to pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java index 10122412e..01c61facb 100644 --- a/pebble-spring/pebble-spring6/src/test/java/com/mitchellbosecke/pebble/spring/config/MVCConfig.java +++ b/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java @@ -4,14 +4,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.spring.config; +package io.pebbletemplates.spring.config; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.spring.bean.SomeBean; -import com.mitchellbosecke.pebble.spring.extension.SpringExtension; -import com.mitchellbosecke.pebble.spring.servlet.PebbleViewResolver; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.spring.bean.SomeBean; +import io.pebbletemplates.spring.extension.SpringExtension; +import io.pebbletemplates.spring.servlet.PebbleViewResolver; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -34,7 +34,7 @@ public SomeBean foo() { @Bean public MessageSource messageSource() { ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource(); - messageSource.setBasename("com.mitchellbosecke.pebble.spring.messages"); + messageSource.setBasename("io.pebbletemplates.spring.messages"); return messageSource; } @@ -62,7 +62,7 @@ public Loader templateLoader() { @Bean public ViewResolver viewResolver(PebbleEngine pebbleEngine) { PebbleViewResolver viewResolver = new PebbleViewResolver(pebbleEngine); - viewResolver.setPrefix("com/mitchellbosecke/pebble/spring/template/"); + viewResolver.setPrefix("io/pebbletemplates/spring/template/"); viewResolver.setSuffix(".html"); viewResolver.setContentType("text/html"); return viewResolver; diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/beansTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/beansTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/beansTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/beansTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/bindingResultTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/bindingResultTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/bindingResultTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/bindingResultTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/bindingResultWithMacroTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/bindingResultWithMacroTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/bindingResultWithMacroTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/bindingResultWithMacroTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/hrefFunctionTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/hrefFunctionTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/hrefFunctionTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/hrefFunctionTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/messageEnTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/messageEnTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/messageEnTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/messageEnTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/messageFrTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/messageFrTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/messageFrTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/messageFrTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/requestTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/requestTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/requestTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/requestTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/responseTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/responseTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/responseTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/responseTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/sessionTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/sessionTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/expectedResponse/sessionTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/expectedResponse/sessionTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/messages_en.properties b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/messages_en.properties similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/messages_en.properties rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/messages_en.properties diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/messages_fr.properties b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/messages_fr.properties similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/messages_fr.properties rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/messages_fr.properties diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/beansTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/beansTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/beansTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/beansTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/bindingResultTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/bindingResultTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/bindingResultTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/bindingResultTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/bindingResultWithMacroTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/bindingResultWithMacroTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/bindingResultWithMacroTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/bindingResultWithMacroTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/hrefFunctionTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/hrefFunctionTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/hrefFunctionTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/hrefFunctionTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/messageEnTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/messageEnTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/messageEnTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/messageEnTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/messageFrTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/messageFrTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/messageFrTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/messageFrTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/requestTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/requestTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/requestTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/requestTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/responseTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/responseTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/responseTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/responseTest.html diff --git a/pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/sessionTest.html b/pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/sessionTest.html similarity index 100% rename from pebble-spring/pebble-spring6/src/test/resources/com/mitchellbosecke/pebble/spring/template/sessionTest.html rename to pebble-spring/pebble-spring6/src/test/resources/io/pebbletemplates/spring/template/sessionTest.html diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/PebbleEngine.java b/pebble/src/main/java/io/pebbletemplates/PebbleEngine.java similarity index 91% rename from pebble/src/main/java/com/mitchellbosecke/pebble/PebbleEngine.java rename to pebble/src/main/java/io/pebbletemplates/PebbleEngine.java index 7e5d0109a..a7a92bfd3 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/PebbleEngine.java +++ b/pebble/src/main/java/io/pebbletemplates/PebbleEngine.java @@ -6,35 +6,35 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; - - -import com.mitchellbosecke.pebble.attributes.methodaccess.BlacklistMethodAccessValidator; -import com.mitchellbosecke.pebble.attributes.methodaccess.MethodAccessValidator; -import com.mitchellbosecke.pebble.cache.CacheKey; -import com.mitchellbosecke.pebble.cache.PebbleCache; -import com.mitchellbosecke.pebble.cache.tag.ConcurrentMapTagCache; -import com.mitchellbosecke.pebble.cache.tag.NoOpTagCache; -import com.mitchellbosecke.pebble.cache.template.ConcurrentMapTemplateCache; -import com.mitchellbosecke.pebble.cache.template.NoOpTemplateCache; -import com.mitchellbosecke.pebble.error.LoaderException; -import com.mitchellbosecke.pebble.extension.*; -import com.mitchellbosecke.pebble.extension.escaper.EscapingStrategy; -import com.mitchellbosecke.pebble.lexer.LexerImpl; -import com.mitchellbosecke.pebble.lexer.Syntax; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.loader.DelegatingLoader; -import com.mitchellbosecke.pebble.loader.FileLoader; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.parser.Parser; -import com.mitchellbosecke.pebble.parser.ParserImpl; -import com.mitchellbosecke.pebble.parser.ParserOptions; -import com.mitchellbosecke.pebble.template.EvaluationOptions; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +package io.pebbletemplates; + + +import io.pebbletemplates.cache.CacheKey; +import io.pebbletemplates.cache.PebbleCache; +import io.pebbletemplates.cache.tag.ConcurrentMapTagCache; +import io.pebbletemplates.cache.tag.NoOpTagCache; +import io.pebbletemplates.cache.template.ConcurrentMapTemplateCache; +import io.pebbletemplates.cache.template.NoOpTemplateCache; +import io.pebbletemplates.error.LoaderException; +import io.pebbletemplates.extension.*; +import io.pebbletemplates.lexer.LexerImpl; +import io.pebbletemplates.lexer.Syntax; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.RootNode; +import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.parser.ParserImpl; +import io.pebbletemplates.parser.ParserOptions; +import io.pebbletemplates.attributes.methodaccess.BlacklistMethodAccessValidator; +import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.extension.escaper.EscapingStrategy; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.loader.DelegatingLoader; +import io.pebbletemplates.loader.FileLoader; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.EvaluationOptions; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; @@ -43,6 +43,7 @@ import java.util.concurrent.ExecutorService; import java.util.function.Function; +import io.pebbletemplates.utils.TypeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -550,7 +551,7 @@ public Builder literalNumbersAsBigDecimals(boolean literalNumbersAsBigDecimals) * * @param greedyMatchMethod toggle to enable/disable greedy match method * @return This builder object - * @see com.mitchellbosecke.pebble.utils.TypeUtils#compatibleCast(Object, Class) + * @see TypeUtils#compatibleCast(Object, Class) */ public Builder greedyMatchMethod(boolean greedyMatchMethod) { this.greedyMatchMethod = greedyMatchMethod; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/ArrayResolver.java b/pebble/src/main/java/io/pebbletemplates/attributes/ArrayResolver.java similarity index 83% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/ArrayResolver.java rename to pebble/src/main/java/io/pebbletemplates/attributes/ArrayResolver.java index a9f300137..fc0bd8977 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/ArrayResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/ArrayResolver.java @@ -1,8 +1,9 @@ -package com.mitchellbosecke.pebble.attributes; +package io.pebbletemplates.attributes; + +import io.pebbletemplates.error.AttributeNotFoundException; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.error.AttributeNotFoundException; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; import java.lang.reflect.Array; class ArrayResolver implements AttributeResolver { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/AttributeResolver.java b/pebble/src/main/java/io/pebbletemplates/attributes/AttributeResolver.java similarity index 60% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/AttributeResolver.java rename to pebble/src/main/java/io/pebbletemplates/attributes/AttributeResolver.java index 0897aca5c..50ff05cf3 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/AttributeResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/AttributeResolver.java @@ -1,7 +1,7 @@ -package com.mitchellbosecke.pebble.attributes; +package io.pebbletemplates.attributes; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; public interface AttributeResolver { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/DefaultAttributeResolver.java b/pebble/src/main/java/io/pebbletemplates/attributes/DefaultAttributeResolver.java similarity index 92% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/DefaultAttributeResolver.java rename to pebble/src/main/java/io/pebbletemplates/attributes/DefaultAttributeResolver.java index f36211954..90de96f79 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/DefaultAttributeResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/DefaultAttributeResolver.java @@ -1,9 +1,10 @@ -package com.mitchellbosecke.pebble.attributes; +package io.pebbletemplates.attributes; + +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.MacroAttributeProvider; +import io.pebbletemplates.utils.TypeUtils; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.MacroAttributeProvider; -import com.mitchellbosecke.pebble.utils.TypeUtils; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Member; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/ListResolver.java b/pebble/src/main/java/io/pebbletemplates/attributes/ListResolver.java similarity index 82% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/ListResolver.java rename to pebble/src/main/java/io/pebbletemplates/attributes/ListResolver.java index 6167dd1b0..608e1a73d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/ListResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/ListResolver.java @@ -1,8 +1,9 @@ -package com.mitchellbosecke.pebble.attributes; +package io.pebbletemplates.attributes; + +import io.pebbletemplates.error.AttributeNotFoundException; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.error.AttributeNotFoundException; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; import java.util.List; class ListResolver implements AttributeResolver { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/MacroResolver.java b/pebble/src/main/java/io/pebbletemplates/attributes/MacroResolver.java similarity index 73% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/MacroResolver.java rename to pebble/src/main/java/io/pebbletemplates/attributes/MacroResolver.java index 27cced4cf..8bee3b405 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/MacroResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/MacroResolver.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.attributes; +package io.pebbletemplates.attributes; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.MacroAttributeProvider; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.MacroAttributeProvider; class MacroResolver implements AttributeResolver { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/MapResolver.java b/pebble/src/main/java/io/pebbletemplates/attributes/MapResolver.java similarity index 88% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/MapResolver.java rename to pebble/src/main/java/io/pebbletemplates/attributes/MapResolver.java index b1c33e871..d947f5db2 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/MapResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/MapResolver.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.attributes; +package io.pebbletemplates.attributes; -import com.mitchellbosecke.pebble.error.AttributeNotFoundException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.error.AttributeNotFoundException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/MemberCacheUtils.java b/pebble/src/main/java/io/pebbletemplates/attributes/MemberCacheUtils.java similarity index 97% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/MemberCacheUtils.java rename to pebble/src/main/java/io/pebbletemplates/attributes/MemberCacheUtils.java index 79a14daaa..36e150b46 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/MemberCacheUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/MemberCacheUtils.java @@ -1,8 +1,9 @@ -package com.mitchellbosecke.pebble.attributes; +package io.pebbletemplates.attributes; + +import io.pebbletemplates.error.ClassAccessException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.EvaluationOptions; -import com.mitchellbosecke.pebble.error.ClassAccessException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.EvaluationOptions; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Member; import java.lang.reflect.Method; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/ResolvedAttribute.java b/pebble/src/main/java/io/pebbletemplates/attributes/ResolvedAttribute.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/ResolvedAttribute.java rename to pebble/src/main/java/io/pebbletemplates/attributes/ResolvedAttribute.java index f8fa77d07..b03d99675 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/ResolvedAttribute.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/ResolvedAttribute.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.attributes; +package io.pebbletemplates.attributes; public final class ResolvedAttribute { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/methodaccess/BlacklistMethodAccessValidator.java b/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidator.java similarity index 94% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/methodaccess/BlacklistMethodAccessValidator.java rename to pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidator.java index c5083da68..9661c700e 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/methodaccess/BlacklistMethodAccessValidator.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidator.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.attributes.methodaccess; +package io.pebbletemplates.attributes.methodaccess; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Method; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/methodaccess/MethodAccessValidator.java b/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/MethodAccessValidator.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/methodaccess/MethodAccessValidator.java rename to pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/MethodAccessValidator.java index c5187f5d1..de1dc2105 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/methodaccess/MethodAccessValidator.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/MethodAccessValidator.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.attributes.methodaccess; +package io.pebbletemplates.attributes.methodaccess; import java.lang.reflect.Method; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/methodaccess/NoOpMethodAccessValidator.java b/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidator.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/attributes/methodaccess/NoOpMethodAccessValidator.java rename to pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidator.java index 7aa43ce9d..a12a7f774 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/attributes/methodaccess/NoOpMethodAccessValidator.java +++ b/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidator.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.attributes.methodaccess; +package io.pebbletemplates.attributes.methodaccess; import java.lang.reflect.Method; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/CacheKey.java b/pebble/src/main/java/io/pebbletemplates/cache/CacheKey.java similarity index 93% rename from pebble/src/main/java/com/mitchellbosecke/pebble/cache/CacheKey.java rename to pebble/src/main/java/io/pebbletemplates/cache/CacheKey.java index 1f208befd..4e920bf58 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/CacheKey.java +++ b/pebble/src/main/java/io/pebbletemplates/cache/CacheKey.java @@ -1,6 +1,6 @@ -package com.mitchellbosecke.pebble.cache; +package io.pebbletemplates.cache; -import com.mitchellbosecke.pebble.node.CacheNode; +import io.pebbletemplates.node.CacheNode; import java.util.Locale; /** diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/PebbleCache.java b/pebble/src/main/java/io/pebbletemplates/cache/PebbleCache.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/cache/PebbleCache.java rename to pebble/src/main/java/io/pebbletemplates/cache/PebbleCache.java index e6cbd82e7..8b17b2550 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/PebbleCache.java +++ b/pebble/src/main/java/io/pebbletemplates/cache/PebbleCache.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.cache; +package io.pebbletemplates.cache; import java.util.function.Function; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/tag/CaffeineTagCache.java b/pebble/src/main/java/io/pebbletemplates/cache/tag/CaffeineTagCache.java similarity index 83% rename from pebble/src/main/java/com/mitchellbosecke/pebble/cache/tag/CaffeineTagCache.java rename to pebble/src/main/java/io/pebbletemplates/cache/tag/CaffeineTagCache.java index b8f88a482..5d20cd3b7 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/tag/CaffeineTagCache.java +++ b/pebble/src/main/java/io/pebbletemplates/cache/tag/CaffeineTagCache.java @@ -1,9 +1,10 @@ -package com.mitchellbosecke.pebble.cache.tag; +package io.pebbletemplates.cache.tag; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.mitchellbosecke.pebble.cache.CacheKey; -import com.mitchellbosecke.pebble.cache.PebbleCache; +import io.pebbletemplates.cache.CacheKey; +import io.pebbletemplates.cache.PebbleCache; + import java.util.function.Function; public class CaffeineTagCache implements PebbleCache { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/tag/ConcurrentMapTagCache.java b/pebble/src/main/java/io/pebbletemplates/cache/tag/ConcurrentMapTagCache.java similarity index 82% rename from pebble/src/main/java/com/mitchellbosecke/pebble/cache/tag/ConcurrentMapTagCache.java rename to pebble/src/main/java/io/pebbletemplates/cache/tag/ConcurrentMapTagCache.java index 296f8c85b..ed15f4ed0 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/tag/ConcurrentMapTagCache.java +++ b/pebble/src/main/java/io/pebbletemplates/cache/tag/ConcurrentMapTagCache.java @@ -1,7 +1,8 @@ -package com.mitchellbosecke.pebble.cache.tag; +package io.pebbletemplates.cache.tag; + +import io.pebbletemplates.cache.CacheKey; +import io.pebbletemplates.cache.PebbleCache; -import com.mitchellbosecke.pebble.cache.CacheKey; -import com.mitchellbosecke.pebble.cache.PebbleCache; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Function; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/tag/NoOpTagCache.java b/pebble/src/main/java/io/pebbletemplates/cache/tag/NoOpTagCache.java similarity index 67% rename from pebble/src/main/java/com/mitchellbosecke/pebble/cache/tag/NoOpTagCache.java rename to pebble/src/main/java/io/pebbletemplates/cache/tag/NoOpTagCache.java index 8c0f41494..fd2aaa98c 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/tag/NoOpTagCache.java +++ b/pebble/src/main/java/io/pebbletemplates/cache/tag/NoOpTagCache.java @@ -1,7 +1,8 @@ -package com.mitchellbosecke.pebble.cache.tag; +package io.pebbletemplates.cache.tag; + +import io.pebbletemplates.cache.CacheKey; +import io.pebbletemplates.cache.PebbleCache; -import com.mitchellbosecke.pebble.cache.CacheKey; -import com.mitchellbosecke.pebble.cache.PebbleCache; import java.util.function.Function; public class NoOpTagCache implements PebbleCache { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/template/CaffeineTemplateCache.java b/pebble/src/main/java/io/pebbletemplates/cache/template/CaffeineTemplateCache.java similarity index 83% rename from pebble/src/main/java/com/mitchellbosecke/pebble/cache/template/CaffeineTemplateCache.java rename to pebble/src/main/java/io/pebbletemplates/cache/template/CaffeineTemplateCache.java index f0efda7eb..0584b4659 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/template/CaffeineTemplateCache.java +++ b/pebble/src/main/java/io/pebbletemplates/cache/template/CaffeineTemplateCache.java @@ -1,9 +1,10 @@ -package com.mitchellbosecke.pebble.cache.template; +package io.pebbletemplates.cache.template; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.mitchellbosecke.pebble.cache.PebbleCache; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.cache.PebbleCache; +import io.pebbletemplates.template.PebbleTemplate; + import java.util.function.Function; public class CaffeineTemplateCache implements PebbleCache { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/template/ConcurrentMapTemplateCache.java b/pebble/src/main/java/io/pebbletemplates/cache/template/ConcurrentMapTemplateCache.java similarity index 83% rename from pebble/src/main/java/com/mitchellbosecke/pebble/cache/template/ConcurrentMapTemplateCache.java rename to pebble/src/main/java/io/pebbletemplates/cache/template/ConcurrentMapTemplateCache.java index 125fe65d9..ebd72fe20 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/template/ConcurrentMapTemplateCache.java +++ b/pebble/src/main/java/io/pebbletemplates/cache/template/ConcurrentMapTemplateCache.java @@ -1,7 +1,8 @@ -package com.mitchellbosecke.pebble.cache.template; +package io.pebbletemplates.cache.template; + +import io.pebbletemplates.cache.PebbleCache; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.cache.PebbleCache; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Function; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/template/NoOpTemplateCache.java b/pebble/src/main/java/io/pebbletemplates/cache/template/NoOpTemplateCache.java similarity index 68% rename from pebble/src/main/java/com/mitchellbosecke/pebble/cache/template/NoOpTemplateCache.java rename to pebble/src/main/java/io/pebbletemplates/cache/template/NoOpTemplateCache.java index 5ce04a12a..cc216aa4d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/cache/template/NoOpTemplateCache.java +++ b/pebble/src/main/java/io/pebbletemplates/cache/template/NoOpTemplateCache.java @@ -1,7 +1,8 @@ -package com.mitchellbosecke.pebble.cache.template; +package io.pebbletemplates.cache.template; + +import io.pebbletemplates.cache.PebbleCache; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.cache.PebbleCache; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.function.Function; public class NoOpTemplateCache implements PebbleCache { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/error/AttributeNotFoundException.java b/pebble/src/main/java/io/pebbletemplates/error/AttributeNotFoundException.java similarity index 94% rename from pebble/src/main/java/com/mitchellbosecke/pebble/error/AttributeNotFoundException.java rename to pebble/src/main/java/io/pebbletemplates/error/AttributeNotFoundException.java index 5488b76cc..da783292d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/error/AttributeNotFoundException.java +++ b/pebble/src/main/java/io/pebbletemplates/error/AttributeNotFoundException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.error; +package io.pebbletemplates.error; public class AttributeNotFoundException extends PebbleException { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/error/ClassAccessException.java b/pebble/src/main/java/io/pebbletemplates/error/ClassAccessException.java similarity index 93% rename from pebble/src/main/java/com/mitchellbosecke/pebble/error/ClassAccessException.java rename to pebble/src/main/java/io/pebbletemplates/error/ClassAccessException.java index 4f336ab97..940197e07 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/error/ClassAccessException.java +++ b/pebble/src/main/java/io/pebbletemplates/error/ClassAccessException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.error; +package io.pebbletemplates.error; import java.lang.reflect.Method; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/error/LoaderException.java b/pebble/src/main/java/io/pebbletemplates/error/LoaderException.java similarity index 91% rename from pebble/src/main/java/com/mitchellbosecke/pebble/error/LoaderException.java rename to pebble/src/main/java/io/pebbletemplates/error/LoaderException.java index 4323450ed..95b062adf 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/error/LoaderException.java +++ b/pebble/src/main/java/io/pebbletemplates/error/LoaderException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.error; +package io.pebbletemplates.error; public class LoaderException extends PebbleException { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/error/ParserException.java b/pebble/src/main/java/io/pebbletemplates/error/ParserException.java similarity index 92% rename from pebble/src/main/java/com/mitchellbosecke/pebble/error/ParserException.java rename to pebble/src/main/java/io/pebbletemplates/error/ParserException.java index 425c3e198..d821f52b3 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/error/ParserException.java +++ b/pebble/src/main/java/io/pebbletemplates/error/ParserException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.error; +package io.pebbletemplates.error; public class ParserException extends PebbleException { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/error/PebbleException.java b/pebble/src/main/java/io/pebbletemplates/error/PebbleException.java similarity index 97% rename from pebble/src/main/java/com/mitchellbosecke/pebble/error/PebbleException.java rename to pebble/src/main/java/io/pebbletemplates/error/PebbleException.java index a8399db0f..c52dc3133 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/error/PebbleException.java +++ b/pebble/src/main/java/io/pebbletemplates/error/PebbleException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.error; +package io.pebbletemplates.error; public class PebbleException extends RuntimeException { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/error/RootAttributeNotFoundException.java b/pebble/src/main/java/io/pebbletemplates/error/RootAttributeNotFoundException.java similarity index 93% rename from pebble/src/main/java/com/mitchellbosecke/pebble/error/RootAttributeNotFoundException.java rename to pebble/src/main/java/io/pebbletemplates/error/RootAttributeNotFoundException.java index 899f9cb71..30948b47b 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/error/RootAttributeNotFoundException.java +++ b/pebble/src/main/java/io/pebbletemplates/error/RootAttributeNotFoundException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.error; +package io.pebbletemplates.error; public class RootAttributeNotFoundException extends AttributeNotFoundException { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/AbstractExtension.java b/pebble/src/main/java/io/pebbletemplates/extension/AbstractExtension.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/AbstractExtension.java rename to pebble/src/main/java/io/pebbletemplates/extension/AbstractExtension.java index 6dc00769a..a5190cb92 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/AbstractExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/AbstractExtension.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.attributes.AttributeResolver; -import com.mitchellbosecke.pebble.operator.BinaryOperator; -import com.mitchellbosecke.pebble.operator.UnaryOperator; -import com.mitchellbosecke.pebble.tokenParser.TokenParser; +import io.pebbletemplates.attributes.AttributeResolver; +import io.pebbletemplates.operator.BinaryOperator; +import io.pebbletemplates.operator.UnaryOperator; +import io.pebbletemplates.tokenParser.TokenParser; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/AbstractNodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/extension/AbstractNodeVisitor.java similarity index 72% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/AbstractNodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/extension/AbstractNodeVisitor.java index 2827bf1fd..64a83622b 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/AbstractNodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/AbstractNodeVisitor.java @@ -6,30 +6,30 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; - -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.AutoEscapeNode; -import com.mitchellbosecke.pebble.node.BlockNode; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.ExtendsNode; -import com.mitchellbosecke.pebble.node.FlushNode; -import com.mitchellbosecke.pebble.node.ForNode; -import com.mitchellbosecke.pebble.node.IfNode; -import com.mitchellbosecke.pebble.node.ImportNode; -import com.mitchellbosecke.pebble.node.IncludeNode; -import com.mitchellbosecke.pebble.node.MacroNode; -import com.mitchellbosecke.pebble.node.NamedArgumentNode; -import com.mitchellbosecke.pebble.node.Node; -import com.mitchellbosecke.pebble.node.ParallelNode; -import com.mitchellbosecke.pebble.node.PositionalArgumentNode; -import com.mitchellbosecke.pebble.node.PrintNode; -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.node.SetNode; -import com.mitchellbosecke.pebble.node.TextNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.Pair; +package io.pebbletemplates.extension; + +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.AutoEscapeNode; +import io.pebbletemplates.node.BlockNode; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.ExtendsNode; +import io.pebbletemplates.node.FlushNode; +import io.pebbletemplates.node.ForNode; +import io.pebbletemplates.node.IfNode; +import io.pebbletemplates.node.ImportNode; +import io.pebbletemplates.node.IncludeNode; +import io.pebbletemplates.node.MacroNode; +import io.pebbletemplates.node.NamedArgumentNode; +import io.pebbletemplates.node.Node; +import io.pebbletemplates.node.ParallelNode; +import io.pebbletemplates.node.PositionalArgumentNode; +import io.pebbletemplates.node.PrintNode; +import io.pebbletemplates.node.RootNode; +import io.pebbletemplates.node.SetNode; +import io.pebbletemplates.node.TextNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.Pair; /** * A base node visitor that can be extended for the sake of using it's navigational abilities. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/Extension.java b/pebble/src/main/java/io/pebbletemplates/extension/Extension.java similarity index 87% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/Extension.java rename to pebble/src/main/java/io/pebbletemplates/extension/Extension.java index 08d15ac28..0c2075fa8 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/Extension.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/Extension.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.attributes.AttributeResolver; -import com.mitchellbosecke.pebble.operator.BinaryOperator; -import com.mitchellbosecke.pebble.operator.UnaryOperator; -import com.mitchellbosecke.pebble.tokenParser.TokenParser; +import io.pebbletemplates.attributes.AttributeResolver; +import io.pebbletemplates.operator.BinaryOperator; +import io.pebbletemplates.operator.UnaryOperator; +import io.pebbletemplates.tokenParser.TokenParser; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/ExtensionCustomizer.java b/pebble/src/main/java/io/pebbletemplates/extension/ExtensionCustomizer.java similarity index 80% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/ExtensionCustomizer.java rename to pebble/src/main/java/io/pebbletemplates/extension/ExtensionCustomizer.java index ca9a2f98f..83d92175b 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/ExtensionCustomizer.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/ExtensionCustomizer.java @@ -1,9 +1,10 @@ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.attributes.AttributeResolver; -import com.mitchellbosecke.pebble.operator.BinaryOperator; -import com.mitchellbosecke.pebble.operator.UnaryOperator; -import com.mitchellbosecke.pebble.tokenParser.TokenParser; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.attributes.AttributeResolver; +import io.pebbletemplates.operator.BinaryOperator; +import io.pebbletemplates.operator.UnaryOperator; +import io.pebbletemplates.tokenParser.TokenParser; import java.util.List; import java.util.Map; @@ -17,7 +18,7 @@ * Implementations of this class are meant to overwrite methods and access registered functionality * before it is loaded into the PebbleEngine by calling super. * - * The ExentsionCustomizer can be registred via {@link com.mitchellbosecke.pebble.PebbleEngine.Builder#registerExtensionCustomizer} + * The ExentsionCustomizer can be registred via {@link PebbleEngine.Builder#registerExtensionCustomizer} * and is applied for every non-user-provided extension. * */ diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/ExtensionRegistry.java b/pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistry.java similarity index 94% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/ExtensionRegistry.java rename to pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistry.java index 154690020..c6cd6f31d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/ExtensionRegistry.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistry.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.attributes.AttributeResolver; -import com.mitchellbosecke.pebble.operator.BinaryOperator; -import com.mitchellbosecke.pebble.operator.UnaryOperator; -import com.mitchellbosecke.pebble.tokenParser.TokenParser; +import io.pebbletemplates.attributes.AttributeResolver; +import io.pebbletemplates.operator.BinaryOperator; +import io.pebbletemplates.operator.UnaryOperator; +import io.pebbletemplates.tokenParser.TokenParser; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/ExtensionRegistryFactory.java b/pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistryFactory.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/ExtensionRegistryFactory.java rename to pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistryFactory.java index c2c67426b..c07abad5f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/ExtensionRegistryFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistryFactory.java @@ -1,10 +1,11 @@ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.extension.core.AttributeResolverExtension; -import com.mitchellbosecke.pebble.extension.core.CoreExtension; -import com.mitchellbosecke.pebble.extension.escaper.EscaperExtension; -import com.mitchellbosecke.pebble.extension.escaper.EscapingStrategy; -import com.mitchellbosecke.pebble.extension.i18n.I18nExtension; +import io.pebbletemplates.extension.core.AttributeResolverExtension; +import io.pebbletemplates.extension.i18n.I18nExtension; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.extension.core.CoreExtension; +import io.pebbletemplates.extension.escaper.EscaperExtension; +import io.pebbletemplates.extension.escaper.EscapingStrategy; import java.util.*; import java.util.function.Function; @@ -12,7 +13,7 @@ /** * Provides configuration methods and builds the {@link ExtensionRegistry}. Used only internally by - * the {@link com.mitchellbosecke.pebble.PebbleEngine.Builder}. + * the {@link PebbleEngine.Builder}. * */ public class ExtensionRegistryFactory { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/Filter.java b/pebble/src/main/java/io/pebbletemplates/extension/Filter.java similarity index 66% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/Filter.java rename to pebble/src/main/java/io/pebbletemplates/extension/Filter.java index 210eb3bbc..3f5ca59ef 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/Filter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/Filter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; public interface Filter extends NamedArguments { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/Function.java b/pebble/src/main/java/io/pebbletemplates/extension/Function.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/Function.java rename to pebble/src/main/java/io/pebbletemplates/extension/Function.java index dac97ea3d..0c71e623e 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/Function.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/Function.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; public interface Function extends NamedArguments { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/NamedArguments.java b/pebble/src/main/java/io/pebbletemplates/extension/NamedArguments.java similarity index 87% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/NamedArguments.java rename to pebble/src/main/java/io/pebbletemplates/extension/NamedArguments.java index 8a1b05977..9b33af2b2 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/NamedArguments.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/NamedArguments.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/NodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/extension/NodeVisitor.java similarity index 58% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/NodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/extension/NodeVisitor.java index 4af6e371e..dd8104288 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/NodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/NodeVisitor.java @@ -6,27 +6,27 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; - -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.AutoEscapeNode; -import com.mitchellbosecke.pebble.node.BlockNode; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.ExtendsNode; -import com.mitchellbosecke.pebble.node.FlushNode; -import com.mitchellbosecke.pebble.node.ForNode; -import com.mitchellbosecke.pebble.node.IfNode; -import com.mitchellbosecke.pebble.node.ImportNode; -import com.mitchellbosecke.pebble.node.IncludeNode; -import com.mitchellbosecke.pebble.node.MacroNode; -import com.mitchellbosecke.pebble.node.NamedArgumentNode; -import com.mitchellbosecke.pebble.node.Node; -import com.mitchellbosecke.pebble.node.ParallelNode; -import com.mitchellbosecke.pebble.node.PositionalArgumentNode; -import com.mitchellbosecke.pebble.node.PrintNode; -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.node.SetNode; -import com.mitchellbosecke.pebble.node.TextNode; +package io.pebbletemplates.extension; + +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.AutoEscapeNode; +import io.pebbletemplates.node.BlockNode; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.ExtendsNode; +import io.pebbletemplates.node.FlushNode; +import io.pebbletemplates.node.ForNode; +import io.pebbletemplates.node.IfNode; +import io.pebbletemplates.node.ImportNode; +import io.pebbletemplates.node.IncludeNode; +import io.pebbletemplates.node.MacroNode; +import io.pebbletemplates.node.NamedArgumentNode; +import io.pebbletemplates.node.Node; +import io.pebbletemplates.node.ParallelNode; +import io.pebbletemplates.node.PositionalArgumentNode; +import io.pebbletemplates.node.PrintNode; +import io.pebbletemplates.node.RootNode; +import io.pebbletemplates.node.SetNode; +import io.pebbletemplates.node.TextNode; /** * Will visit all the nodes of the AST provided by the parser. The NodeVisitor is responsible for diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/NodeVisitorFactory.java b/pebble/src/main/java/io/pebbletemplates/extension/NodeVisitorFactory.java similarity index 87% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/NodeVisitorFactory.java rename to pebble/src/main/java/io/pebbletemplates/extension/NodeVisitorFactory.java index 24608132a..65094f26a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/NodeVisitorFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/NodeVisitorFactory.java @@ -1,6 +1,6 @@ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.PebbleTemplate; /** * The node visitor factory creates {@link NodeVisitor}s. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/Test.java b/pebble/src/main/java/io/pebbletemplates/extension/Test.java similarity index 66% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/Test.java rename to pebble/src/main/java/io/pebbletemplates/extension/Test.java index 61063f779..8734e5f93 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/Test.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/Test.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; public interface Test extends NamedArguments { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/AbbreviateFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/AbbreviateFilter.java similarity index 82% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/AbbreviateFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/AbbreviateFilter.java index 6433e4bc4..c401afe28 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/AbbreviateFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/AbbreviateFilter.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/AbsFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/AbsFilter.java similarity index 86% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/AbsFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/AbsFilter.java index e09b0b205..2ffbf2c08 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/AbsFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/AbsFilter.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/AttributeResolverExtension.java b/pebble/src/main/java/io/pebbletemplates/extension/core/AttributeResolverExtension.java similarity index 58% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/AttributeResolverExtension.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/AttributeResolverExtension.java index b0179f640..87030fc3f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/AttributeResolverExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/AttributeResolverExtension.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.attributes.AttributeResolver; -import com.mitchellbosecke.pebble.attributes.DefaultAttributeResolver; -import com.mitchellbosecke.pebble.extension.AbstractExtension; +import io.pebbletemplates.attributes.AttributeResolver; +import io.pebbletemplates.attributes.DefaultAttributeResolver; +import io.pebbletemplates.extension.AbstractExtension; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/Base64DecoderFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/Base64DecoderFilter.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/Base64DecoderFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/Base64DecoderFilter.java index 542fd429d..26a72f79b 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/Base64DecoderFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/Base64DecoderFilter.java @@ -1,12 +1,11 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; import java.util.Base64; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/Base64EncoderFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/Base64EncoderFilter.java similarity index 71% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/Base64EncoderFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/Base64EncoderFilter.java index ccb727422..bf4ad0d67 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/Base64EncoderFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/Base64EncoderFilter.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/CapitalizeFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/CapitalizeFilter.java similarity index 83% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/CapitalizeFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/CapitalizeFilter.java index 7779553b9..e07d253c5 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/CapitalizeFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/CapitalizeFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Arrays; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/CoreExtension.java b/pebble/src/main/java/io/pebbletemplates/extension/core/CoreExtension.java similarity index 65% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/CoreExtension.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/CoreExtension.java index 73b95b87e..2ebbfb12e 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/CoreExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/CoreExtension.java @@ -6,59 +6,59 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import static com.mitchellbosecke.pebble.operator.BinaryOperatorType.FILTER; -import static com.mitchellbosecke.pebble.operator.BinaryOperatorType.NORMAL; -import static com.mitchellbosecke.pebble.operator.BinaryOperatorType.TEST; +import static io.pebbletemplates.operator.BinaryOperatorType.FILTER; +import static io.pebbletemplates.operator.BinaryOperatorType.NORMAL; +import static io.pebbletemplates.operator.BinaryOperatorType.TEST; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.extension.NodeVisitorFactory; -import com.mitchellbosecke.pebble.extension.Test; -import com.mitchellbosecke.pebble.node.expression.AddExpression; -import com.mitchellbosecke.pebble.node.expression.AndExpression; -import com.mitchellbosecke.pebble.node.expression.ConcatenateExpression; -import com.mitchellbosecke.pebble.node.expression.ContainsExpression; -import com.mitchellbosecke.pebble.node.expression.DivideExpression; -import com.mitchellbosecke.pebble.node.expression.EqualsExpression; -import com.mitchellbosecke.pebble.node.expression.FilterExpression; -import com.mitchellbosecke.pebble.node.expression.GreaterThanEqualsExpression; -import com.mitchellbosecke.pebble.node.expression.GreaterThanExpression; -import com.mitchellbosecke.pebble.node.expression.LessThanEqualsExpression; -import com.mitchellbosecke.pebble.node.expression.LessThanExpression; -import com.mitchellbosecke.pebble.node.expression.ModulusExpression; -import com.mitchellbosecke.pebble.node.expression.MultiplyExpression; -import com.mitchellbosecke.pebble.node.expression.NegativeTestExpression; -import com.mitchellbosecke.pebble.node.expression.NotEqualsExpression; -import com.mitchellbosecke.pebble.node.expression.OrExpression; -import com.mitchellbosecke.pebble.node.expression.PositiveTestExpression; -import com.mitchellbosecke.pebble.node.expression.RangeExpression; -import com.mitchellbosecke.pebble.node.expression.SubtractExpression; -import com.mitchellbosecke.pebble.node.expression.UnaryMinusExpression; -import com.mitchellbosecke.pebble.node.expression.UnaryNotExpression; -import com.mitchellbosecke.pebble.node.expression.UnaryPlusExpression; -import com.mitchellbosecke.pebble.operator.Associativity; -import com.mitchellbosecke.pebble.operator.BinaryOperator; -import com.mitchellbosecke.pebble.operator.BinaryOperatorImpl; -import com.mitchellbosecke.pebble.operator.UnaryOperator; -import com.mitchellbosecke.pebble.operator.UnaryOperatorImpl; -import com.mitchellbosecke.pebble.tokenParser.BlockTokenParser; -import com.mitchellbosecke.pebble.tokenParser.CacheTokenParser; -import com.mitchellbosecke.pebble.tokenParser.EmbedTokenParser; -import com.mitchellbosecke.pebble.tokenParser.ExtendsTokenParser; -import com.mitchellbosecke.pebble.tokenParser.FilterTokenParser; -import com.mitchellbosecke.pebble.tokenParser.FlushTokenParser; -import com.mitchellbosecke.pebble.tokenParser.ForTokenParser; -import com.mitchellbosecke.pebble.tokenParser.FromTokenParser; -import com.mitchellbosecke.pebble.tokenParser.IfTokenParser; -import com.mitchellbosecke.pebble.tokenParser.ImportTokenParser; -import com.mitchellbosecke.pebble.tokenParser.IncludeTokenParser; -import com.mitchellbosecke.pebble.tokenParser.MacroTokenParser; -import com.mitchellbosecke.pebble.tokenParser.ParallelTokenParser; -import com.mitchellbosecke.pebble.tokenParser.SetTokenParser; -import com.mitchellbosecke.pebble.tokenParser.TokenParser; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.extension.NodeVisitorFactory; +import io.pebbletemplates.extension.Test; +import io.pebbletemplates.node.expression.AddExpression; +import io.pebbletemplates.node.expression.AndExpression; +import io.pebbletemplates.node.expression.ConcatenateExpression; +import io.pebbletemplates.node.expression.ContainsExpression; +import io.pebbletemplates.node.expression.DivideExpression; +import io.pebbletemplates.node.expression.EqualsExpression; +import io.pebbletemplates.node.expression.FilterExpression; +import io.pebbletemplates.node.expression.GreaterThanEqualsExpression; +import io.pebbletemplates.node.expression.GreaterThanExpression; +import io.pebbletemplates.node.expression.LessThanEqualsExpression; +import io.pebbletemplates.node.expression.LessThanExpression; +import io.pebbletemplates.node.expression.ModulusExpression; +import io.pebbletemplates.node.expression.MultiplyExpression; +import io.pebbletemplates.node.expression.NegativeTestExpression; +import io.pebbletemplates.node.expression.NotEqualsExpression; +import io.pebbletemplates.node.expression.OrExpression; +import io.pebbletemplates.node.expression.PositiveTestExpression; +import io.pebbletemplates.node.expression.RangeExpression; +import io.pebbletemplates.node.expression.SubtractExpression; +import io.pebbletemplates.node.expression.UnaryMinusExpression; +import io.pebbletemplates.node.expression.UnaryNotExpression; +import io.pebbletemplates.node.expression.UnaryPlusExpression; +import io.pebbletemplates.operator.Associativity; +import io.pebbletemplates.operator.BinaryOperator; +import io.pebbletemplates.operator.BinaryOperatorImpl; +import io.pebbletemplates.operator.UnaryOperator; +import io.pebbletemplates.operator.UnaryOperatorImpl; +import io.pebbletemplates.tokenParser.BlockTokenParser; +import io.pebbletemplates.tokenParser.CacheTokenParser; +import io.pebbletemplates.tokenParser.EmbedTokenParser; +import io.pebbletemplates.tokenParser.ExtendsTokenParser; +import io.pebbletemplates.tokenParser.FilterTokenParser; +import io.pebbletemplates.tokenParser.FlushTokenParser; +import io.pebbletemplates.tokenParser.ForTokenParser; +import io.pebbletemplates.tokenParser.FromTokenParser; +import io.pebbletemplates.tokenParser.IfTokenParser; +import io.pebbletemplates.tokenParser.ImportTokenParser; +import io.pebbletemplates.tokenParser.IncludeTokenParser; +import io.pebbletemplates.tokenParser.MacroTokenParser; +import io.pebbletemplates.tokenParser.ParallelTokenParser; +import io.pebbletemplates.tokenParser.SetTokenParser; +import io.pebbletemplates.tokenParser.TokenParser; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/DateFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/DateFilter.java similarity index 92% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/DateFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/DateFilter.java index 6e6e4c363..56d3090df 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/DateFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/DateFilter.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.extension.escaper.SafeString; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.extension.escaper.SafeString; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.text.DateFormat; import java.text.ParseException; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/DefaultFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/DefaultFilter.java similarity index 74% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/DefaultFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/DefaultFilter.java index f6b7f48c5..cf41eaffa 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/DefaultFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/DefaultFilter.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.extension.Test; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.extension.Test; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/DefinedTest.java b/pebble/src/main/java/io/pebbletemplates/extension/core/DefinedTest.java similarity index 74% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/DefinedTest.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/DefinedTest.java index c5f181b75..56653a424 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/DefinedTest.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/DefinedTest.java @@ -1,7 +1,7 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; /** diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/EmptyTest.java b/pebble/src/main/java/io/pebbletemplates/extension/core/EmptyTest.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/EmptyTest.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/EmptyTest.java index 9655f7301..22a7dd3a1 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/EmptyTest.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/EmptyTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Test; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Test; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/EvenTest.java b/pebble/src/main/java/io/pebbletemplates/extension/core/EvenTest.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/EvenTest.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/EvenTest.java index 30e85fca6..68fddab6a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/EvenTest.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/EvenTest.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; + +import io.pebbletemplates.extension.Test; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Test; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/FirstFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/FirstFilter.java similarity index 84% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/FirstFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/FirstFilter.java index 41ea3e1f5..89bbdc401 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/FirstFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/FirstFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.Collection; import java.util.Iterator; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/IterableTest.java b/pebble/src/main/java/io/pebbletemplates/extension/core/IterableTest.java similarity index 73% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/IterableTest.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/IterableTest.java index da02a8dd1..e79db4482 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/IterableTest.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/IterableTest.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; + +import io.pebbletemplates.extension.Test; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.extension.Test; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/JoinFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/JoinFilter.java similarity index 87% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/JoinFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/JoinFilter.java index ad6fcd642..58c3db87b 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/JoinFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/JoinFilter.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Collection; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/LastFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/LastFilter.java similarity index 84% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/LastFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/LastFilter.java index 1f6d95f27..4e812bcf2 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/LastFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/LastFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.Collection; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/LengthFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/LengthFilter.java similarity index 84% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/LengthFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/LengthFilter.java index c65b666eb..4adad1c06 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/LengthFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/LengthFilter.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.Collection; import java.util.Iterator; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/LowerFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/LowerFilter.java similarity index 77% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/LowerFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/LowerFilter.java index 36084332a..a9e3b4427 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/LowerFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/LowerFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MacroAndBlockRegistrantNodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitor.java similarity index 69% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MacroAndBlockRegistrantNodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitor.java index b92d64b56..7d657ca7f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MacroAndBlockRegistrantNodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitor.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.AbstractNodeVisitor; -import com.mitchellbosecke.pebble.node.BlockNode; -import com.mitchellbosecke.pebble.node.MacroNode; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.AbstractNodeVisitor; +import io.pebbletemplates.node.BlockNode; +import io.pebbletemplates.node.MacroNode; +import io.pebbletemplates.template.PebbleTemplateImpl; public class MacroAndBlockRegistrantNodeVisitor extends AbstractNodeVisitor { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java b/pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java similarity index 56% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java index e9ed0067e..bc6463e71 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.extension.NodeVisitorFactory; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.extension.NodeVisitorFactory; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.template.PebbleTemplateImpl; /** * Implementation of {@link NodeVisitorFactory} to handle {@link MacroAndBlockRegistrantNodeVisitor}. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MapTest.java b/pebble/src/main/java/io/pebbletemplates/extension/core/MapTest.java similarity index 71% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MapTest.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/MapTest.java index 11b520d8f..76248e1ab 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MapTest.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/MapTest.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; + +import io.pebbletemplates.extension.Test; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.extension.Test; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MaxFunction.java b/pebble/src/main/java/io/pebbletemplates/extension/core/MaxFunction.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MaxFunction.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/MaxFunction.java index 1c779e507..f37c47ac2 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MaxFunction.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/MaxFunction.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.utils.OperatorUtils; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MergeFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/MergeFilter.java similarity index 93% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MergeFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/MergeFilter.java index 2ba380b29..f25a27c55 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MergeFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/MergeFilter.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.HashMap; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MinFunction.java b/pebble/src/main/java/io/pebbletemplates/extension/core/MinFunction.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MinFunction.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/MinFunction.java index de19c1698..97cb9b708 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/MinFunction.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/MinFunction.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.utils.OperatorUtils; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/NullTest.java b/pebble/src/main/java/io/pebbletemplates/extension/core/NullTest.java similarity index 71% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/NullTest.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/NullTest.java index 4182ec2f5..e7b701f94 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/NullTest.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/NullTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Test; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Test; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/NumberFormatFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/NumberFormatFilter.java similarity index 84% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/NumberFormatFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/NumberFormatFilter.java index 37c9b6107..56cc65404 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/NumberFormatFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/NumberFormatFilter.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.Format; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/OddTest.java b/pebble/src/main/java/io/pebbletemplates/extension/core/OddTest.java similarity index 73% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/OddTest.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/OddTest.java index c4771ec4c..c8e2daf66 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/OddTest.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/OddTest.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; + +import io.pebbletemplates.extension.Test; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Test; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/RangeFunction.java b/pebble/src/main/java/io/pebbletemplates/extension/core/RangeFunction.java similarity index 92% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/RangeFunction.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/RangeFunction.java index 5613edf91..baa594b4e 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/RangeFunction.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/RangeFunction.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/ReplaceFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/ReplaceFilter.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/ReplaceFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/ReplaceFilter.java index b79988e86..f17ac4e6c 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/ReplaceFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/ReplaceFilter.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.text.MessageFormat; import java.util.Collections; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/ReverseFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/ReverseFilter.java similarity index 73% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/ReverseFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/ReverseFilter.java index e3279b434..1eb87100e 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/ReverseFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/ReverseFilter.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/RsortFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/RsortFilter.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/RsortFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/RsortFilter.java index f21f84035..b8687f096 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/RsortFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/RsortFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/Sha256Filter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/Sha256Filter.java similarity index 84% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/Sha256Filter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/Sha256Filter.java index 9dd4016ca..a94df9d22 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/Sha256Filter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/Sha256Filter.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/SliceFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/SliceFilter.java similarity index 93% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/SliceFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/SliceFilter.java index 72093b674..efb24e603 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/SliceFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/SliceFilter.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/SortFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/SortFilter.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/SortFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/SortFilter.java index 44c7c9c67..dd4a4ae9a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/SortFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/SortFilter.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/SplitFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/SplitFilter.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/SplitFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/SplitFilter.java index 4f45bbfde..37324c7ed 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/SplitFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/SplitFilter.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/TitleFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/TitleFilter.java similarity index 82% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/TitleFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/TitleFilter.java index 96dd6d48e..dfa02928a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/TitleFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/TitleFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/TrimFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/TrimFilter.java similarity index 74% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/TrimFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/TrimFilter.java index cea896dc0..4ccd1a8b9 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/TrimFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/TrimFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/UpperFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/UpperFilter.java similarity index 77% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/UpperFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/UpperFilter.java index a2c866137..757e0984c 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/UpperFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/UpperFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/UrlEncoderFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/core/UrlEncoderFilter.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/UrlEncoderFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/core/UrlEncoderFilter.java index f16dee463..f1b1065bc 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/core/UrlEncoderFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/core/UrlEncoderFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.core; +package io.pebbletemplates.extension.core; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/debug/DebugExtension.java b/pebble/src/main/java/io/pebbletemplates/extension/debug/DebugExtension.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/debug/DebugExtension.java rename to pebble/src/main/java/io/pebbletemplates/extension/debug/DebugExtension.java index 0d3bcb390..c64c013ef 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/debug/DebugExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/debug/DebugExtension.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.debug; +package io.pebbletemplates.extension.debug; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.NodeVisitorFactory; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.NodeVisitorFactory; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/debug/PrettyPrintNodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitor.java similarity index 74% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/debug/PrettyPrintNodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitor.java index b246c223c..7a46f3f33 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/debug/PrettyPrintNodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitor.java @@ -6,34 +6,34 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.debug; - -import com.mitchellbosecke.pebble.extension.AbstractNodeVisitor; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.BlockNode; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.FlushNode; -import com.mitchellbosecke.pebble.node.ForNode; -import com.mitchellbosecke.pebble.node.IfNode; -import com.mitchellbosecke.pebble.node.ImportNode; -import com.mitchellbosecke.pebble.node.IncludeNode; -import com.mitchellbosecke.pebble.node.NamedArgumentNode; -import com.mitchellbosecke.pebble.node.Node; -import com.mitchellbosecke.pebble.node.ParallelNode; -import com.mitchellbosecke.pebble.node.PrintNode; -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.node.SetNode; -import com.mitchellbosecke.pebble.node.TestInvocationExpression; -import com.mitchellbosecke.pebble.node.TextNode; -import com.mitchellbosecke.pebble.node.expression.BinaryExpression; -import com.mitchellbosecke.pebble.node.expression.ContextVariableExpression; -import com.mitchellbosecke.pebble.node.expression.FilterInvocationExpression; -import com.mitchellbosecke.pebble.node.expression.FunctionOrMacroInvocationExpression; -import com.mitchellbosecke.pebble.node.expression.GetAttributeExpression; -import com.mitchellbosecke.pebble.node.expression.ParentFunctionExpression; -import com.mitchellbosecke.pebble.node.expression.TernaryExpression; -import com.mitchellbosecke.pebble.node.expression.UnaryExpression; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +package io.pebbletemplates.extension.debug; + +import io.pebbletemplates.extension.AbstractNodeVisitor; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.BlockNode; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.FlushNode; +import io.pebbletemplates.node.ForNode; +import io.pebbletemplates.node.IfNode; +import io.pebbletemplates.node.ImportNode; +import io.pebbletemplates.node.IncludeNode; +import io.pebbletemplates.node.NamedArgumentNode; +import io.pebbletemplates.node.Node; +import io.pebbletemplates.node.ParallelNode; +import io.pebbletemplates.node.PrintNode; +import io.pebbletemplates.node.RootNode; +import io.pebbletemplates.node.SetNode; +import io.pebbletemplates.node.TestInvocationExpression; +import io.pebbletemplates.node.TextNode; +import io.pebbletemplates.node.expression.BinaryExpression; +import io.pebbletemplates.node.expression.ContextVariableExpression; +import io.pebbletemplates.node.expression.FilterInvocationExpression; +import io.pebbletemplates.node.expression.FunctionOrMacroInvocationExpression; +import io.pebbletemplates.node.expression.GetAttributeExpression; +import io.pebbletemplates.node.expression.ParentFunctionExpression; +import io.pebbletemplates.node.expression.TernaryExpression; +import io.pebbletemplates.node.expression.UnaryExpression; +import io.pebbletemplates.template.PebbleTemplateImpl; public class PrettyPrintNodeVisitor extends AbstractNodeVisitor { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/debug/PrettyPrintNodeVisitorFactory.java b/pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitorFactory.java similarity index 52% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/debug/PrettyPrintNodeVisitorFactory.java rename to pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitorFactory.java index e711bd679..0c9002dca 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/debug/PrettyPrintNodeVisitorFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitorFactory.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.extension.debug; +package io.pebbletemplates.extension.debug; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.extension.NodeVisitorFactory; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.extension.NodeVisitorFactory; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.template.PebbleTemplateImpl; /** * Implementation of {@link NodeVisitorFactory} to create {@link PrettyPrintNodeVisitor}. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscapeFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapeFilter.java similarity index 86% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscapeFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapeFilter.java index 3d2ad056d..e66132cdd 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscapeFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapeFilter.java @@ -6,17 +6,18 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.escaper; +package io.pebbletemplates.extension.escaper; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.utils.StringUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.utils.StringUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.unbescape.css.CssEscape; import org.unbescape.html.HtmlEscape; import org.unbescape.javascript.JavaScriptEscape; @@ -57,7 +58,7 @@ public List getArgumentNames() { @Override public Object apply(Object inputObject, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (inputObject == null || inputObject instanceof SafeString) { return inputObject; } diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscaperExtension.java b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperExtension.java similarity index 85% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscaperExtension.java rename to pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperExtension.java index 4440d8472..5909b4775 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscaperExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperExtension.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.escaper; +package io.pebbletemplates.extension.escaper; + +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.extension.NodeVisitorFactory; +import io.pebbletemplates.tokenParser.AutoEscapeTokenParser; +import io.pebbletemplates.tokenParser.TokenParser; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.extension.NodeVisitorFactory; -import com.mitchellbosecke.pebble.tokenParser.AutoEscapeTokenParser; -import com.mitchellbosecke.pebble.tokenParser.TokenParser; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscaperNodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitor.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscaperNodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitor.java index fd14ccd1c..b0122a765 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscaperNodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitor.java @@ -6,22 +6,23 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.escaper; - -import com.mitchellbosecke.pebble.extension.AbstractNodeVisitor; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.AutoEscapeNode; -import com.mitchellbosecke.pebble.node.NamedArgumentNode; -import com.mitchellbosecke.pebble.node.PrintNode; -import com.mitchellbosecke.pebble.node.expression.BlockFunctionExpression; -import com.mitchellbosecke.pebble.node.expression.ConcatenateExpression; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.node.expression.FilterExpression; -import com.mitchellbosecke.pebble.node.expression.FilterInvocationExpression; -import com.mitchellbosecke.pebble.node.expression.LiteralStringExpression; -import com.mitchellbosecke.pebble.node.expression.ParentFunctionExpression; -import com.mitchellbosecke.pebble.node.expression.TernaryExpression; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +package io.pebbletemplates.extension.escaper; + +import io.pebbletemplates.extension.AbstractNodeVisitor; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.AutoEscapeNode; +import io.pebbletemplates.node.NamedArgumentNode; +import io.pebbletemplates.node.PrintNode; +import io.pebbletemplates.node.expression.BlockFunctionExpression; +import io.pebbletemplates.node.expression.ConcatenateExpression; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.node.expression.FilterExpression; +import io.pebbletemplates.node.expression.FilterInvocationExpression; +import io.pebbletemplates.node.expression.LiteralStringExpression; +import io.pebbletemplates.node.expression.ParentFunctionExpression; +import io.pebbletemplates.node.expression.TernaryExpression; +import io.pebbletemplates.template.PebbleTemplateImpl; + import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscaperNodeVisitorFactory.java b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitorFactory.java similarity index 60% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscaperNodeVisitorFactory.java rename to pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitorFactory.java index 53983cba5..c02da8de6 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscaperNodeVisitorFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitorFactory.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.extension.escaper; +package io.pebbletemplates.extension.escaper; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.extension.NodeVisitorFactory; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.extension.NodeVisitorFactory; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.template.PebbleTemplateImpl; /** * Factory class for creating {@link EscaperNodeVisitor}. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscapingStrategy.java b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapingStrategy.java similarity index 57% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscapingStrategy.java rename to pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapingStrategy.java index 98de693d2..3efffb50f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/EscapingStrategy.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapingStrategy.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.extension.escaper; +package io.pebbletemplates.extension.escaper; public interface EscapingStrategy { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/RawFilter.java b/pebble/src/main/java/io/pebbletemplates/extension/escaper/RawFilter.java similarity index 66% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/RawFilter.java rename to pebble/src/main/java/io/pebbletemplates/extension/escaper/RawFilter.java index 8e6dc6355..018564c1c 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/RawFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/escaper/RawFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.escaper; +package io.pebbletemplates.extension.escaper; + +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -22,7 +23,7 @@ public List getArgumentNames() { @Override public Object apply(Object inputObject, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { return inputObject == null ? null : new SafeString(inputObject.toString()); } diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/SafeString.java b/pebble/src/main/java/io/pebbletemplates/extension/escaper/SafeString.java similarity index 92% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/SafeString.java rename to pebble/src/main/java/io/pebbletemplates/extension/escaper/SafeString.java index 3c5bb492f..c2a898eba 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/escaper/SafeString.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/escaper/SafeString.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.extension.escaper; +package io.pebbletemplates.extension.escaper; /** * Wrap a string in this to mark the string as safe to ignore by the Escape extension. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/i18n/I18nExtension.java b/pebble/src/main/java/io/pebbletemplates/extension/i18n/I18nExtension.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/i18n/I18nExtension.java rename to pebble/src/main/java/io/pebbletemplates/extension/i18n/I18nExtension.java index 0e5d92cf1..b9126e646 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/i18n/I18nExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/i18n/I18nExtension.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.i18n; +package io.pebbletemplates.extension.i18n; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Function; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Function; import java.util.HashMap; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/i18n/UTF8Control.java b/pebble/src/main/java/io/pebbletemplates/extension/i18n/UTF8Control.java similarity index 96% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/i18n/UTF8Control.java rename to pebble/src/main/java/io/pebbletemplates/extension/i18n/UTF8Control.java index c38a583a2..213ebfa3b 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/i18n/UTF8Control.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/i18n/UTF8Control.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.extension.i18n; +package io.pebbletemplates.extension.i18n; import java.io.IOException; import java.io.InputStream; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/i18n/i18nFunction.java b/pebble/src/main/java/io/pebbletemplates/extension/i18n/i18nFunction.java similarity index 86% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/i18n/i18nFunction.java rename to pebble/src/main/java/io/pebbletemplates/extension/i18n/i18nFunction.java index b7dd9d9bb..308031e57 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/i18n/i18nFunction.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/i18n/i18nFunction.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension.i18n; +package io.pebbletemplates.extension.i18n; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/writer/PooledSpecializedStringWriter.java b/pebble/src/main/java/io/pebbletemplates/extension/writer/PooledSpecializedStringWriter.java similarity index 97% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/writer/PooledSpecializedStringWriter.java rename to pebble/src/main/java/io/pebbletemplates/extension/writer/PooledSpecializedStringWriter.java index 7baee35b7..97b188b9f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/writer/PooledSpecializedStringWriter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/writer/PooledSpecializedStringWriter.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.extension.writer; +package io.pebbletemplates.extension.writer; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/writer/SpecializedWriter.java b/pebble/src/main/java/io/pebbletemplates/extension/writer/SpecializedWriter.java similarity index 96% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/writer/SpecializedWriter.java rename to pebble/src/main/java/io/pebbletemplates/extension/writer/SpecializedWriter.java index e72718d5b..8cdf7ecce 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/writer/SpecializedWriter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/writer/SpecializedWriter.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.extension.writer; +package io.pebbletemplates.extension.writer; import java.math.BigDecimal; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/writer/StringWriterSpecializedAdapter.java b/pebble/src/main/java/io/pebbletemplates/extension/writer/StringWriterSpecializedAdapter.java similarity index 95% rename from pebble/src/main/java/com/mitchellbosecke/pebble/extension/writer/StringWriterSpecializedAdapter.java rename to pebble/src/main/java/io/pebbletemplates/extension/writer/StringWriterSpecializedAdapter.java index bc740c382..57e2e7f26 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/extension/writer/StringWriterSpecializedAdapter.java +++ b/pebble/src/main/java/io/pebbletemplates/extension/writer/StringWriterSpecializedAdapter.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.extension.writer; +package io.pebbletemplates.extension.writer; import java.io.StringWriter; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/Lexer.java b/pebble/src/main/java/io/pebbletemplates/lexer/Lexer.java similarity index 88% rename from pebble/src/main/java/com/mitchellbosecke/pebble/lexer/Lexer.java rename to pebble/src/main/java/io/pebbletemplates/lexer/Lexer.java index a689acfb1..d732af3f7 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/Lexer.java +++ b/pebble/src/main/java/io/pebbletemplates/lexer/Lexer.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.lexer; +package io.pebbletemplates.lexer; import java.io.Reader; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/LexerImpl.java b/pebble/src/main/java/io/pebbletemplates/lexer/LexerImpl.java similarity index 98% rename from pebble/src/main/java/com/mitchellbosecke/pebble/lexer/LexerImpl.java rename to pebble/src/main/java/io/pebbletemplates/lexer/LexerImpl.java index 68947e2a0..f59920180 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/LexerImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/lexer/LexerImpl.java @@ -3,15 +3,15 @@ * copyright and license information, please view the LICENSE file that was distributed with this * source code. */ -package com.mitchellbosecke.pebble.lexer; - -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token.Type; -import com.mitchellbosecke.pebble.operator.BinaryOperator; -import com.mitchellbosecke.pebble.operator.UnaryOperator; -import com.mitchellbosecke.pebble.utils.Pair; -import com.mitchellbosecke.pebble.utils.StringLengthComparator; -import com.mitchellbosecke.pebble.utils.StringUtils; +package io.pebbletemplates.lexer; + +import io.pebbletemplates.operator.BinaryOperator; +import io.pebbletemplates.operator.UnaryOperator; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token.Type; +import io.pebbletemplates.utils.Pair; +import io.pebbletemplates.utils.StringLengthComparator; +import io.pebbletemplates.utils.StringUtils; import java.io.IOException; import java.io.Reader; import java.util.ArrayDeque; @@ -23,6 +23,7 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/Syntax.java b/pebble/src/main/java/io/pebbletemplates/lexer/Syntax.java similarity index 99% rename from pebble/src/main/java/com/mitchellbosecke/pebble/lexer/Syntax.java rename to pebble/src/main/java/io/pebbletemplates/lexer/Syntax.java index d3ce194ae..879746909 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/Syntax.java +++ b/pebble/src/main/java/io/pebbletemplates/lexer/Syntax.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.lexer; +package io.pebbletemplates.lexer; import java.util.regex.Pattern; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/TemplateSource.java b/pebble/src/main/java/io/pebbletemplates/lexer/TemplateSource.java similarity index 99% rename from pebble/src/main/java/com/mitchellbosecke/pebble/lexer/TemplateSource.java rename to pebble/src/main/java/io/pebbletemplates/lexer/TemplateSource.java index 650f3d6d6..8dacaf34a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/TemplateSource.java +++ b/pebble/src/main/java/io/pebbletemplates/lexer/TemplateSource.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.lexer; +package io.pebbletemplates.lexer; import java.io.IOException; import java.io.Reader; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/Token.java b/pebble/src/main/java/io/pebbletemplates/lexer/Token.java similarity index 97% rename from pebble/src/main/java/com/mitchellbosecke/pebble/lexer/Token.java rename to pebble/src/main/java/io/pebbletemplates/lexer/Token.java index 698c8874a..79f183995 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/Token.java +++ b/pebble/src/main/java/io/pebbletemplates/lexer/Token.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE file that was distributed * with this source code. */ -package com.mitchellbosecke.pebble.lexer; +package io.pebbletemplates.lexer; import java.util.Arrays; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/TokenStream.java b/pebble/src/main/java/io/pebbletemplates/lexer/TokenStream.java similarity index 95% rename from pebble/src/main/java/com/mitchellbosecke/pebble/lexer/TokenStream.java rename to pebble/src/main/java/io/pebbletemplates/lexer/TokenStream.java index 1cf007e7c..9cd40708d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/lexer/TokenStream.java +++ b/pebble/src/main/java/io/pebbletemplates/lexer/TokenStream.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.lexer; +package io.pebbletemplates.lexer; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token.Type; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token.Type; import java.util.ArrayList; import java.util.Collection; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/AbstractServletLoader.java b/pebble/src/main/java/io/pebbletemplates/loader/AbstractServletLoader.java similarity index 95% rename from pebble/src/main/java/com/mitchellbosecke/pebble/loader/AbstractServletLoader.java rename to pebble/src/main/java/io/pebbletemplates/loader/AbstractServletLoader.java index 56a9e5167..a3a8d99dc 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/AbstractServletLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/loader/AbstractServletLoader.java @@ -1,7 +1,7 @@ -package com.mitchellbosecke.pebble.loader; +package io.pebbletemplates.loader; -import com.mitchellbosecke.pebble.error.LoaderException; -import com.mitchellbosecke.pebble.utils.PathUtils; +import io.pebbletemplates.error.LoaderException; +import io.pebbletemplates.utils.PathUtils; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/ClasspathLoader.java b/pebble/src/main/java/io/pebbletemplates/loader/ClasspathLoader.java similarity index 95% rename from pebble/src/main/java/com/mitchellbosecke/pebble/loader/ClasspathLoader.java rename to pebble/src/main/java/io/pebbletemplates/loader/ClasspathLoader.java index 91c363313..d5b705a8f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/ClasspathLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/loader/ClasspathLoader.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.loader; +package io.pebbletemplates.loader; -import com.mitchellbosecke.pebble.error.LoaderException; -import com.mitchellbosecke.pebble.utils.PathUtils; +import io.pebbletemplates.error.LoaderException; +import io.pebbletemplates.utils.PathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/DelegatingLoader.java b/pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoader.java similarity index 97% rename from pebble/src/main/java/com/mitchellbosecke/pebble/loader/DelegatingLoader.java rename to pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoader.java index 35385c151..0170a1378 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/DelegatingLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoader.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.loader; +package io.pebbletemplates.loader; -import com.mitchellbosecke.pebble.error.LoaderException; +import io.pebbletemplates.error.LoaderException; import java.io.Reader; import java.util.ArrayList; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/DelegatingLoaderCacheKey.java b/pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoaderCacheKey.java similarity index 97% rename from pebble/src/main/java/com/mitchellbosecke/pebble/loader/DelegatingLoaderCacheKey.java rename to pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoaderCacheKey.java index 84d0cf214..71f2022d4 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/DelegatingLoaderCacheKey.java +++ b/pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoaderCacheKey.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.loader; +package io.pebbletemplates.loader; import java.util.ArrayList; import java.util.Collections; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/FileLoader.java b/pebble/src/main/java/io/pebbletemplates/loader/FileLoader.java similarity index 95% rename from pebble/src/main/java/com/mitchellbosecke/pebble/loader/FileLoader.java rename to pebble/src/main/java/io/pebbletemplates/loader/FileLoader.java index 4f2f7a1e1..f973aded2 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/FileLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/loader/FileLoader.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.loader; +package io.pebbletemplates.loader; -import com.mitchellbosecke.pebble.error.LoaderException; -import com.mitchellbosecke.pebble.utils.PathUtils; +import io.pebbletemplates.error.LoaderException; +import io.pebbletemplates.utils.PathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/Loader.java b/pebble/src/main/java/io/pebbletemplates/loader/Loader.java similarity index 97% rename from pebble/src/main/java/com/mitchellbosecke/pebble/loader/Loader.java rename to pebble/src/main/java/io/pebbletemplates/loader/Loader.java index cc7bf0682..e91dc7aa9 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/Loader.java +++ b/pebble/src/main/java/io/pebbletemplates/loader/Loader.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.loader; +package io.pebbletemplates.loader; -import com.mitchellbosecke.pebble.PebbleEngine; +import io.pebbletemplates.PebbleEngine; import java.io.Reader; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/Servlet5Loader.java b/pebble/src/main/java/io/pebbletemplates/loader/Servlet5Loader.java similarity index 94% rename from pebble/src/main/java/com/mitchellbosecke/pebble/loader/Servlet5Loader.java rename to pebble/src/main/java/io/pebbletemplates/loader/Servlet5Loader.java index 3fef106ac..75a77b74d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/Servlet5Loader.java +++ b/pebble/src/main/java/io/pebbletemplates/loader/Servlet5Loader.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.loader; +package io.pebbletemplates.loader; import jakarta.servlet.ServletContext; import java.io.InputStream; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/ServletLoader.java b/pebble/src/main/java/io/pebbletemplates/loader/ServletLoader.java similarity index 94% rename from pebble/src/main/java/com/mitchellbosecke/pebble/loader/ServletLoader.java rename to pebble/src/main/java/io/pebbletemplates/loader/ServletLoader.java index 3facc90fd..33a4b4a20 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/ServletLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/loader/ServletLoader.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.loader; +package io.pebbletemplates.loader; import java.io.InputStream; import java.net.MalformedURLException; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/StringLoader.java b/pebble/src/main/java/io/pebbletemplates/loader/StringLoader.java similarity index 96% rename from pebble/src/main/java/com/mitchellbosecke/pebble/loader/StringLoader.java rename to pebble/src/main/java/io/pebbletemplates/loader/StringLoader.java index 921fb8d3a..83a21d17c 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/loader/StringLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/loader/StringLoader.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.loader; +package io.pebbletemplates.loader; import java.io.Reader; import java.io.StringReader; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/AbstractRenderableNode.java b/pebble/src/main/java/io/pebbletemplates/node/AbstractRenderableNode.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/AbstractRenderableNode.java rename to pebble/src/main/java/io/pebbletemplates/node/AbstractRenderableNode.java index 6897a95b0..7e1f521a6 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/AbstractRenderableNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/AbstractRenderableNode.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ArgumentsNode.java b/pebble/src/main/java/io/pebbletemplates/node/ArgumentsNode.java similarity index 89% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/ArgumentsNode.java rename to pebble/src/main/java/io/pebbletemplates/node/ArgumentsNode.java index b191aaece..b1d465726 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ArgumentsNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/ArgumentsNode.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.NamedArguments; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.NamedArguments; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -57,7 +58,7 @@ public List getPositionalArgs() { * @return Returns a map representaion of the arguments */ public Map getArgumentMap(PebbleTemplateImpl self, EvaluationContextImpl context, - NamedArguments invocableWithNamedArguments) { + NamedArguments invocableWithNamedArguments) { Map result = new HashMap<>(); List argumentNames = invocableWithNamedArguments.getArgumentNames(); diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/AutoEscapeNode.java b/pebble/src/main/java/io/pebbletemplates/node/AutoEscapeNode.java similarity index 82% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/AutoEscapeNode.java rename to pebble/src/main/java/io/pebbletemplates/node/AutoEscapeNode.java index fa0fafa93..722205f19 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/AutoEscapeNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/AutoEscapeNode.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/BlockNode.java b/pebble/src/main/java/io/pebbletemplates/node/BlockNode.java similarity index 83% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/BlockNode.java rename to pebble/src/main/java/io/pebbletemplates/node/BlockNode.java index dd5cdb638..8e6ceff9f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/BlockNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/BlockNode.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.Block; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.Block; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/BodyNode.java b/pebble/src/main/java/io/pebbletemplates/node/BodyNode.java similarity index 89% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/BodyNode.java rename to pebble/src/main/java/io/pebbletemplates/node/BodyNode.java index d224e8d3e..0d2a277d3 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/BodyNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/BodyNode.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; import java.util.ArrayList; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/CacheNode.java b/pebble/src/main/java/io/pebbletemplates/node/CacheNode.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/CacheNode.java rename to pebble/src/main/java/io/pebbletemplates/node/CacheNode.java index 7fbb17f5b..978456736 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/CacheNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/CacheNode.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.cache.CacheKey; -import com.mitchellbosecke.pebble.cache.PebbleCache; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.LimitedSizeWriter; +import io.pebbletemplates.cache.CacheKey; +import io.pebbletemplates.cache.PebbleCache; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.LimitedSizeWriter; import java.io.IOException; import java.io.StringWriter; @@ -46,7 +46,7 @@ public void accept(NodeVisitor visitor) { @Override public void render(PebbleTemplateImpl self, Writer writer, - EvaluationContextImpl context) throws IOException { + EvaluationContextImpl context) throws IOException { try { final String body; PebbleCache tagCache = context.getTagCache(); diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/EmbedNode.java b/pebble/src/main/java/io/pebbletemplates/node/EmbedNode.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/EmbedNode.java rename to pebble/src/main/java/io/pebbletemplates/node/EmbedNode.java index 70e7540ab..9b003d3bc 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/EmbedNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/EmbedNode.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; - -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.node.expression.MapExpression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +package io.pebbletemplates.node; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.node.expression.MapExpression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ExtendsNode.java b/pebble/src/main/java/io/pebbletemplates/node/ExtendsNode.java similarity index 71% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/ExtendsNode.java rename to pebble/src/main/java/io/pebbletemplates/node/ExtendsNode.java index 66f0ce457..2cef53cd4 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ExtendsNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/ExtendsNode.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.Writer; public class ExtendsNode extends AbstractRenderableNode { @@ -25,7 +26,7 @@ public ExtendsNode(int lineNumber, Expression parentExpression) { @Override public void render(final PebbleTemplateImpl self, Writer writer, - final EvaluationContextImpl context) { + final EvaluationContextImpl context) { self.setParent(context, (String) this.parentExpression.evaluate(self, context)); } diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/FlushNode.java b/pebble/src/main/java/io/pebbletemplates/node/FlushNode.java similarity index 73% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/FlushNode.java rename to pebble/src/main/java/io/pebbletemplates/node/FlushNode.java index 0275e6828..f5c60767c 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/FlushNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/FlushNode.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ForNode.java b/pebble/src/main/java/io/pebbletemplates/node/ForNode.java similarity index 91% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/ForNode.java rename to pebble/src/main/java/io/pebbletemplates/node/ForNode.java index 07212831a..d8724a138 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ForNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/ForNode.java @@ -6,21 +6,21 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; - -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.node.fornode.LazyLength; -import com.mitchellbosecke.pebble.node.fornode.LazyRevIndex; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.template.ScopeChain; +package io.pebbletemplates.node; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.node.fornode.LazyLength; +import io.pebbletemplates.node.fornode.LazyRevIndex; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.template.ScopeChain; + import java.io.IOException; import java.io.Writer; import java.lang.reflect.Array; import java.util.Enumeration; -import java.util.HashMap; import java.util.Iterator; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/FromNode.java b/pebble/src/main/java/io/pebbletemplates/node/FromNode.java similarity index 72% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/FromNode.java rename to pebble/src/main/java/io/pebbletemplates/node/FromNode.java index 9f706534a..c73b8df9d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/FromNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/FromNode.java @@ -1,10 +1,11 @@ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.Pair; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.Pair; import java.io.Writer; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/FunctionOrMacroNameNode.java b/pebble/src/main/java/io/pebbletemplates/node/FunctionOrMacroNameNode.java similarity index 74% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/FunctionOrMacroNameNode.java rename to pebble/src/main/java/io/pebbletemplates/node/FunctionOrMacroNameNode.java index 6f8cfd727..6f197ca00 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/FunctionOrMacroNameNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/FunctionOrMacroNameNode.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; public class FunctionOrMacroNameNode implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/IfNode.java b/pebble/src/main/java/io/pebbletemplates/node/IfNode.java similarity index 83% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/IfNode.java rename to pebble/src/main/java/io/pebbletemplates/node/IfNode.java index 288bfe943..e83be81a0 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/IfNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/IfNode.java @@ -6,20 +6,21 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.Pair; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.Pair; +import io.pebbletemplates.utils.TypeUtils; import java.io.IOException; import java.io.Writer; import java.util.List; -import static com.mitchellbosecke.pebble.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.utils.TypeUtils.compatibleCast; public class IfNode extends AbstractRenderableNode { @@ -55,7 +56,7 @@ public void render(PebbleTemplateImpl self, Writer writer, EvaluationContextImpl if (result instanceof Boolean || result instanceof Number || result instanceof String) { - satisfied = compatibleCast(result, Boolean.class); + satisfied = TypeUtils.compatibleCast(result, Boolean.class); } else { throw new PebbleException( null, diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ImportNode.java b/pebble/src/main/java/io/pebbletemplates/node/ImportNode.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/ImportNode.java rename to pebble/src/main/java/io/pebbletemplates/node/ImportNode.java index 7dd730466..a9518d4dd 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ImportNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/ImportNode.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.MacroAttributeProvider; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.MacroAttributeProvider; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.Writer; public class ImportNode extends AbstractRenderableNode { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/IncludeNode.java b/pebble/src/main/java/io/pebbletemplates/node/IncludeNode.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/IncludeNode.java rename to pebble/src/main/java/io/pebbletemplates/node/IncludeNode.java index 216341177..fca0b8907 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/IncludeNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/IncludeNode.java @@ -6,14 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; - -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.node.expression.MapExpression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +package io.pebbletemplates.node; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.node.expression.MapExpression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; + import java.io.IOException; import java.io.Writer; import java.util.Collections; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/MacroNode.java b/pebble/src/main/java/io/pebbletemplates/node/MacroNode.java similarity index 86% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/MacroNode.java rename to pebble/src/main/java/io/pebbletemplates/node/MacroNode.java index 3d0cc6b2c..533d95271 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/MacroNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/MacroNode.java @@ -6,15 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; - -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.Macro; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.template.ScopeChain; -import com.mitchellbosecke.pebble.utils.LimitedSizeWriter; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.Macro; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.template.ScopeChain; +import io.pebbletemplates.utils.LimitedSizeWriter; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/NamedArgumentNode.java b/pebble/src/main/java/io/pebbletemplates/node/NamedArgumentNode.java similarity index 80% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/NamedArgumentNode.java rename to pebble/src/main/java/io/pebbletemplates/node/NamedArgumentNode.java index 0b35056eb..f4f9eef09 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/NamedArgumentNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/NamedArgumentNode.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; public class NamedArgumentNode implements Node { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/Node.java b/pebble/src/main/java/io/pebbletemplates/node/Node.java similarity index 74% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/Node.java rename to pebble/src/main/java/io/pebbletemplates/node/Node.java index 069ebb1ed..c80419f42 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/Node.java +++ b/pebble/src/main/java/io/pebbletemplates/node/Node.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.extension.NodeVisitor; +import io.pebbletemplates.extension.NodeVisitor; public interface Node { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ParallelNode.java b/pebble/src/main/java/io/pebbletemplates/node/ParallelNode.java similarity index 88% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/ParallelNode.java rename to pebble/src/main/java/io/pebbletemplates/node/ParallelNode.java index 13fce2e54..abaf69e76 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/ParallelNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/ParallelNode.java @@ -6,17 +6,18 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.FutureWriter; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.FutureWriter; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +41,7 @@ public ParallelNode(int lineNumber, BodyNode body) { @Override public void render(final PebbleTemplateImpl self, Writer writer, - final EvaluationContextImpl context) + final EvaluationContextImpl context) throws IOException { ExecutorService es = context.getExecutorService(); diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/PositionalArgumentNode.java b/pebble/src/main/java/io/pebbletemplates/node/PositionalArgumentNode.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/PositionalArgumentNode.java rename to pebble/src/main/java/io/pebbletemplates/node/PositionalArgumentNode.java index 30900861a..9f4fc0469 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/PositionalArgumentNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/PositionalArgumentNode.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; public class PositionalArgumentNode implements Node { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/PrintNode.java b/pebble/src/main/java/io/pebbletemplates/node/PrintNode.java similarity index 69% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/PrintNode.java rename to pebble/src/main/java/io/pebbletemplates/node/PrintNode.java index 96c715120..3abd760cb 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/PrintNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/PrintNode.java @@ -6,16 +6,17 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; - -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.extension.writer.SpecializedWriter; -import com.mitchellbosecke.pebble.extension.writer.StringWriterSpecializedAdapter; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.StringUtils; +package io.pebbletemplates.node; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.extension.writer.SpecializedWriter; +import io.pebbletemplates.extension.writer.StringWriterSpecializedAdapter; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.StringUtils; + import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -32,7 +33,7 @@ public PrintNode(Expression expression, int lineNumber) { @Override public void render(PebbleTemplateImpl self, Writer writer, EvaluationContextImpl context) throws IOException, - PebbleException { + PebbleException { Object var = this.expression.evaluate(self, context); if (var != null) { if (writer instanceof StringWriter) { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/RenderableNode.java b/pebble/src/main/java/io/pebbletemplates/node/RenderableNode.java similarity index 71% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/RenderableNode.java rename to pebble/src/main/java/io/pebbletemplates/node/RenderableNode.java index ce2baad6d..69d4db922 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/RenderableNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/RenderableNode.java @@ -6,10 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/RootNode.java b/pebble/src/main/java/io/pebbletemplates/node/RootNode.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/RootNode.java rename to pebble/src/main/java/io/pebbletemplates/node/RootNode.java index a33cdea4e..acc89a5b3 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/RootNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/RootNode.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/SetNode.java b/pebble/src/main/java/io/pebbletemplates/node/SetNode.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/SetNode.java rename to pebble/src/main/java/io/pebbletemplates/node/SetNode.java index 41b6c958e..30ecac7c6 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/SetNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/SetNode.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.Writer; public class SetNode extends AbstractRenderableNode { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/TestInvocationExpression.java b/pebble/src/main/java/io/pebbletemplates/node/TestInvocationExpression.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/TestInvocationExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/TestInvocationExpression.java index ad56cd4b2..cb40dc80a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/TestInvocationExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/TestInvocationExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; /** * The right hand side to the test expression. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/TextNode.java b/pebble/src/main/java/io/pebbletemplates/node/TextNode.java similarity index 82% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/TextNode.java rename to pebble/src/main/java/io/pebbletemplates/node/TextNode.java index 9c1e0242b..c144e2673 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/TextNode.java +++ b/pebble/src/main/java/io/pebbletemplates/node/TextNode.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/AddExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/AddExpression.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/AddExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/AddExpression.java index 61e4592b0..2324f720d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/AddExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/AddExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class AddExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/AndExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/AndExpression.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/AndExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/AndExpression.java index 0c0a9fd2a..da2bde283 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/AndExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/AndExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import static com.mitchellbosecke.pebble.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.utils.TypeUtils.compatibleCast; public class AndExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ArrayExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/ArrayExpression.java similarity index 85% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ArrayExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/ArrayExpression.java index 2bf651ac2..a05c4a319 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ArrayExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/ArrayExpression.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/BinaryExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/BinaryExpression.java similarity index 93% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/BinaryExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/BinaryExpression.java index abd11fb07..72a2793a5 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/BinaryExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/BinaryExpression.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; +import io.pebbletemplates.extension.NodeVisitor; public abstract class BinaryExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/BlockFunctionExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/BlockFunctionExpression.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/BlockFunctionExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/BlockFunctionExpression.java index 2fb08eb0c..b5ee414ba 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/BlockFunctionExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/BlockFunctionExpression.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ConcatenateExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/ConcatenateExpression.java similarity index 83% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ConcatenateExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/ConcatenateExpression.java index 160df6f0a..dd8bc5942 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ConcatenateExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/ConcatenateExpression.java @@ -1,7 +1,7 @@ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; /** * Expression which implements the string concatenation. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ContainsExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/ContainsExpression.java similarity index 95% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ContainsExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/ContainsExpression.java index 932317564..19d48d558 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ContainsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/ContainsExpression.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.util.Collection; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ContextVariableExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/ContextVariableExpression.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ContextVariableExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/ContextVariableExpression.java index f16071394..c17c91f0f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ContextVariableExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/ContextVariableExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.RootAttributeNotFoundException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.template.ScopeChain; +import io.pebbletemplates.error.RootAttributeNotFoundException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.template.ScopeChain; public class ContextVariableExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/DivideExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/DivideExpression.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/DivideExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/DivideExpression.java index 11456b0f0..dc416eb40 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/DivideExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/DivideExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class DivideExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/EqualsExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/EqualsExpression.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/EqualsExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/EqualsExpression.java index 5113b2a19..c9a9edb78 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/EqualsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/EqualsExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class EqualsExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/Expression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/Expression.java similarity index 69% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/Expression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/Expression.java index ed47a201b..a55fc0cdb 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/Expression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/Expression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.node.Node; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.node.Node; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; public interface Expression extends Node { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/FilterExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/FilterExpression.java similarity index 76% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/FilterExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/FilterExpression.java index 292ff65c0..e59bdf5df 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/FilterExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/FilterExpression.java @@ -6,17 +6,18 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.extension.core.DefaultFilter; +import io.pebbletemplates.error.AttributeNotFoundException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.escaper.EscapeFilter; +import io.pebbletemplates.extension.escaper.SafeString; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.error.AttributeNotFoundException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.extension.core.DefaultFilter; -import com.mitchellbosecke.pebble.extension.escaper.EscapeFilter; -import com.mitchellbosecke.pebble.extension.escaper.SafeString; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.util.Map; public class FilterExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/FilterInvocationExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/FilterInvocationExpression.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/FilterInvocationExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/FilterInvocationExpression.java index 09294daf3..38562e75e 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/FilterInvocationExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/FilterInvocationExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; /** * The right hand side to the filter expression. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/FunctionOrMacroInvocationExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/FunctionOrMacroInvocationExpression.java similarity index 83% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/FunctionOrMacroInvocationExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/FunctionOrMacroInvocationExpression.java index 443d0264a..ff2913f1e 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/FunctionOrMacroInvocationExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/FunctionOrMacroInvocationExpression.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.util.Map; public class FunctionOrMacroInvocationExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/GetAttributeExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/GetAttributeExpression.java similarity index 86% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/GetAttributeExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/GetAttributeExpression.java index 56f242235..0346dc8ae 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/GetAttributeExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/GetAttributeExpression.java @@ -6,18 +6,19 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; - -import com.mitchellbosecke.pebble.attributes.AttributeResolver; -import com.mitchellbosecke.pebble.attributes.ResolvedAttribute; -import com.mitchellbosecke.pebble.error.AttributeNotFoundException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.error.RootAttributeNotFoundException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.PositionalArgumentNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.error.AttributeNotFoundException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.error.RootAttributeNotFoundException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.attributes.AttributeResolver; +import io.pebbletemplates.attributes.ResolvedAttribute; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.PositionalArgumentNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; + import java.util.List; /** diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/GreaterThanEqualsExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanEqualsExpression.java similarity index 71% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/GreaterThanEqualsExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanEqualsExpression.java index c165bc9a0..3548f10eb 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/GreaterThanEqualsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanEqualsExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class GreaterThanEqualsExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/GreaterThanExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanExpression.java similarity index 71% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/GreaterThanExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanExpression.java index a9d6daed4..21b1d7044 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/GreaterThanExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class GreaterThanExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LessThanEqualsExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/LessThanEqualsExpression.java similarity index 71% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LessThanEqualsExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/LessThanEqualsExpression.java index 9e1e4e608..d28ed6bf6 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LessThanEqualsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/LessThanEqualsExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class LessThanEqualsExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LessThanExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/LessThanExpression.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LessThanExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/LessThanExpression.java index acc9e6808..ffe04d878 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LessThanExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/LessThanExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class LessThanExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralBigDecimalExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBigDecimalExpression.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralBigDecimalExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBigDecimalExpression.java index 37a0a44bf..8eec46061 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralBigDecimalExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBigDecimalExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; import java.math.BigDecimal; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralBooleanExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBooleanExpression.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralBooleanExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBooleanExpression.java index 1b0670f5e..b761dbd30 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralBooleanExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBooleanExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; public class LiteralBooleanExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralDoubleExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralDoubleExpression.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralDoubleExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/LiteralDoubleExpression.java index ae984de92..bbbd7b927 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralDoubleExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralDoubleExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; public class LiteralDoubleExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralIntegerExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralIntegerExpression.java similarity index 76% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralIntegerExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/LiteralIntegerExpression.java index 09be6f7cf..36337507b 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralIntegerExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralIntegerExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; public class LiteralIntegerExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralLongExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralLongExpression.java similarity index 77% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralLongExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/LiteralLongExpression.java index 9d5bdbd4e..871cbe1c9 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralLongExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralLongExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; public class LiteralLongExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralNullExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralNullExpression.java similarity index 74% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralNullExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/LiteralNullExpression.java index 75d162caa..39546b1bc 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralNullExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralNullExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; public class LiteralNullExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralStringExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralStringExpression.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralStringExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/LiteralStringExpression.java index 5ae03e310..098745c50 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/LiteralStringExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralStringExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; public class LiteralStringExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/MapExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/MapExpression.java similarity index 87% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/MapExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/MapExpression.java index 333b0176a..6a1c96906 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/MapExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/MapExpression.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ModulusExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/ModulusExpression.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ModulusExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/ModulusExpression.java index 22a7fe9b9..77f371ed4 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ModulusExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/ModulusExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class ModulusExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/MultiplyExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/MultiplyExpression.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/MultiplyExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/MultiplyExpression.java index 6d7410e3a..8070a5efa 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/MultiplyExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/MultiplyExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class MultiplyExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/NegativeTestExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/NegativeTestExpression.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/NegativeTestExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/NegativeTestExpression.java index e58e41309..dc95f8d1f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/NegativeTestExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/NegativeTestExpression.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; public class NegativeTestExpression extends PositiveTestExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/NotEqualsExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/NotEqualsExpression.java similarity index 71% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/NotEqualsExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/NotEqualsExpression.java index daff9eb78..dc921489a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/NotEqualsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/NotEqualsExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class NotEqualsExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/OrExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/OrExpression.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/OrExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/OrExpression.java index 54db660dc..47410c79a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/OrExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/OrExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import static com.mitchellbosecke.pebble.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.utils.TypeUtils.compatibleCast; public class OrExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ParentFunctionExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/ParentFunctionExpression.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ParentFunctionExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/ParentFunctionExpression.java index bc37c57f5..fd7a9b239 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/ParentFunctionExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/ParentFunctionExpression.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.Hierarchy; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.Hierarchy; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/PositiveTestExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/PositiveTestExpression.java similarity index 77% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/PositiveTestExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/PositiveTestExpression.java index 5f51d5d57..db35b59b2 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/PositiveTestExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/PositiveTestExpression.java @@ -6,16 +6,17 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.error.AttributeNotFoundException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.Test; +import io.pebbletemplates.extension.core.DefinedTest; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.TestInvocationExpression; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.error.AttributeNotFoundException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.Test; -import com.mitchellbosecke.pebble.extension.core.DefinedTest; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.TestInvocationExpression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.util.Map; public class PositiveTestExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/RangeExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/RangeExpression.java similarity index 69% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/RangeExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/RangeExpression.java index 80c4cd0fe..84ed838c5 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/RangeExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/RangeExpression.java @@ -1,10 +1,11 @@ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.extension.core.RangeFunction; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.PositionalArgumentNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.extension.core.RangeFunction; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.PositionalArgumentNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/RenderableNodeExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/RenderableNodeExpression.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/RenderableNodeExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/RenderableNodeExpression.java index f56da9e00..a47f76d16 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/RenderableNodeExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/RenderableNodeExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.LimitedSizeWriter; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.LimitedSizeWriter; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/SubtractExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/SubtractExpression.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/SubtractExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/SubtractExpression.java index 692e81be9..549705567 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/SubtractExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/SubtractExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class SubtractExpression extends BinaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/TernaryExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/TernaryExpression.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/TernaryExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/TernaryExpression.java index e5a4ea7bc..e1eda1e29 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/TernaryExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/TernaryExpression.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.TypeUtils; -import static com.mitchellbosecke.pebble.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.utils.TypeUtils.compatibleCast; public class TernaryExpression implements Expression { @@ -36,7 +37,7 @@ public TernaryExpression(Expression expression1, Expression expressi public Object evaluate(PebbleTemplateImpl self, EvaluationContextImpl context) { Object evaluatedExpression1 = this.expression1.evaluate(self, context); if (evaluatedExpression1 != null - && compatibleCast(evaluatedExpression1, Boolean.class)) { + && TypeUtils.compatibleCast(evaluatedExpression1, Boolean.class)) { return this.expression2.evaluate(self, context); } else { return this.expression3.evaluate(self, context); diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryExpression.java similarity index 89% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/UnaryExpression.java index 249a274a4..8b8a49d5b 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryExpression.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.extension.NodeVisitor; +import io.pebbletemplates.extension.NodeVisitor; public abstract class UnaryExpression implements Expression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryMinusExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryMinusExpression.java similarity index 66% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryMinusExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/UnaryMinusExpression.java index 860d6f287..d98c34e57 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryMinusExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryMinusExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class UnaryMinusExpression extends UnaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryNotExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryNotExpression.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryNotExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/UnaryNotExpression.java index 3682d1ecf..02f9364fe 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryNotExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryNotExpression.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.TypeUtils; -import static com.mitchellbosecke.pebble.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.utils.TypeUtils.compatibleCast; public class UnaryNotExpression extends UnaryExpression { @@ -23,7 +24,7 @@ public Boolean evaluate(PebbleTemplateImpl self, EvaluationContextImpl context) if (result instanceof Boolean || result instanceof Number || result instanceof String) { - return !compatibleCast(result, Boolean.class); + return !TypeUtils.compatibleCast(result, Boolean.class); } throw new PebbleException( null, diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryPlusExpression.java b/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryPlusExpression.java similarity index 66% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryPlusExpression.java rename to pebble/src/main/java/io/pebbletemplates/node/expression/UnaryPlusExpression.java index 42429f585..781c573cb 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/expression/UnaryPlusExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryPlusExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.utils.OperatorUtils; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.utils.OperatorUtils; public class UnaryPlusExpression extends UnaryExpression { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/fornode/LazyLength.java b/pebble/src/main/java/io/pebbletemplates/node/fornode/LazyLength.java similarity index 97% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/fornode/LazyLength.java rename to pebble/src/main/java/io/pebbletemplates/node/fornode/LazyLength.java index c8c55ea72..1fad2553f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/fornode/LazyLength.java +++ b/pebble/src/main/java/io/pebbletemplates/node/fornode/LazyLength.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.node.fornode; +package io.pebbletemplates.node.fornode; import java.lang.reflect.Array; import java.util.Collection; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/node/fornode/LazyRevIndex.java b/pebble/src/main/java/io/pebbletemplates/node/fornode/LazyRevIndex.java similarity index 93% rename from pebble/src/main/java/com/mitchellbosecke/pebble/node/fornode/LazyRevIndex.java rename to pebble/src/main/java/io/pebbletemplates/node/fornode/LazyRevIndex.java index 7fd602f9b..db85e1dce 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/node/fornode/LazyRevIndex.java +++ b/pebble/src/main/java/io/pebbletemplates/node/fornode/LazyRevIndex.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.node.fornode; +package io.pebbletemplates.node.fornode; public class LazyRevIndex extends Number { private final int value; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/Associativity.java b/pebble/src/main/java/io/pebbletemplates/operator/Associativity.java similarity index 85% rename from pebble/src/main/java/com/mitchellbosecke/pebble/operator/Associativity.java rename to pebble/src/main/java/io/pebbletemplates/operator/Associativity.java index a8d68f7c0..ea1a3be4a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/Associativity.java +++ b/pebble/src/main/java/io/pebbletemplates/operator/Associativity.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.operator; +package io.pebbletemplates.operator; public enum Associativity { LEFT, RIGHT diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperator.java b/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperator.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperator.java rename to pebble/src/main/java/io/pebbletemplates/operator/BinaryOperator.java index 30d1dd6e5..e90ba0492 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperator.java +++ b/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperator.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.operator; +package io.pebbletemplates.operator; -import com.mitchellbosecke.pebble.node.expression.BinaryExpression; +import io.pebbletemplates.node.expression.BinaryExpression; public interface BinaryOperator { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorImpl.java b/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorImpl.java similarity index 86% rename from pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorImpl.java rename to pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorImpl.java index 21c33d360..369aeccc2 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorImpl.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.operator; +package io.pebbletemplates.operator; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.node.expression.BinaryExpression; -import com.mitchellbosecke.pebble.node.expression.FilterExpression; -import com.mitchellbosecke.pebble.node.expression.NegativeTestExpression; -import com.mitchellbosecke.pebble.node.expression.PositiveTestExpression; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.node.expression.BinaryExpression; +import io.pebbletemplates.node.expression.FilterExpression; +import io.pebbletemplates.node.expression.NegativeTestExpression; +import io.pebbletemplates.node.expression.PositiveTestExpression; import java.util.function.Supplier; public class BinaryOperatorImpl implements BinaryOperator { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorType.java b/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorType.java similarity index 56% rename from pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorType.java rename to pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorType.java index c6eef3f28..390fa7434 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/BinaryOperatorType.java +++ b/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorType.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.operator; +package io.pebbletemplates.operator; public enum BinaryOperatorType { NORMAL, FILTER, TEST diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/UnaryOperator.java b/pebble/src/main/java/io/pebbletemplates/operator/UnaryOperator.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/operator/UnaryOperator.java rename to pebble/src/main/java/io/pebbletemplates/operator/UnaryOperator.java index 8c0c826a5..8d2e16c1a 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/UnaryOperator.java +++ b/pebble/src/main/java/io/pebbletemplates/operator/UnaryOperator.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.operator; +package io.pebbletemplates.operator; -import com.mitchellbosecke.pebble.node.expression.UnaryExpression; +import io.pebbletemplates.node.expression.UnaryExpression; public interface UnaryOperator { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/UnaryOperatorImpl.java b/pebble/src/main/java/io/pebbletemplates/operator/UnaryOperatorImpl.java similarity index 88% rename from pebble/src/main/java/com/mitchellbosecke/pebble/operator/UnaryOperatorImpl.java rename to pebble/src/main/java/io/pebbletemplates/operator/UnaryOperatorImpl.java index 90153acaf..54f5fd36c 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/operator/UnaryOperatorImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/operator/UnaryOperatorImpl.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.operator; +package io.pebbletemplates.operator; -import com.mitchellbosecke.pebble.node.expression.UnaryExpression; +import io.pebbletemplates.node.expression.UnaryExpression; public class UnaryOperatorImpl implements UnaryOperator { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ExpressionParser.java b/pebble/src/main/java/io/pebbletemplates/parser/ExpressionParser.java similarity index 90% rename from pebble/src/main/java/com/mitchellbosecke/pebble/parser/ExpressionParser.java rename to pebble/src/main/java/io/pebbletemplates/parser/ExpressionParser.java index 24a3b2a25..69f03187d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ExpressionParser.java +++ b/pebble/src/main/java/io/pebbletemplates/parser/ExpressionParser.java @@ -6,40 +6,40 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.parser; - -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.FunctionOrMacroNameNode; -import com.mitchellbosecke.pebble.node.NamedArgumentNode; -import com.mitchellbosecke.pebble.node.PositionalArgumentNode; -import com.mitchellbosecke.pebble.node.TestInvocationExpression; -import com.mitchellbosecke.pebble.node.expression.ArrayExpression; -import com.mitchellbosecke.pebble.node.expression.BinaryExpression; -import com.mitchellbosecke.pebble.node.expression.BlockFunctionExpression; -import com.mitchellbosecke.pebble.node.expression.ConcatenateExpression; -import com.mitchellbosecke.pebble.node.expression.ContextVariableExpression; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.node.expression.FilterInvocationExpression; -import com.mitchellbosecke.pebble.node.expression.FunctionOrMacroInvocationExpression; -import com.mitchellbosecke.pebble.node.expression.GetAttributeExpression; -import com.mitchellbosecke.pebble.node.expression.LiteralBigDecimalExpression; -import com.mitchellbosecke.pebble.node.expression.LiteralBooleanExpression; -import com.mitchellbosecke.pebble.node.expression.LiteralDoubleExpression; -import com.mitchellbosecke.pebble.node.expression.LiteralIntegerExpression; -import com.mitchellbosecke.pebble.node.expression.LiteralLongExpression; -import com.mitchellbosecke.pebble.node.expression.LiteralNullExpression; -import com.mitchellbosecke.pebble.node.expression.LiteralStringExpression; -import com.mitchellbosecke.pebble.node.expression.MapExpression; -import com.mitchellbosecke.pebble.node.expression.ParentFunctionExpression; -import com.mitchellbosecke.pebble.node.expression.TernaryExpression; -import com.mitchellbosecke.pebble.node.expression.UnaryExpression; -import com.mitchellbosecke.pebble.operator.Associativity; -import com.mitchellbosecke.pebble.operator.BinaryOperator; -import com.mitchellbosecke.pebble.operator.BinaryOperatorType; -import com.mitchellbosecke.pebble.operator.UnaryOperator; +package io.pebbletemplates.parser; + +import io.pebbletemplates.operator.Associativity; +import io.pebbletemplates.operator.BinaryOperator; +import io.pebbletemplates.operator.BinaryOperatorType; +import io.pebbletemplates.operator.UnaryOperator; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.FunctionOrMacroNameNode; +import io.pebbletemplates.node.NamedArgumentNode; +import io.pebbletemplates.node.PositionalArgumentNode; +import io.pebbletemplates.node.TestInvocationExpression; +import io.pebbletemplates.node.expression.ArrayExpression; +import io.pebbletemplates.node.expression.BinaryExpression; +import io.pebbletemplates.node.expression.BlockFunctionExpression; +import io.pebbletemplates.node.expression.ConcatenateExpression; +import io.pebbletemplates.node.expression.ContextVariableExpression; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.node.expression.FilterInvocationExpression; +import io.pebbletemplates.node.expression.FunctionOrMacroInvocationExpression; +import io.pebbletemplates.node.expression.GetAttributeExpression; +import io.pebbletemplates.node.expression.LiteralBigDecimalExpression; +import io.pebbletemplates.node.expression.LiteralBooleanExpression; +import io.pebbletemplates.node.expression.LiteralDoubleExpression; +import io.pebbletemplates.node.expression.LiteralIntegerExpression; +import io.pebbletemplates.node.expression.LiteralLongExpression; +import io.pebbletemplates.node.expression.LiteralNullExpression; +import io.pebbletemplates.node.expression.LiteralStringExpression; +import io.pebbletemplates.node.expression.MapExpression; +import io.pebbletemplates.node.expression.ParentFunctionExpression; +import io.pebbletemplates.node.expression.TernaryExpression; +import io.pebbletemplates.node.expression.UnaryExpression; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/Parser.java b/pebble/src/main/java/io/pebbletemplates/parser/Parser.java similarity index 82% rename from pebble/src/main/java/com/mitchellbosecke/pebble/parser/Parser.java rename to pebble/src/main/java/io/pebbletemplates/parser/Parser.java index b73648b0e..c18e410e1 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/Parser.java +++ b/pebble/src/main/java/io/pebbletemplates/parser/Parser.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.parser; +package io.pebbletemplates.parser; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.RootNode; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.RootNode; public interface Parser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ParserImpl.java b/pebble/src/main/java/io/pebbletemplates/parser/ParserImpl.java similarity index 90% rename from pebble/src/main/java/com/mitchellbosecke/pebble/parser/ParserImpl.java rename to pebble/src/main/java/io/pebbletemplates/parser/ParserImpl.java index 6e006b312..45688c5af 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ParserImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/parser/ParserImpl.java @@ -6,20 +6,21 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.parser; - -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.PrintNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.node.TextNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.operator.BinaryOperator; -import com.mitchellbosecke.pebble.operator.UnaryOperator; -import com.mitchellbosecke.pebble.tokenParser.TokenParser; +package io.pebbletemplates.parser; + +import io.pebbletemplates.operator.BinaryOperator; +import io.pebbletemplates.operator.UnaryOperator; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.PrintNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.RootNode; +import io.pebbletemplates.node.TextNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.tokenParser.TokenParser; + import java.util.ArrayList; import java.util.LinkedList; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ParserOptions.java b/pebble/src/main/java/io/pebbletemplates/parser/ParserOptions.java similarity index 94% rename from pebble/src/main/java/com/mitchellbosecke/pebble/parser/ParserOptions.java rename to pebble/src/main/java/io/pebbletemplates/parser/ParserOptions.java index ec0ca278e..0bbd98246 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/ParserOptions.java +++ b/pebble/src/main/java/io/pebbletemplates/parser/ParserOptions.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.parser; +package io.pebbletemplates.parser; /** * Parser options. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/StoppingCondition.java b/pebble/src/main/java/io/pebbletemplates/parser/StoppingCondition.java similarity index 86% rename from pebble/src/main/java/com/mitchellbosecke/pebble/parser/StoppingCondition.java rename to pebble/src/main/java/io/pebbletemplates/parser/StoppingCondition.java index d234e2ed8..5b9f7a740 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/parser/StoppingCondition.java +++ b/pebble/src/main/java/io/pebbletemplates/parser/StoppingCondition.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.parser; +package io.pebbletemplates.parser; -import com.mitchellbosecke.pebble.lexer.Token; +import io.pebbletemplates.lexer.Token; /** * Implementations of this class are provided by the TokenParsers and handed to the main Parser. The diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/Block.java b/pebble/src/main/java/io/pebbletemplates/template/Block.java similarity index 90% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/Block.java rename to pebble/src/main/java/io/pebbletemplates/template/Block.java index 09c49ca0e..a7d28663d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/Block.java +++ b/pebble/src/main/java/io/pebbletemplates/template/Block.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/EvaluationContext.java b/pebble/src/main/java/io/pebbletemplates/template/EvaluationContext.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/EvaluationContext.java rename to pebble/src/main/java/io/pebbletemplates/template/EvaluationContext.java index 7dd00ee38..770326265 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/EvaluationContext.java +++ b/pebble/src/main/java/io/pebbletemplates/template/EvaluationContext.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; import java.util.Locale; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/EvaluationContextImpl.java b/pebble/src/main/java/io/pebbletemplates/template/EvaluationContextImpl.java similarity index 96% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/EvaluationContextImpl.java rename to pebble/src/main/java/io/pebbletemplates/template/EvaluationContextImpl.java index 38b11a40d..c65b544a1 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/EvaluationContextImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/template/EvaluationContextImpl.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; -import com.mitchellbosecke.pebble.cache.CacheKey; -import com.mitchellbosecke.pebble.cache.PebbleCache; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.ExtensionRegistry; -import com.mitchellbosecke.pebble.utils.Callbacks; +import io.pebbletemplates.cache.CacheKey; +import io.pebbletemplates.cache.PebbleCache; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.ExtensionRegistry; +import io.pebbletemplates.utils.Callbacks; import java.io.IOException; import java.util.ArrayList; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/EvaluationOptions.java b/pebble/src/main/java/io/pebbletemplates/template/EvaluationOptions.java similarity index 85% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/EvaluationOptions.java rename to pebble/src/main/java/io/pebbletemplates/template/EvaluationOptions.java index c200d318d..51a9071c5 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/EvaluationOptions.java +++ b/pebble/src/main/java/io/pebbletemplates/template/EvaluationOptions.java @@ -1,6 +1,6 @@ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; -import com.mitchellbosecke.pebble.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; /** * Evaluation options. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/GlobalContext.java b/pebble/src/main/java/io/pebbletemplates/template/GlobalContext.java similarity index 97% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/GlobalContext.java rename to pebble/src/main/java/io/pebbletemplates/template/GlobalContext.java index 3abcd029d..3350eb321 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/GlobalContext.java +++ b/pebble/src/main/java/io/pebbletemplates/template/GlobalContext.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; import java.util.Collection; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/Hierarchy.java b/pebble/src/main/java/io/pebbletemplates/template/Hierarchy.java similarity index 98% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/Hierarchy.java rename to pebble/src/main/java/io/pebbletemplates/template/Hierarchy.java index b10018af5..af898b347 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/Hierarchy.java +++ b/pebble/src/main/java/io/pebbletemplates/template/Hierarchy.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; import java.util.ArrayList; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/Macro.java b/pebble/src/main/java/io/pebbletemplates/template/Macro.java similarity index 79% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/Macro.java rename to pebble/src/main/java/io/pebbletemplates/template/Macro.java index 8e5782c6a..c78f4fcd0 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/Macro.java +++ b/pebble/src/main/java/io/pebbletemplates/template/Macro.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; -import com.mitchellbosecke.pebble.extension.NamedArguments; +import io.pebbletemplates.extension.NamedArguments; import java.util.Map; public interface Macro extends NamedArguments { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/MacroAttributeProvider.java b/pebble/src/main/java/io/pebbletemplates/template/MacroAttributeProvider.java similarity index 87% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/MacroAttributeProvider.java rename to pebble/src/main/java/io/pebbletemplates/template/MacroAttributeProvider.java index 73e172d78..f24f5dbab 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/MacroAttributeProvider.java +++ b/pebble/src/main/java/io/pebbletemplates/template/MacroAttributeProvider.java @@ -1,6 +1,6 @@ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; -import com.mitchellbosecke.pebble.node.ArgumentsNode; +import io.pebbletemplates.node.ArgumentsNode; public class MacroAttributeProvider { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/PebbleTemplate.java b/pebble/src/main/java/io/pebbletemplates/template/PebbleTemplate.java similarity index 94% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/PebbleTemplate.java rename to pebble/src/main/java/io/pebbletemplates/template/PebbleTemplate.java index db75b2b77..2eb75f377 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/PebbleTemplate.java +++ b/pebble/src/main/java/io/pebbletemplates/template/PebbleTemplate.java @@ -6,7 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; + +import io.pebbletemplates.PebbleEngine; import java.io.IOException; import java.io.Writer; @@ -14,7 +16,7 @@ import java.util.Map; /** - * A template object constructed by an instance of {@link com.mitchellbosecke.pebble.PebbleEngine}. + * A template object constructed by an instance of {@link PebbleEngine}. * A template by itself is stateless and can therefore be re-used over and over to provide different * outputs depending on the variables that are provided at the time of evaluation. */ @@ -22,7 +24,7 @@ public interface PebbleTemplate { /** * Evaluate the template without any provided variables. This will use the default locale provided - * by the {@link com.mitchellbosecke.pebble.PebbleEngine}. + * by the {@link PebbleEngine}. * * @param writer The results of the evaluation are written to this writer. * @throws IOException An IO exception during the evaluation @@ -40,7 +42,7 @@ public interface PebbleTemplate { /** * Evaluate the template with a set of variables and the default locale provided by the {@link - * com.mitchellbosecke.pebble.PebbleEngine} + * PebbleEngine} * * @param writer The results of the evaluation are written to this writer. * @param context The variables used during the evaluation of the template. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/PebbleTemplateImpl.java b/pebble/src/main/java/io/pebbletemplates/template/PebbleTemplateImpl.java similarity index 96% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/PebbleTemplateImpl.java rename to pebble/src/main/java/io/pebbletemplates/template/PebbleTemplateImpl.java index 04bdd9b7e..c722f8249 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/PebbleTemplateImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/template/PebbleTemplateImpl.java @@ -6,19 +6,19 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.template; - -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.escaper.SafeString; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.BlockNode; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.utils.FutureWriter; -import com.mitchellbosecke.pebble.utils.LimitedSizeWriter; -import com.mitchellbosecke.pebble.utils.Pair; +package io.pebbletemplates.template; + +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.escaper.SafeString; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.BlockNode; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.RootNode; +import io.pebbletemplates.utils.FutureWriter; +import io.pebbletemplates.utils.LimitedSizeWriter; +import io.pebbletemplates.utils.Pair; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/RenderedSizeContext.java b/pebble/src/main/java/io/pebbletemplates/template/RenderedSizeContext.java similarity index 69% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/RenderedSizeContext.java rename to pebble/src/main/java/io/pebbletemplates/template/RenderedSizeContext.java index ed6f026ee..db9e72f07 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/RenderedSizeContext.java +++ b/pebble/src/main/java/io/pebbletemplates/template/RenderedSizeContext.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; public interface RenderedSizeContext { int getMaxRenderedSize(); diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/Scope.java b/pebble/src/main/java/io/pebbletemplates/template/Scope.java similarity index 98% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/Scope.java rename to pebble/src/main/java/io/pebbletemplates/template/Scope.java index b16001753..f6c9506f1 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/Scope.java +++ b/pebble/src/main/java/io/pebbletemplates/template/Scope.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; import java.util.HashMap; import java.util.Set; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/template/ScopeChain.java b/pebble/src/main/java/io/pebbletemplates/template/ScopeChain.java similarity index 99% rename from pebble/src/main/java/com/mitchellbosecke/pebble/template/ScopeChain.java rename to pebble/src/main/java/io/pebbletemplates/template/ScopeChain.java index 32563c406..2ad59831d 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/template/ScopeChain.java +++ b/pebble/src/main/java/io/pebbletemplates/template/ScopeChain.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.template; +package io.pebbletemplates.template; import java.util.ArrayList; import java.util.HashMap; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/AutoEscapeTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/AutoEscapeTokenParser.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/AutoEscapeTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/AutoEscapeTokenParser.java index 01f71ad41..6757c0be9 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/AutoEscapeTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/AutoEscapeTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.AutoEscapeNode; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.AutoEscapeNode; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.parser.Parser; public class AutoEscapeTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/BlockTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/BlockTokenParser.java similarity index 82% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/BlockTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/BlockTokenParser.java index 645b7d2e6..d5cc23c76 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/BlockTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/BlockTokenParser.java @@ -6,15 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.BlockNode; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.BlockNode; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.parser.Parser; public class BlockTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/CacheTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/CacheTokenParser.java similarity index 72% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/CacheTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/CacheTokenParser.java index a1c135fce..8594c850e 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/CacheTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/CacheTokenParser.java @@ -6,15 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.CacheNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.CacheNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.parser.Parser; /** * Token parser for the cache tag diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/EmbedTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/EmbedTokenParser.java similarity index 84% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/EmbedTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/EmbedTokenParser.java index 222e7a7a1..d15fad66e 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/EmbedTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/EmbedTokenParser.java @@ -6,17 +6,17 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.BlockNode; -import com.mitchellbosecke.pebble.node.EmbedNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.node.expression.MapExpression; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.BlockNode; +import io.pebbletemplates.node.EmbedNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.node.expression.MapExpression; +import io.pebbletemplates.parser.Parser; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ExtendsTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/ExtendsTokenParser.java similarity index 67% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ExtendsTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/ExtendsTokenParser.java index a7d1216a1..9c7d0364f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ExtendsTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/ExtendsTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; +package io.pebbletemplates.tokenParser; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.ExtendsNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.parser.Parser; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.ExtendsNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.parser.Parser; public class ExtendsTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/FilterTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/FilterTokenParser.java similarity index 68% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/FilterTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/FilterTokenParser.java index a21de33be..04a1ef2af 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/FilterTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/FilterTokenParser.java @@ -6,18 +6,18 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.Token.Type; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.PrintNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.node.expression.FilterExpression; -import com.mitchellbosecke.pebble.node.expression.RenderableNodeExpression; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.PrintNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.node.expression.FilterExpression; +import io.pebbletemplates.node.expression.RenderableNodeExpression; +import io.pebbletemplates.parser.Parser; + import java.util.ArrayList; import java.util.List; @@ -38,7 +38,7 @@ public RenderableNode parse(Token token, Parser parser) { filterInvocationExpressions.add(parser.getExpressionParser().parseFilterInvocationExpression()); - while (stream.current().test(Type.OPERATOR, "|")) { + while (stream.current().test(Token.Type.OPERATOR, "|")) { // skip the '|' token stream.next(); filterInvocationExpressions @@ -47,7 +47,7 @@ public RenderableNode parse(Token token, Parser parser) { stream.expect(Token.Type.EXECUTE_END); - BodyNode body = parser.subparse(tkn -> tkn.test(Type.NAME, "endfilter")); + BodyNode body = parser.subparse(tkn -> tkn.test(Token.Type.NAME, "endfilter")); stream.next(); stream.expect(Token.Type.EXECUTE_END); diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/FlushTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/FlushTokenParser.java similarity index 68% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/FlushTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/FlushTokenParser.java index 295eef37b..a8091666f 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/FlushTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/FlushTokenParser.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; +package io.pebbletemplates.tokenParser; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.FlushNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.parser.Parser; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.FlushNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.parser.Parser; public class FlushTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ForTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/ForTokenParser.java similarity index 77% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ForTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/ForTokenParser.java index 23163418d..936b3bbf0 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ForTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/ForTokenParser.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; +package io.pebbletemplates.tokenParser; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.ForNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.parser.Parser; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.ForNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.parser.Parser; public class ForTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/FromTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/FromTokenParser.java similarity index 81% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/FromTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/FromTokenParser.java index e80532d38..a56728d39 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/FromTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/FromTokenParser.java @@ -1,13 +1,14 @@ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.FromNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.parser.Parser; -import com.mitchellbosecke.pebble.utils.Pair; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.FromNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.utils.Pair; + import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/IfTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/IfTokenParser.java similarity index 80% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/IfTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/IfTokenParser.java index 4560d67f0..8458d8790 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/IfTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/IfTokenParser.java @@ -6,18 +6,19 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.IfNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.parser.Parser; -import com.mitchellbosecke.pebble.parser.StoppingCondition; -import com.mitchellbosecke.pebble.utils.Pair; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.IfNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.parser.StoppingCondition; +import io.pebbletemplates.utils.Pair; + import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ImportTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/ImportTokenParser.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ImportTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/ImportTokenParser.java index 53bfbd977..1718fe0b5 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ImportTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/ImportTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.ImportNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.ImportNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.parser.Parser; public class ImportTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/IncludeTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/IncludeTokenParser.java similarity index 75% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/IncludeTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/IncludeTokenParser.java index fdc8c6fae..7bee7e835 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/IncludeTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/IncludeTokenParser.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.IncludeNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.node.expression.MapExpression; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.IncludeNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.node.expression.MapExpression; +import io.pebbletemplates.parser.Parser; public class IncludeTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/MacroTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/MacroTokenParser.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/MacroTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/MacroTokenParser.java index 3b4ef8f8e..04eb1b731 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/MacroTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/MacroTokenParser.java @@ -6,15 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.MacroNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.MacroNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.parser.Parser; public class MacroTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ParallelTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/ParallelTokenParser.java similarity index 70% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ParallelTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/ParallelTokenParser.java index 4b985a83f..a1713e196 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/ParallelTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/ParallelTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.ParallelNode; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.BodyNode; +import io.pebbletemplates.node.ParallelNode; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.parser.Parser; public class ParallelTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/SetTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/SetTokenParser.java similarity index 69% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/SetTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/SetTokenParser.java index d1c85739d..bf9265c49 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/SetTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/SetTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; - -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.node.SetNode; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.parser.Parser; +package io.pebbletemplates.tokenParser; + +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.node.SetNode; +import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.parser.Parser; public class SetTokenParser implements TokenParser { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/TokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/TokenParser.java similarity index 84% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/TokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/TokenParser.java index 7d71bb03a..bbce9e936 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/TokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/TokenParser.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; +package io.pebbletemplates.tokenParser; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.parser.Parser; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.parser.Parser; /** * A TokenParser is responsible for converting a stream of Tokens into a Node. A TokenParser often @@ -46,8 +46,8 @@ public interface TokenParser { * * Here are two relatively simple examples of how TokenParsers are implemented: * - * - self contained: com.mitchellbosecke.pebble.tokenParser.SetTokenParser - middle content: - * com.mitchellbosecke.pebble.tokenParser.BlockTokenParser + * - self contained: io.pebbletemplates.tokenParser.pebble.SetTokenParser - middle content: + * io.pebbletemplates.tokenParser.pebble.BlockTokenParser * * @param token The token to parse * @param parser the parser which should be used to parse the token diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/VerbatimTokenParser.java b/pebble/src/main/java/io/pebbletemplates/tokenParser/VerbatimTokenParser.java similarity index 76% rename from pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/VerbatimTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/tokenParser/VerbatimTokenParser.java index c25080a5d..d1e0e3ff1 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/tokenParser/VerbatimTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/tokenParser/VerbatimTokenParser.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.tokenParser; +package io.pebbletemplates.tokenParser; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.parser.Parser; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.parser.Parser; /** * This is just a dummy class to point developers into the right direction; the verbatim tag had to diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/Callbacks.java b/pebble/src/main/java/io/pebbletemplates/utils/Callbacks.java similarity index 78% rename from pebble/src/main/java/com/mitchellbosecke/pebble/utils/Callbacks.java rename to pebble/src/main/java/io/pebbletemplates/utils/Callbacks.java index f37a91692..b0d10a753 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/Callbacks.java +++ b/pebble/src/main/java/io/pebbletemplates/utils/Callbacks.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; import java.io.IOException; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/FutureWriter.java b/pebble/src/main/java/io/pebbletemplates/utils/FutureWriter.java similarity index 98% rename from pebble/src/main/java/com/mitchellbosecke/pebble/utils/FutureWriter.java rename to pebble/src/main/java/io/pebbletemplates/utils/FutureWriter.java index ea05d1a97..545bc7435 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/FutureWriter.java +++ b/pebble/src/main/java/io/pebbletemplates/utils/FutureWriter.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/LimitedSizeWriter.java b/pebble/src/main/java/io/pebbletemplates/utils/LimitedSizeWriter.java similarity index 94% rename from pebble/src/main/java/com/mitchellbosecke/pebble/utils/LimitedSizeWriter.java rename to pebble/src/main/java/io/pebbletemplates/utils/LimitedSizeWriter.java index eda9a8f33..defdc12eb 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/LimitedSizeWriter.java +++ b/pebble/src/main/java/io/pebbletemplates/utils/LimitedSizeWriter.java @@ -1,7 +1,7 @@ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.RenderedSizeContext; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.RenderedSizeContext; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/OperatorUtils.java b/pebble/src/main/java/io/pebbletemplates/utils/OperatorUtils.java similarity index 98% rename from pebble/src/main/java/com/mitchellbosecke/pebble/utils/OperatorUtils.java rename to pebble/src/main/java/io/pebbletemplates/utils/OperatorUtils.java index c93442216..9d0d0f3e5 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/OperatorUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/utils/OperatorUtils.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; -import com.mitchellbosecke.pebble.extension.escaper.SafeString; +import io.pebbletemplates.extension.escaper.SafeString; import java.math.BigDecimal; import java.math.MathContext; import java.util.Collection; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/Pair.java b/pebble/src/main/java/io/pebbletemplates/utils/Pair.java similarity index 94% rename from pebble/src/main/java/com/mitchellbosecke/pebble/utils/Pair.java rename to pebble/src/main/java/io/pebbletemplates/utils/Pair.java index c92a943c3..74b91f771 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/Pair.java +++ b/pebble/src/main/java/io/pebbletemplates/utils/Pair.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; /** * A small utility class used to pair relevant objects together. diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/PathUtils.java b/pebble/src/main/java/io/pebbletemplates/utils/PathUtils.java similarity index 98% rename from pebble/src/main/java/com/mitchellbosecke/pebble/utils/PathUtils.java rename to pebble/src/main/java/io/pebbletemplates/utils/PathUtils.java index f40b0c571..6819d0aad 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/PathUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/utils/PathUtils.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/StringLengthComparator.java b/pebble/src/main/java/io/pebbletemplates/utils/StringLengthComparator.java similarity index 92% rename from pebble/src/main/java/com/mitchellbosecke/pebble/utils/StringLengthComparator.java rename to pebble/src/main/java/io/pebbletemplates/utils/StringLengthComparator.java index 7e44d44a7..ae8c2a10b 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/StringLengthComparator.java +++ b/pebble/src/main/java/io/pebbletemplates/utils/StringLengthComparator.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; public class StringLengthComparator implements java.util.Comparator { diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/StringUtils.java b/pebble/src/main/java/io/pebbletemplates/utils/StringUtils.java similarity index 95% rename from pebble/src/main/java/com/mitchellbosecke/pebble/utils/StringUtils.java rename to pebble/src/main/java/io/pebbletemplates/utils/StringUtils.java index d8c7a1b9d..02ff0fa51 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/StringUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; import java.math.BigDecimal; diff --git a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/TypeUtils.java b/pebble/src/main/java/io/pebbletemplates/utils/TypeUtils.java similarity index 98% rename from pebble/src/main/java/com/mitchellbosecke/pebble/utils/TypeUtils.java rename to pebble/src/main/java/io/pebbletemplates/utils/TypeUtils.java index 1f53023ae..2c596cf91 100644 --- a/pebble/src/main/java/com/mitchellbosecke/pebble/utils/TypeUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/utils/TypeUtils.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ArgumentsNodeTest.java b/pebble/src/test/java/io/pebbletemplates/ArgumentsNodeTest.java similarity index 80% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ArgumentsNodeTest.java rename to pebble/src/test/java/io/pebbletemplates/ArgumentsNodeTest.java index ce8685748..bd6c10ed9 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ArgumentsNodeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ArgumentsNodeTest.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ArraySyntaxTest.java b/pebble/src/test/java/io/pebbletemplates/ArraySyntaxTest.java similarity index 99% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ArraySyntaxTest.java rename to pebble/src/test/java/io/pebbletemplates/ArraySyntaxTest.java index e01f680c6..2f2f413b4 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ArraySyntaxTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ArraySyntaxTest.java @@ -6,21 +6,22 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Test; class ArraySyntaxTest { diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/AttributeSubscriptSyntaxTest.java b/pebble/src/test/java/io/pebbletemplates/AttributeSubscriptSyntaxTest.java similarity index 95% rename from pebble/src/test/java/com/mitchellbosecke/pebble/AttributeSubscriptSyntaxTest.java rename to pebble/src/test/java/io/pebbletemplates/AttributeSubscriptSyntaxTest.java index ee167566c..273eb53dd 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/AttributeSubscriptSyntaxTest.java +++ b/pebble/src/test/java/io/pebbletemplates/AttributeSubscriptSyntaxTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/CacheTest.java b/pebble/src/test/java/io/pebbletemplates/CacheTest.java similarity index 97% rename from pebble/src/test/java/com/mitchellbosecke/pebble/CacheTest.java rename to pebble/src/test/java/io/pebbletemplates/CacheTest.java index 6944db267..e5a910d0a 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/CacheTest.java +++ b/pebble/src/test/java/io/pebbletemplates/CacheTest.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/CompilerTest.java b/pebble/src/test/java/io/pebbletemplates/CompilerTest.java similarity index 88% rename from pebble/src/test/java/com/mitchellbosecke/pebble/CompilerTest.java rename to pebble/src/test/java/io/pebbletemplates/CompilerTest.java index 6fbf243a2..069dbf533 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/CompilerTest.java +++ b/pebble/src/test/java/io/pebbletemplates/CompilerTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ConcurrencyTest.java b/pebble/src/test/java/io/pebbletemplates/ConcurrencyTest.java similarity index 97% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ConcurrencyTest.java rename to pebble/src/test/java/io/pebbletemplates/ConcurrencyTest.java index 08de6c837..3bed08565 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ConcurrencyTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ConcurrencyTest.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.LoaderException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.LoaderException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ContextTest.java b/pebble/src/test/java/io/pebbletemplates/ContextTest.java similarity index 96% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ContextTest.java rename to pebble/src/test/java/io/pebbletemplates/ContextTest.java index 0e79bde50..242ce409a 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ContextTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ContextTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.error.RootAttributeNotFoundException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.error.RootAttributeNotFoundException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/CoreFiltersTest.java b/pebble/src/test/java/io/pebbletemplates/CoreFiltersTest.java similarity index 98% rename from pebble/src/test/java/com/mitchellbosecke/pebble/CoreFiltersTest.java rename to pebble/src/test/java/io/pebbletemplates/CoreFiltersTest.java index 8f16ce64e..c558873da 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/CoreFiltersTest.java +++ b/pebble/src/test/java/io/pebbletemplates/CoreFiltersTest.java @@ -6,14 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.TestingExtension; -import com.mitchellbosecke.pebble.extension.core.LengthFilter; -import com.mitchellbosecke.pebble.extension.core.ReplaceFilter; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.TestingExtension; +import io.pebbletemplates.extension.core.*; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; @@ -666,7 +665,7 @@ void testDefault() throws PebbleException, IOException { } /** - * Tests if the {@link com.mitchellbosecke.pebble.extension.core.DefaultFilter} is working as + * Tests if the {@link DefaultFilter} is working as * expected. * * @throws Exception thrown when something went wrong. @@ -1330,7 +1329,7 @@ void testReplaceFilterInTemplate() throws PebbleException, IOException { } /** - * Tests {@link com.mitchellbosecke.pebble.extension.core.Base64EncoderFilter} if the base64 encoding filter is working for a string value, a string constant, null. + * Tests {@link Base64EncoderFilter} if the base64 encoding filter is working for a string value, a string constant, null. */ @Test void testBase64EncoderFilterInTemplate() throws PebbleException, IOException { @@ -1348,7 +1347,7 @@ void testBase64EncoderFilterInTemplate() throws PebbleException, IOException { } /** - * Tests {@link com.mitchellbosecke.pebble.extension.core.Base64DecoderFilter} if the base64 decoder filter is working for a string value, a string constant, null. + * Tests {@link Base64DecoderFilter} if the base64 decoder filter is working for a string value, a string constant, null. */ @Test void testBase64DecoderFilterInTemplate() throws PebbleException, IOException { @@ -1411,7 +1410,7 @@ void testSha256FilterNoStringFail() throws PebbleException, IOException { } /** - * Tests {@link com.mitchellbosecke.pebble.extension.core.Sha256Filter} if the SHA256 hashing filter is working for a string value, a string constant, null. + * Tests {@link Sha256Filter} if the SHA256 hashing filter is working for a string value, a string constant, null. */ @Test void testSha256FilterInTemplate() throws PebbleException, IOException { diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/CoreFunctionsTest.java b/pebble/src/test/java/io/pebbletemplates/CoreFunctionsTest.java similarity index 98% rename from pebble/src/test/java/com/mitchellbosecke/pebble/CoreFunctionsTest.java rename to pebble/src/test/java/io/pebbletemplates/CoreFunctionsTest.java index a34b152f8..40be61a20 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/CoreFunctionsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/CoreFunctionsTest.java @@ -7,11 +7,11 @@ * For the full copyright and license information, please view the LICENSE file that was distributed * with this source code. **************************************************************************** */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/CoreTagsTest.java b/pebble/src/test/java/io/pebbletemplates/CoreTagsTest.java similarity index 99% rename from pebble/src/test/java/com/mitchellbosecke/pebble/CoreTagsTest.java rename to pebble/src/test/java/io/pebbletemplates/CoreTagsTest.java index 733a469cd..749c74eb6 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/CoreTagsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/CoreTagsTest.java @@ -7,12 +7,12 @@ * For the full copyright and license information, please view the LICENSE file that was distributed * with this source code. **************************************************************************** */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/CoreTestsTest.java b/pebble/src/test/java/io/pebbletemplates/CoreTestsTest.java similarity index 97% rename from pebble/src/test/java/com/mitchellbosecke/pebble/CoreTestsTest.java rename to pebble/src/test/java/io/pebbletemplates/CoreTestsTest.java index dd5e7e1c0..e3011b6da 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/CoreTestsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/CoreTestsTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/EmbedCachingTagTest.java b/pebble/src/test/java/io/pebbletemplates/EmbedCachingTagTest.java similarity index 85% rename from pebble/src/test/java/com/mitchellbosecke/pebble/EmbedCachingTagTest.java rename to pebble/src/test/java/io/pebbletemplates/EmbedCachingTagTest.java index 71e85885a..3bf84925c 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/EmbedCachingTagTest.java +++ b/pebble/src/test/java/io/pebbletemplates/EmbedCachingTagTest.java @@ -1,10 +1,10 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.loader.DelegatingLoader; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.loader.DelegatingLoader; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/EmbedTagTest.java b/pebble/src/test/java/io/pebbletemplates/EmbedTagTest.java similarity index 91% rename from pebble/src/test/java/com/mitchellbosecke/pebble/EmbedTagTest.java rename to pebble/src/test/java/io/pebbletemplates/EmbedTagTest.java index ca45d4606..540927a95 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/EmbedTagTest.java +++ b/pebble/src/test/java/io/pebbletemplates/EmbedTagTest.java @@ -1,11 +1,11 @@ -package com.mitchellbosecke.pebble; - -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.loader.DelegatingLoader; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.utils.Pair; +package io.pebbletemplates; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.loader.DelegatingLoader; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.utils.Pair; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/EnumEqualsTest.java b/pebble/src/test/java/io/pebbletemplates/EnumEqualsTest.java similarity index 83% rename from pebble/src/test/java/com/mitchellbosecke/pebble/EnumEqualsTest.java rename to pebble/src/test/java/io/pebbletemplates/EnumEqualsTest.java index 735a68237..167abdfd6 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/EnumEqualsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/EnumEqualsTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ErrorReportingTest.java b/pebble/src/test/java/io/pebbletemplates/ErrorReportingTest.java similarity index 89% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ErrorReportingTest.java rename to pebble/src/test/java/io/pebbletemplates/ErrorReportingTest.java index 3b6ef15e4..178d3a51d 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ErrorReportingTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ErrorReportingTest.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.error.RootAttributeNotFoundException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.error.RootAttributeNotFoundException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/EscaperExtensionTest.java b/pebble/src/test/java/io/pebbletemplates/EscaperExtensionTest.java similarity index 95% rename from pebble/src/test/java/com/mitchellbosecke/pebble/EscaperExtensionTest.java rename to pebble/src/test/java/io/pebbletemplates/EscaperExtensionTest.java index f052fcc9a..eda24f525 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/EscaperExtensionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/EscaperExtensionTest.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import static com.mitchellbosecke.pebble.extension.escaper.EscapeFilter.JSON_ESCAPE_STRATEGY; +import static io.pebbletemplates.extension.escaper.EscapeFilter.JSON_ESCAPE_STRATEGY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -308,7 +308,7 @@ public List getArgumentNames() { @Override public Object execute(Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { return ""; } diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ExtendingPebbleTest.java b/pebble/src/test/java/io/pebbletemplates/ExtendingPebbleTest.java similarity index 83% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ExtendingPebbleTest.java rename to pebble/src/test/java/io/pebbletemplates/ExtendingPebbleTest.java index c1ec463e7..cae60b7f8 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ExtendingPebbleTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ExtendingPebbleTest.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.attributes.AttributeResolver; -import com.mitchellbosecke.pebble.attributes.ResolvedAttribute; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.attributes.AttributeResolver; +import io.pebbletemplates.attributes.ResolvedAttribute; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; @@ -83,7 +83,7 @@ public List getArgumentNames() { @Override public String apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (context != null && self != null) { return "success"; } else { diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ForTest.java b/pebble/src/test/java/io/pebbletemplates/ForTest.java similarity index 92% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ForTest.java rename to pebble/src/test/java/io/pebbletemplates/ForTest.java index cff21b090..fe9f0e112 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ForTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ForTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/GetAttributeTest.java b/pebble/src/test/java/io/pebbletemplates/GetAttributeTest.java similarity index 98% rename from pebble/src/test/java/com/mitchellbosecke/pebble/GetAttributeTest.java rename to pebble/src/test/java/io/pebbletemplates/GetAttributeTest.java index dd8f66561..701bbc4b4 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/GetAttributeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/GetAttributeTest.java @@ -6,19 +6,19 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; -import com.mitchellbosecke.pebble.attributes.methodaccess.NoOpMethodAccessValidator; -import com.mitchellbosecke.pebble.error.AttributeNotFoundException; -import com.mitchellbosecke.pebble.error.ClassAccessException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.error.RootAttributeNotFoundException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.AttributeNotFoundException; +import io.pebbletemplates.error.ClassAccessException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.error.RootAttributeNotFoundException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.attributes.methodaccess.NoOpMethodAccessValidator; +import io.pebbletemplates.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; + import org.junit.jupiter.api.Test; class GetAttributeTest { diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/I18nExtensionTest.java b/pebble/src/test/java/io/pebbletemplates/I18nExtensionTest.java similarity index 92% rename from pebble/src/test/java/com/mitchellbosecke/pebble/I18nExtensionTest.java rename to pebble/src/test/java/io/pebbletemplates/I18nExtensionTest.java index a226ea956..159482083 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/I18nExtensionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/I18nExtensionTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/IncludeWithParameterTest.java b/pebble/src/test/java/io/pebbletemplates/IncludeWithParameterTest.java similarity index 93% rename from pebble/src/test/java/com/mitchellbosecke/pebble/IncludeWithParameterTest.java rename to pebble/src/test/java/io/pebbletemplates/IncludeWithParameterTest.java index eff1c6574..abb0ed803 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/IncludeWithParameterTest.java +++ b/pebble/src/test/java/io/pebbletemplates/IncludeWithParameterTest.java @@ -1,14 +1,15 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; import static org.junit.jupiter.api.Assertions.assertEquals; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Test; /** diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/InheritanceTest.java b/pebble/src/test/java/io/pebbletemplates/InheritanceTest.java similarity index 93% rename from pebble/src/test/java/com/mitchellbosecke/pebble/InheritanceTest.java rename to pebble/src/test/java/io/pebbletemplates/InheritanceTest.java index 7cccae28f..191ed4385 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/InheritanceTest.java +++ b/pebble/src/test/java/io/pebbletemplates/InheritanceTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/LoaderTest.java b/pebble/src/test/java/io/pebbletemplates/LoaderTest.java similarity index 90% rename from pebble/src/test/java/com/mitchellbosecke/pebble/LoaderTest.java rename to pebble/src/test/java/io/pebbletemplates/LoaderTest.java index 3b3613c26..b35da8b9f 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/LoaderTest.java +++ b/pebble/src/test/java/io/pebbletemplates/LoaderTest.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; - -import com.mitchellbosecke.pebble.error.LoaderException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.ClasspathLoader; -import com.mitchellbosecke.pebble.loader.DelegatingLoader; -import com.mitchellbosecke.pebble.loader.FileLoader; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +package io.pebbletemplates; + +import io.pebbletemplates.error.LoaderException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.loader.DelegatingLoader; +import io.pebbletemplates.loader.FileLoader; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/LogicTest.java b/pebble/src/test/java/io/pebbletemplates/LogicTest.java similarity index 99% rename from pebble/src/test/java/com/mitchellbosecke/pebble/LogicTest.java rename to pebble/src/test/java/io/pebbletemplates/LogicTest.java index 204eb9060..fa3f894df 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/LogicTest.java +++ b/pebble/src/test/java/io/pebbletemplates/LogicTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.utils.Pair; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.utils.Pair; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/MacroTest.java b/pebble/src/test/java/io/pebbletemplates/MacroTest.java similarity index 95% rename from pebble/src/test/java/com/mitchellbosecke/pebble/MacroTest.java rename to pebble/src/test/java/io/pebbletemplates/MacroTest.java index 3fd634c22..e055d3dac 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/MacroTest.java +++ b/pebble/src/test/java/io/pebbletemplates/MacroTest.java @@ -1,10 +1,10 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.InvocationCountingFunction; -import com.mitchellbosecke.pebble.extension.TestingExtension; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.InvocationCountingFunction; +import io.pebbletemplates.extension.TestingExtension; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/MapSyntaxTest.java b/pebble/src/test/java/io/pebbletemplates/MapSyntaxTest.java similarity index 98% rename from pebble/src/test/java/com/mitchellbosecke/pebble/MapSyntaxTest.java rename to pebble/src/test/java/io/pebbletemplates/MapSyntaxTest.java index 323b403dc..34308680d 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/MapSyntaxTest.java +++ b/pebble/src/test/java/io/pebbletemplates/MapSyntaxTest.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.TestingExtension; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.TestingExtension; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/MaxRenderedSizeTest.java b/pebble/src/test/java/io/pebbletemplates/MaxRenderedSizeTest.java similarity index 90% rename from pebble/src/test/java/com/mitchellbosecke/pebble/MaxRenderedSizeTest.java rename to pebble/src/test/java/io/pebbletemplates/MaxRenderedSizeTest.java index 0def4db34..1cff2a8e9 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/MaxRenderedSizeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/MaxRenderedSizeTest.java @@ -1,7 +1,7 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/MethodAccessTemplateTest.java b/pebble/src/test/java/io/pebbletemplates/MethodAccessTemplateTest.java similarity index 93% rename from pebble/src/test/java/com/mitchellbosecke/pebble/MethodAccessTemplateTest.java rename to pebble/src/test/java/io/pebbletemplates/MethodAccessTemplateTest.java index 3cd973056..1a144774e 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/MethodAccessTemplateTest.java +++ b/pebble/src/test/java/io/pebbletemplates/MethodAccessTemplateTest.java @@ -1,18 +1,18 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.mitchellbosecke.pebble.attributes.methodaccess.NoOpMethodAccessValidator; -import com.mitchellbosecke.pebble.error.ClassAccessException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.ClassAccessException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.attributes.methodaccess.NoOpMethodAccessValidator; +import io.pebbletemplates.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; + import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/NewlineTrimmingTest.java b/pebble/src/test/java/io/pebbletemplates/NewlineTrimmingTest.java similarity index 96% rename from pebble/src/test/java/com/mitchellbosecke/pebble/NewlineTrimmingTest.java rename to pebble/src/test/java/io/pebbletemplates/NewlineTrimmingTest.java index e435020b0..0afe90e4c 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/NewlineTrimmingTest.java +++ b/pebble/src/test/java/io/pebbletemplates/NewlineTrimmingTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/OverloadedMethodTest.java b/pebble/src/test/java/io/pebbletemplates/OverloadedMethodTest.java similarity index 97% rename from pebble/src/test/java/com/mitchellbosecke/pebble/OverloadedMethodTest.java rename to pebble/src/test/java/io/pebbletemplates/OverloadedMethodTest.java index 65ac9cc3f..5b6513993 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/OverloadedMethodTest.java +++ b/pebble/src/test/java/io/pebbletemplates/OverloadedMethodTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. ******************************************************************************/ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/OverrideCoreExtensionTest.java b/pebble/src/test/java/io/pebbletemplates/OverrideCoreExtensionTest.java similarity index 83% rename from pebble/src/test/java/com/mitchellbosecke/pebble/OverrideCoreExtensionTest.java rename to pebble/src/test/java/io/pebbletemplates/OverrideCoreExtensionTest.java index 494f9e6db..54de1b249 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/OverrideCoreExtensionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/OverrideCoreExtensionTest.java @@ -1,21 +1,21 @@ -package com.mitchellbosecke.pebble; - -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.node.expression.BinaryExpression; -import com.mitchellbosecke.pebble.node.expression.UnaryExpression; -import com.mitchellbosecke.pebble.operator.Associativity; -import com.mitchellbosecke.pebble.operator.BinaryOperator; -import com.mitchellbosecke.pebble.operator.BinaryOperatorImpl; -import com.mitchellbosecke.pebble.operator.UnaryOperator; -import com.mitchellbosecke.pebble.operator.UnaryOperatorImpl; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +package io.pebbletemplates; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.extension.Function; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.node.expression.UnaryExpression; +import io.pebbletemplates.node.expression.BinaryExpression; +import io.pebbletemplates.operator.Associativity; +import io.pebbletemplates.operator.BinaryOperator; +import io.pebbletemplates.operator.BinaryOperatorImpl; +import io.pebbletemplates.operator.UnaryOperator; +import io.pebbletemplates.operator.UnaryOperatorImpl; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.template.PebbleTemplateImpl; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ParsingOdditiesTest.java b/pebble/src/test/java/io/pebbletemplates/ParsingOdditiesTest.java similarity index 95% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ParsingOdditiesTest.java rename to pebble/src/test/java/io/pebbletemplates/ParsingOdditiesTest.java index 5b1bf49e4..9aa22cc48 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ParsingOdditiesTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ParsingOdditiesTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/RenderSingleBlockTest.java b/pebble/src/test/java/io/pebbletemplates/RenderSingleBlockTest.java similarity index 94% rename from pebble/src/test/java/com/mitchellbosecke/pebble/RenderSingleBlockTest.java rename to pebble/src/test/java/io/pebbletemplates/RenderSingleBlockTest.java index c5f21600d..9cec1023a 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/RenderSingleBlockTest.java +++ b/pebble/src/test/java/io/pebbletemplates/RenderSingleBlockTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/RenderWithoutEndBlockTest.java b/pebble/src/test/java/io/pebbletemplates/RenderWithoutEndBlockTest.java similarity index 97% rename from pebble/src/test/java/com/mitchellbosecke/pebble/RenderWithoutEndBlockTest.java rename to pebble/src/test/java/io/pebbletemplates/RenderWithoutEndBlockTest.java index b91ab8c3c..79ec5a402 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/RenderWithoutEndBlockTest.java +++ b/pebble/src/test/java/io/pebbletemplates/RenderWithoutEndBlockTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ScopeChainTest.java b/pebble/src/test/java/io/pebbletemplates/ScopeChainTest.java similarity index 95% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ScopeChainTest.java rename to pebble/src/test/java/io/pebbletemplates/ScopeChainTest.java index 47ad5445c..0a40decd2 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ScopeChainTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ScopeChainTest.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.ScopeChain; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.ScopeChain; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/ScopeTest.java b/pebble/src/test/java/io/pebbletemplates/ScopeTest.java similarity index 87% rename from pebble/src/test/java/com/mitchellbosecke/pebble/ScopeTest.java rename to pebble/src/test/java/io/pebbletemplates/ScopeTest.java index 8ef59acb9..1b0d74df4 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/ScopeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/ScopeTest.java @@ -1,6 +1,6 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.template.Scope; +import io.pebbletemplates.template.Scope; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/SplitFilterTest.java b/pebble/src/test/java/io/pebbletemplates/SplitFilterTest.java similarity index 94% rename from pebble/src/test/java/com/mitchellbosecke/pebble/SplitFilterTest.java rename to pebble/src/test/java/io/pebbletemplates/SplitFilterTest.java index 0bc928286..7e7faff02 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/SplitFilterTest.java +++ b/pebble/src/test/java/io/pebbletemplates/SplitFilterTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/StrictModeTest.java b/pebble/src/test/java/io/pebbletemplates/StrictModeTest.java similarity index 92% rename from pebble/src/test/java/com/mitchellbosecke/pebble/StrictModeTest.java rename to pebble/src/test/java/io/pebbletemplates/StrictModeTest.java index 19d1208c5..a356a0c52 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/StrictModeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/StrictModeTest.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.error.RootAttributeNotFoundException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.error.RootAttributeNotFoundException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/StringInterpolationTest.java b/pebble/src/test/java/io/pebbletemplates/StringInterpolationTest.java similarity index 97% rename from pebble/src/test/java/com/mitchellbosecke/pebble/StringInterpolationTest.java rename to pebble/src/test/java/io/pebbletemplates/StringInterpolationTest.java index 784ec95b3..466d691ef 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/StringInterpolationTest.java +++ b/pebble/src/test/java/io/pebbletemplates/StringInterpolationTest.java @@ -1,7 +1,7 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/TernaryExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/TernaryExpressionTest.java similarity index 97% rename from pebble/src/test/java/com/mitchellbosecke/pebble/TernaryExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/TernaryExpressionTest.java index f394b5474..8b4ccdfba 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/TernaryExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/TernaryExpressionTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/TestParallelParsing.java b/pebble/src/test/java/io/pebbletemplates/TestParallelParsing.java similarity index 83% rename from pebble/src/test/java/com/mitchellbosecke/pebble/TestParallelParsing.java rename to pebble/src/test/java/io/pebbletemplates/TestParallelParsing.java index dc53ab3f7..c624e7a56 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/TestParallelParsing.java +++ b/pebble/src/test/java/io/pebbletemplates/TestParallelParsing.java @@ -1,17 +1,17 @@ -package com.mitchellbosecke.pebble; - -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.lexer.Token; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.node.RenderableNode; -import com.mitchellbosecke.pebble.parser.Parser; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; -import com.mitchellbosecke.pebble.tokenParser.TokenParser; +package io.pebbletemplates; + +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.node.RenderableNode; +import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.tokenParser.TokenParser; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/TestRelativePath.java b/pebble/src/test/java/io/pebbletemplates/TestRelativePath.java similarity index 94% rename from pebble/src/test/java/com/mitchellbosecke/pebble/TestRelativePath.java rename to pebble/src/test/java/io/pebbletemplates/TestRelativePath.java index 73fb7bdc4..e6a4bb35f 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/TestRelativePath.java +++ b/pebble/src/test/java/io/pebbletemplates/TestRelativePath.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.FileLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.FileLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/WhitespaceControlTest.java b/pebble/src/test/java/io/pebbletemplates/WhitespaceControlTest.java similarity index 97% rename from pebble/src/test/java/com/mitchellbosecke/pebble/WhitespaceControlTest.java rename to pebble/src/test/java/io/pebbletemplates/WhitespaceControlTest.java index d9d95457e..b83b9a662 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/WhitespaceControlTest.java +++ b/pebble/src/test/java/io/pebbletemplates/WhitespaceControlTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/WritingTest.java b/pebble/src/test/java/io/pebbletemplates/WritingTest.java similarity index 93% rename from pebble/src/test/java/com/mitchellbosecke/pebble/WritingTest.java rename to pebble/src/test/java/io/pebbletemplates/WritingTest.java index 93c01c40a..60bc17f06 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/WritingTest.java +++ b/pebble/src/test/java/io/pebbletemplates/WritingTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble; +package io.pebbletemplates; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java similarity index 96% rename from pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java rename to pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java index 877d2661f..19dad9d96 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java +++ b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java @@ -1,9 +1,10 @@ -package com.mitchellbosecke.pebble.attributes.methodaccess; +package io.pebbletemplates.attributes.methodaccess; import static org.assertj.core.api.Assertions.assertThat; import java.lang.reflect.Method; import java.util.stream.Stream; + import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/Foo.java b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/Foo.java similarity index 70% rename from pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/Foo.java rename to pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/Foo.java index ea236f60a..6220a2d64 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/Foo.java +++ b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/Foo.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.attributes.methodaccess; +package io.pebbletemplates.attributes.methodaccess; public class Foo { diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/InstanceProvider.java b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/InstanceProvider.java similarity index 95% rename from pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/InstanceProvider.java rename to pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/InstanceProvider.java index a14a9dd9b..d6f365a35 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/InstanceProvider.java +++ b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/InstanceProvider.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.attributes.methodaccess; +package io.pebbletemplates.attributes.methodaccess; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Constructor; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/MethodsProvider.java b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/MethodsProvider.java similarity index 98% rename from pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/MethodsProvider.java rename to pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/MethodsProvider.java index 4189f99fd..b602f0dd1 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/MethodsProvider.java +++ b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/MethodsProvider.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.attributes.methodaccess; +package io.pebbletemplates.attributes.methodaccess; import java.io.IOException; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/NoOpMethodAccessValidatorTest.java b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidatorTest.java similarity index 87% rename from pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/NoOpMethodAccessValidatorTest.java rename to pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidatorTest.java index 7a8bf0f44..5398d28de 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/attributes/methodaccess/NoOpMethodAccessValidatorTest.java +++ b/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidatorTest.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.attributes.methodaccess; +package io.pebbletemplates.attributes.methodaccess; import static org.assertj.core.api.Assertions.assertThat; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/ArrayToStringFilter.java b/pebble/src/test/java/io/pebbletemplates/extension/ArrayToStringFilter.java similarity index 80% rename from pebble/src/test/java/com/mitchellbosecke/pebble/extension/ArrayToStringFilter.java rename to pebble/src/test/java/io/pebbletemplates/extension/ArrayToStringFilter.java index ee65f0ff2..935ea1cbb 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/ArrayToStringFilter.java +++ b/pebble/src/test/java/io/pebbletemplates/extension/ArrayToStringFilter.java @@ -6,10 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; + +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.List; import java.util.Map; @@ -26,7 +27,7 @@ public List getArgumentNames() { @Override public String apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/ExtensionCustomizerTest.java b/pebble/src/test/java/io/pebbletemplates/extension/ExtensionCustomizerTest.java similarity index 87% rename from pebble/src/test/java/com/mitchellbosecke/pebble/extension/ExtensionCustomizerTest.java rename to pebble/src/test/java/io/pebbletemplates/extension/ExtensionCustomizerTest.java index 27e339738..36fcc8c6b 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/ExtensionCustomizerTest.java +++ b/pebble/src/test/java/io/pebbletemplates/extension/ExtensionCustomizerTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/InvocationCountingFunction.java b/pebble/src/test/java/io/pebbletemplates/extension/InvocationCountingFunction.java similarity index 75% rename from pebble/src/test/java/com/mitchellbosecke/pebble/extension/InvocationCountingFunction.java rename to pebble/src/test/java/io/pebbletemplates/extension/InvocationCountingFunction.java index c852d3f26..b4f49c72e 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/InvocationCountingFunction.java +++ b/pebble/src/test/java/io/pebbletemplates/extension/InvocationCountingFunction.java @@ -1,7 +1,8 @@ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; + +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -22,7 +23,7 @@ public List getArgumentNames() { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { return ++invocationCount; } diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/ListToStringFilter.java b/pebble/src/test/java/io/pebbletemplates/extension/ListToStringFilter.java similarity index 78% rename from pebble/src/test/java/com/mitchellbosecke/pebble/extension/ListToStringFilter.java rename to pebble/src/test/java/io/pebbletemplates/extension/ListToStringFilter.java index eb4612484..242a8e691 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/ListToStringFilter.java +++ b/pebble/src/test/java/io/pebbletemplates/extension/ListToStringFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; + +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -26,7 +27,7 @@ public List getArgumentNames() { @Override public String apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { return null; } diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/MapToStringFilter.java b/pebble/src/test/java/io/pebbletemplates/extension/MapToStringFilter.java similarity index 86% rename from pebble/src/test/java/com/mitchellbosecke/pebble/extension/MapToStringFilter.java rename to pebble/src/test/java/io/pebbletemplates/extension/MapToStringFilter.java index 0cc0916a7..ac1316f22 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/MapToStringFilter.java +++ b/pebble/src/test/java/io/pebbletemplates/extension/MapToStringFilter.java @@ -6,10 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; + +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -32,7 +33,7 @@ public List getArgumentNames() { @SuppressWarnings({"unchecked"}) @Override public String apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/TestingExtension.java b/pebble/src/test/java/io/pebbletemplates/extension/TestingExtension.java similarity index 94% rename from pebble/src/test/java/com/mitchellbosecke/pebble/extension/TestingExtension.java rename to pebble/src/test/java/io/pebbletemplates/extension/TestingExtension.java index 63734fe00..196a2a9a7 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/TestingExtension.java +++ b/pebble/src/test/java/io/pebbletemplates/extension/TestingExtension.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.extension; +package io.pebbletemplates.extension; import java.util.HashMap; import java.util.Map; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/escaper/RawFilterTest.java b/pebble/src/test/java/io/pebbletemplates/extension/escaper/RawFilterTest.java similarity index 91% rename from pebble/src/test/java/com/mitchellbosecke/pebble/extension/escaper/RawFilterTest.java rename to pebble/src/test/java/io/pebbletemplates/extension/escaper/RawFilterTest.java index 5ca4ed18f..e051966ae 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/extension/escaper/RawFilterTest.java +++ b/pebble/src/test/java/io/pebbletemplates/extension/escaper/RawFilterTest.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.extension.escaper; +package io.pebbletemplates.extension.escaper; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/lexer/IdentifierTest.java b/pebble/src/test/java/io/pebbletemplates/lexer/IdentifierTest.java similarity index 92% rename from pebble/src/test/java/com/mitchellbosecke/pebble/lexer/IdentifierTest.java rename to pebble/src/test/java/io/pebbletemplates/lexer/IdentifierTest.java index d2be1fb2c..1df4afc5a 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/lexer/IdentifierTest.java +++ b/pebble/src/test/java/io/pebbletemplates/lexer/IdentifierTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.lexer; +package io.pebbletemplates.lexer; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.loader.StringLoader; +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.PebbleEngine; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/lexer/LexerImplTest.java b/pebble/src/test/java/io/pebbletemplates/lexer/LexerImplTest.java similarity index 61% rename from pebble/src/test/java/com/mitchellbosecke/pebble/lexer/LexerImplTest.java rename to pebble/src/test/java/io/pebbletemplates/lexer/LexerImplTest.java index 001ba79f1..c288f95f5 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/lexer/LexerImplTest.java +++ b/pebble/src/test/java/io/pebbletemplates/lexer/LexerImplTest.java @@ -1,10 +1,9 @@ -package com.mitchellbosecke.pebble.lexer; +package io.pebbletemplates.lexer; -import com.mitchellbosecke.pebble.extension.ExtensionRegistry; -import com.mitchellbosecke.pebble.extension.core.CoreExtension; -import com.mitchellbosecke.pebble.lexer.Token.Type; -import com.mitchellbosecke.pebble.loader.Loader; -import com.mitchellbosecke.pebble.loader.StringLoader; +import io.pebbletemplates.extension.ExtensionRegistry; +import io.pebbletemplates.extension.core.CoreExtension; +import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.loader.StringLoader; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -54,9 +53,9 @@ void testTokenizeText() { TokenStream tokenStream = this.lexer.tokenize(templateReader, this.TEMPLATE_NAME); - assertThat(tokenStream.peek(0).getType()).isEqualTo(Type.TEXT); + assertThat(tokenStream.peek(0).getType()).isEqualTo(Token.Type.TEXT); assertThat(tokenStream.peek(0).getValue()).isEqualTo(" template content "); - assertThat(tokenStream.peek(1).getType()).isEqualTo(Type.EOF); + assertThat(tokenStream.peek(1).getType()).isEqualTo(Token.Type.EOF); } /** @@ -69,16 +68,16 @@ void testTokenizeExpression() { TokenStream tokenStream = this.lexer.tokenize(templateReader, this.TEMPLATE_NAME); - assertThat(tokenStream.peek(0).getType()).isEqualTo(Type.PRINT_START); + assertThat(tokenStream.peek(0).getType()).isEqualTo(Token.Type.PRINT_START); assertThat(tokenStream.peek(0).getValue()).isNull(); - assertThat(tokenStream.peek(1).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(1).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(1).getValue()).isEqualTo("whatever"); - assertThat(tokenStream.peek(2).getType()).isEqualTo(Type.PRINT_END); + assertThat(tokenStream.peek(2).getType()).isEqualTo(Token.Type.PRINT_END); assertThat(tokenStream.peek(2).getValue()).isEqualTo("}}"); - assertThat(tokenStream.peek(3).getType()).isEqualTo(Type.EOF); + assertThat(tokenStream.peek(3).getType()).isEqualTo(Token.Type.EOF); assertThat(tokenStream.peek(3).getValue()).isNull(); } @@ -93,22 +92,22 @@ void testVariableNameStartingWithOperator() { TokenStream tokenStream = this.lexer.tokenize(templateReader, this.TEMPLATE_NAME); int i = 0; - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.PRINT_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.PRINT_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("is_active"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.OPERATOR); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.OPERATOR); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("+"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("contains0"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.PRINT_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.PRINT_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("}}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EOF); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EOF); assertThat(tokenStream.peek(i++).getValue()).isNull(); } @@ -127,25 +126,25 @@ void testPunctuation() { TokenStream tokenStream = this.lexer.tokenize(templateReader, this.TEMPLATE_NAME); int i = 0; - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("if"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("item"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.PUNCTUATION); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.PUNCTUATION); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("."); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("itemType"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EOF); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EOF); assertThat(tokenStream.peek(i++).getValue()).isNull(); } @@ -164,22 +163,22 @@ void testIfStatementWithOperatorAndStringToken() { TokenStream tokenStream = this.lexer.tokenize(templateReader, this.TEMPLATE_NAME); int i = 0; - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("if"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("item"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.OPERATOR); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.OPERATOR); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("equals"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.STRING); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.STRING); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("string1"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); } @@ -200,37 +199,37 @@ void testIfStatement() { TokenStream tokenStream = this.lexer.tokenize(templateReader, this.TEMPLATE_NAME); int i = 0; - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("if"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("item"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.OPERATOR); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.OPERATOR); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("equals"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.STRING); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.STRING); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("whatever"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.TEXT); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.TEXT); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("\nsome text\n"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("endif"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EOF); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EOF); assertThat(tokenStream.peek(i++).getValue()).isNull(); } @@ -250,37 +249,37 @@ void testTokenizeForLoop() { TokenStream tokenStream = this.lexer.tokenize(templateReader, this.TEMPLATE_NAME); - assertThat(tokenStream.peek(0).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(0).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(0).getValue()).isNull(); - assertThat(tokenStream.peek(1).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(1).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(1).getValue()).isEqualTo("for"); - assertThat(tokenStream.peek(2).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(2).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(2).getValue()).isEqualTo("item"); - assertThat(tokenStream.peek(3).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(3).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(3).getValue()).isEqualTo("in"); - assertThat(tokenStream.peek(4).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(4).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(4).getValue()).isEqualTo("items"); - assertThat(tokenStream.peek(5).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(5).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(5).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(6).getType()).isEqualTo(Type.TEXT); + assertThat(tokenStream.peek(6).getType()).isEqualTo(Token.Type.TEXT); assertThat(tokenStream.peek(6).getValue()).isEqualTo("\nstuff\n"); - assertThat(tokenStream.peek(7).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(7).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(7).getValue()).isNull(); - assertThat(tokenStream.peek(8).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(8).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(8).getValue()).isEqualTo("endfor"); - assertThat(tokenStream.peek(9).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(9).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(9).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(10).getType()).isEqualTo(Type.EOF); + assertThat(tokenStream.peek(10).getType()).isEqualTo(Token.Type.EOF); assertThat(tokenStream.peek(10).getValue()).isNull(); } @@ -301,37 +300,37 @@ void testIfStatementWithWhitespaceControl() { TokenStream tokenStream = this.lexer.tokenize(templateReader, this.TEMPLATE_NAME); int i = 0; - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("if"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("item"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.OPERATOR); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.OPERATOR); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("equals"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.STRING); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.STRING); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("whatever"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.TEXT); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.TEXT); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("some text"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("endif"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EOF); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EOF); assertThat(tokenStream.peek(i++).getValue()).isNull(); } @@ -358,107 +357,107 @@ void testComplexTemplate() { TokenStream tokenStream = this.lexer.tokenize(templateReader, this.TEMPLATE_NAME); int i = 0; - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.TEXT); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.TEXT); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("text before for loop followed by blank line\n"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("for"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("item"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("in"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("items"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); // note that the new line character included as part of a TEXT token - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.TEXT); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.TEXT); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("\n"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("if"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("item"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.PUNCTUATION); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.PUNCTUATION); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("."); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("itemType"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.OPERATOR); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.OPERATOR); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("equals"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.STRING); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.STRING); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("ITEM_TYPE1"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.TEXT); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.TEXT); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("Item 1\n"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("elseif"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("item"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.PUNCTUATION); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.PUNCTUATION); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("."); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("itemType"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.OPERATOR); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.OPERATOR); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("equals"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.STRING); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.STRING); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("ITEM_TYPE2"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.TEXT); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.TEXT); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("Item 2"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("endif"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_START); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_START); assertThat(tokenStream.peek(i++).getValue()).isNull(); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.NAME); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.NAME); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("endfor"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EXECUTE_END); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EXECUTE_END); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("%}"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.TEXT); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.TEXT); assertThat(tokenStream.peek(i++).getValue()).isEqualTo("text after for loop preceded by blank line"); - assertThat(tokenStream.peek(i).getType()).isEqualTo(Type.EOF); + assertThat(tokenStream.peek(i).getType()).isEqualTo(Token.Type.EOF); assertThat(tokenStream.peek(i++).getValue()).isNull(); } diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/lexer/SyntaxTest.java b/pebble/src/test/java/io/pebbletemplates/lexer/SyntaxTest.java similarity index 99% rename from pebble/src/test/java/com/mitchellbosecke/pebble/lexer/SyntaxTest.java rename to pebble/src/test/java/io/pebbletemplates/lexer/SyntaxTest.java index 0ad8b5deb..c8ec6cabb 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/lexer/SyntaxTest.java +++ b/pebble/src/test/java/io/pebbletemplates/lexer/SyntaxTest.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.lexer; +package io.pebbletemplates.lexer; import static org.assertj.core.api.Assertions.assertThat; import java.util.regex.Matcher; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/macro/MacroGlobalVariablesTest.java b/pebble/src/test/java/io/pebbletemplates/macro/MacroGlobalVariablesTest.java similarity index 80% rename from pebble/src/test/java/com/mitchellbosecke/pebble/macro/MacroGlobalVariablesTest.java rename to pebble/src/test/java/io/pebbletemplates/macro/MacroGlobalVariablesTest.java index 68f35c873..2719ae4c2 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/macro/MacroGlobalVariablesTest.java +++ b/pebble/src/test/java/io/pebbletemplates/macro/MacroGlobalVariablesTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.macro; +package io.pebbletemplates.macro; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.loader.StringLoader; +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.PebbleEngine; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/macro/PebbleExtension.java b/pebble/src/test/java/io/pebbletemplates/macro/PebbleExtension.java similarity index 64% rename from pebble/src/test/java/com/mitchellbosecke/pebble/macro/PebbleExtension.java rename to pebble/src/test/java/io/pebbletemplates/macro/PebbleExtension.java index cb40001b3..bc8c3654d 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/macro/PebbleExtension.java +++ b/pebble/src/test/java/io/pebbletemplates/macro/PebbleExtension.java @@ -1,7 +1,8 @@ -package com.mitchellbosecke.pebble.macro; +package io.pebbletemplates.macro; + +import io.pebbletemplates.extension.AbstractExtension; +import io.pebbletemplates.extension.Filter; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Filter; import java.util.HashMap; import java.util.Map; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/macro/TestFilter.java b/pebble/src/test/java/io/pebbletemplates/macro/TestFilter.java similarity index 68% rename from pebble/src/test/java/com/mitchellbosecke/pebble/macro/TestFilter.java rename to pebble/src/test/java/io/pebbletemplates/macro/TestFilter.java index a6aa656e0..48ca14ed7 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/macro/TestFilter.java +++ b/pebble/src/test/java/io/pebbletemplates/macro/TestFilter.java @@ -1,8 +1,9 @@ -package com.mitchellbosecke.pebble.macro; +package io.pebbletemplates.macro; + +import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.template.EvaluationContext; +import io.pebbletemplates.template.PebbleTemplate; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; import java.util.Collections; import java.util.List; import java.util.Map; @@ -20,7 +21,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { String content = (String) input; counter++; content = content + "?" + "Hello"; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/macro/TestMacroCalls.java b/pebble/src/test/java/io/pebbletemplates/macro/TestMacroCalls.java similarity index 96% rename from pebble/src/test/java/com/mitchellbosecke/pebble/macro/TestMacroCalls.java rename to pebble/src/test/java/io/pebbletemplates/macro/TestMacroCalls.java index 074e518eb..53de9c6b4 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/macro/TestMacroCalls.java +++ b/pebble/src/test/java/io/pebbletemplates/macro/TestMacroCalls.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.macro; +package io.pebbletemplates.macro; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/node/ForNodeTest.java b/pebble/src/test/java/io/pebbletemplates/node/ForNodeTest.java similarity index 94% rename from pebble/src/test/java/com/mitchellbosecke/pebble/node/ForNodeTest.java rename to pebble/src/test/java/io/pebbletemplates/node/ForNodeTest.java index cd0307b3f..ce1fc397e 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/node/ForNodeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/node/ForNodeTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/node/IfNodeTest.java b/pebble/src/test/java/io/pebbletemplates/node/IfNodeTest.java similarity index 90% rename from pebble/src/test/java/com/mitchellbosecke/pebble/node/IfNodeTest.java rename to pebble/src/test/java/io/pebbletemplates/node/IfNodeTest.java index 4d86cc773..152cdfe65 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/node/IfNodeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/node/IfNodeTest.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.node; +package io.pebbletemplates.node; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/AndExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/node/expression/AndExpressionTest.java similarity index 94% rename from pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/AndExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/node/expression/AndExpressionTest.java index dc1f8a732..4ea4155fa 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/AndExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/node/expression/AndExpressionTest.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/ExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/node/expression/ExpressionTest.java similarity index 72% rename from pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/ExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/node/expression/ExpressionTest.java index 897b2af7a..e663633dd 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/ExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/node/expression/ExpressionTest.java @@ -1,8 +1,8 @@ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/OrExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/node/expression/OrExpressionTest.java similarity index 94% rename from pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/OrExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/node/expression/OrExpressionTest.java index 1073d54b7..7ebd8a21a 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/OrExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/node/expression/OrExpressionTest.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/StringExpressionParserTest.java b/pebble/src/test/java/io/pebbletemplates/node/expression/StringExpressionParserTest.java similarity index 92% rename from pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/StringExpressionParserTest.java rename to pebble/src/test/java/io/pebbletemplates/node/expression/StringExpressionParserTest.java index 117af3561..f391a0102 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/StringExpressionParserTest.java +++ b/pebble/src/test/java/io/pebbletemplates/node/expression/StringExpressionParserTest.java @@ -1,16 +1,16 @@ -package com.mitchellbosecke.pebble.node.expression; - -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.ParserException; -import com.mitchellbosecke.pebble.lexer.LexerImpl; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.node.PrintNode; -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.parser.Parser; -import com.mitchellbosecke.pebble.parser.ParserImpl; -import com.mitchellbosecke.pebble.parser.ParserOptions; -import com.mitchellbosecke.pebble.utils.Pair; +package io.pebbletemplates.node.expression; + +import io.pebbletemplates.error.ParserException; +import io.pebbletemplates.lexer.LexerImpl; +import io.pebbletemplates.lexer.TokenStream; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.parser.ParserImpl; +import io.pebbletemplates.parser.ParserOptions; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.node.PrintNode; +import io.pebbletemplates.node.RootNode; +import io.pebbletemplates.utils.Pair; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/UnaryNotExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/node/expression/UnaryNotExpressionTest.java similarity index 90% rename from pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/UnaryNotExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/node/expression/UnaryNotExpressionTest.java index 0bf97828d..d5e43c900 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/node/expression/UnaryNotExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/node/expression/UnaryNotExpressionTest.java @@ -1,9 +1,9 @@ -package com.mitchellbosecke.pebble.node.expression; +package io.pebbletemplates.node.expression; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/PebbleTestContext.java b/pebble/src/test/java/io/pebbletemplates/template/tests/PebbleTestContext.java similarity index 96% rename from pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/PebbleTestContext.java rename to pebble/src/test/java/io/pebbletemplates/template/tests/PebbleTestContext.java index 23ea264e9..f8c30e0f4 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/PebbleTestContext.java +++ b/pebble/src/test/java/io/pebbletemplates/template/tests/PebbleTestContext.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.template.tests; +package io.pebbletemplates.template.tests; import java.io.IOException; import java.io.StringWriter; @@ -8,13 +8,13 @@ import java.util.HashMap; import java.util.Map; +import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.template.PebbleTemplate; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.mitchellbosecke.pebble.PebbleEngine; -import com.mitchellbosecke.pebble.loader.StringLoader; -import com.mitchellbosecke.pebble.template.PebbleTemplate; +import io.pebbletemplates.PebbleEngine; /** * Used by Pebble Template Tests to simply the test code and therefore @@ -127,7 +127,7 @@ public String executeTemplateFromString(String templateString) throws IOExceptio * @throws IOException Thrown if the template file is not found. */ public String executeTemplate(String templateName, PebbleEngine pebbleEngine) throws IOException { - PebbleTemplate template = pebbleEngine.getTemplate(templateName); + PebbleTemplate template = pebbleEngine.getTemplate(templateName); Writer writer = new StringWriter(); template.evaluate(writer, this.templateContext); String templateOutput = writer.toString(); diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java b/pebble/src/test/java/io/pebbletemplates/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java similarity index 95% rename from pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java rename to pebble/src/test/java/io/pebbletemplates/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java index 7ff2783b0..46cbe2aa3 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java +++ b/pebble/src/test/java/io/pebbletemplates/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package com.mitchellbosecke.pebble.template.tests; +package io.pebbletemplates.template.tests; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.tests.input.PebbleTestItem; -import com.mitchellbosecke.pebble.template.tests.input.PebbleTestItemType; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.tests.input.PebbleTestItem; +import io.pebbletemplates.template.tests.input.PebbleTestItemType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/input/PebbleTestItem.java b/pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItem.java similarity index 93% rename from pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/input/PebbleTestItem.java rename to pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItem.java index 3ff602c07..544d56a15 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/input/PebbleTestItem.java +++ b/pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItem.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.template.tests.input; +package io.pebbletemplates.template.tests.input; public class PebbleTestItem { diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/input/PebbleTestItemType.java b/pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItemType.java similarity index 59% rename from pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/input/PebbleTestItemType.java rename to pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItemType.java index c25139834..76e0c3c65 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/template/tests/input/PebbleTestItemType.java +++ b/pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItemType.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.template.tests.input; +package io.pebbletemplates.template.tests.input; public enum PebbleTestItemType { ITEM_TYPE1, ITEM_TYPE2, ITEM_TYPE3, ITEM_TYPE4 diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/utils/LimitedSizeWriterTest.java b/pebble/src/test/java/io/pebbletemplates/utils/LimitedSizeWriterTest.java similarity index 94% rename from pebble/src/test/java/com/mitchellbosecke/pebble/utils/LimitedSizeWriterTest.java rename to pebble/src/test/java/io/pebbletemplates/utils/LimitedSizeWriterTest.java index 2bba26e87..f888c4536 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/utils/LimitedSizeWriterTest.java +++ b/pebble/src/test/java/io/pebbletemplates/utils/LimitedSizeWriterTest.java @@ -1,7 +1,7 @@ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; -import com.mitchellbosecke.pebble.error.PebbleException; -import com.mitchellbosecke.pebble.template.RenderedSizeContext; +import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.template.RenderedSizeContext; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/pebble/src/test/java/com/mitchellbosecke/pebble/utils/PathUtilsTest.java b/pebble/src/test/java/io/pebbletemplates/utils/PathUtilsTest.java similarity index 98% rename from pebble/src/test/java/com/mitchellbosecke/pebble/utils/PathUtilsTest.java rename to pebble/src/test/java/io/pebbletemplates/utils/PathUtilsTest.java index ea5bda8cd..b4eccfe9e 100644 --- a/pebble/src/test/java/com/mitchellbosecke/pebble/utils/PathUtilsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/utils/PathUtilsTest.java @@ -1,4 +1,4 @@ -package com.mitchellbosecke.pebble.utils; +package io.pebbletemplates.utils; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/resources/logback-test.xml b/pebble/src/test/resources/logback-test.xml index 3569ae7f7..572c15781 100644 --- a/pebble/src/test/resources/logback-test.xml +++ b/pebble/src/test/resources/logback-test.xml @@ -10,7 +10,7 @@ - - + + \ No newline at end of file diff --git a/pebble/src/test/resources/security/allowedMethods.properties b/pebble/src/test/resources/security/allowedMethods.properties index f59193424..33acca1aa 100644 --- a/pebble/src/test/resources/security/allowedMethods.properties +++ b/pebble/src/test/resources/security/allowedMethods.properties @@ -2,8 +2,8 @@ java.lang.Object.toString() java.lang.Object.hashCode() java.lang.Object.equals(java.lang.Object) -com.mitchellbosecke.pebble.attributes.methodaccess.Foo.getX() -com.mitchellbosecke.pebble.attributes.methodaccess.Foo.setX(java.lang.String) -com.mitchellbosecke.pebble.attributes.methodaccess.Foo.toString() -com.mitchellbosecke.pebble.attributes.methodaccess.Foo.hashCode() -com.mitchellbosecke.pebble.attributes.methodaccess.Foo.equals(java.lang.Object) \ No newline at end of file +io.pebbletemplates.attributes.methodaccess.Foo.getX() +io.pebbletemplates.attributes.methodaccess.Foo.setX(java.lang.String) +io.pebbletemplates.attributes.methodaccess.Foo.toString() +io.pebbletemplates.attributes.methodaccess.Foo.hashCode() +io.pebbletemplates.attributes.methodaccess.Foo.equals(java.lang.Object) \ No newline at end of file From 7c5597b28ffd840c825e3e38048431f485a3c085 Mon Sep 17 00:00:00 2001 From: Eric Bussieres Date: Thu, 27 Oct 2022 15:24:26 -0400 Subject: [PATCH 2/8] Rename package from com.mitchellbosecke.pebble to io.pebbletemplates --- .../PebbleAutoConfiguration.java | 10 +- .../PebbleReactiveWebConfiguration.java | 4 +- .../PebbleServletWebConfiguration.java | 4 +- .../io/pebbletemplates/boot/AppConfig.java | 10 +- .../boot/autoconfigure/NonWebAppTests.java | 2 +- .../PebbleAutoConfigurationTest.java | 10 +- .../PebbleAutoConfiguration.java | 10 +- .../PebbleReactiveWebConfiguration.java | 4 +- .../PebbleServletWebConfiguration.java | 4 +- .../io/pebbletemplates/boot/AppConfig.java | 10 +- .../boot/autoconfigure/NonWebAppTests.java | 2 +- .../PebbleAutoConfigurationTest.java | 10 +- .../spring/extension/SpringExtension.java | 4 +- .../extension/function/HrefFunction.java | 8 +- .../function/MessageSourceFunction.java | 6 +- .../BaseBindingResultFunction.java | 6 +- .../bindingresult/GetAllErrorsFunction.java | 4 +- .../bindingresult/GetFieldErrorsFunction.java | 4 +- .../GetGlobalErrorsFunction.java | 4 +- .../bindingresult/HasErrorsFunction.java | 4 +- .../bindingresult/HasFieldErrorsFunction.java | 4 +- .../HasGlobalErrorsFunction.java | 4 +- .../spring/reactive/PebbleReactiveView.java | 6 +- .../reactive/PebbleReactiveViewResolver.java | 2 +- .../spring/servlet/PebbleView.java | 6 +- .../spring/servlet/PebbleViewResolver.java | 4 +- .../spring/config/MVCConfig.java | 6 +- .../spring/extension/SpringExtension.java | 4 +- .../extension/function/HrefFunction.java | 8 +- .../function/MessageSourceFunction.java | 6 +- .../BaseBindingResultFunction.java | 6 +- .../bindingresult/GetAllErrorsFunction.java | 4 +- .../bindingresult/GetFieldErrorsFunction.java | 4 +- .../GetGlobalErrorsFunction.java | 4 +- .../bindingresult/HasErrorsFunction.java | 4 +- .../bindingresult/HasFieldErrorsFunction.java | 4 +- .../HasGlobalErrorsFunction.java | 4 +- .../spring/reactive/PebbleReactiveView.java | 6 +- .../reactive/PebbleReactiveViewResolver.java | 2 +- .../spring/servlet/PebbleView.java | 6 +- .../spring/servlet/PebbleViewResolver.java | 4 +- .../spring/config/MVCConfig.java | 6 +- .../{ => pebble}/PebbleEngine.java | 61 ++++---- .../attributes/ArrayResolver.java | 8 +- .../attributes/AttributeResolver.java | 6 +- .../attributes/DefaultAttributeResolver.java | 10 +- .../{ => pebble}/attributes/ListResolver.java | 8 +- .../attributes/MacroResolver.java | 8 +- .../{ => pebble}/attributes/MapResolver.java | 10 +- .../attributes/MemberCacheUtils.java | 8 +- .../attributes/ResolvedAttribute.java | 2 +- .../BlacklistMethodAccessValidator.java | 2 +- .../methodaccess/MethodAccessValidator.java | 2 +- .../NoOpMethodAccessValidator.java | 2 +- .../{ => pebble}/cache/CacheKey.java | 5 +- .../{ => pebble}/cache/PebbleCache.java | 2 +- .../cache/tag/CaffeineTagCache.java | 6 +- .../cache/tag/ConcurrentMapTagCache.java | 6 +- .../{ => pebble}/cache/tag/NoOpTagCache.java | 6 +- .../cache/template/CaffeineTemplateCache.java | 6 +- .../template/ConcurrentMapTemplateCache.java | 6 +- .../cache/template/NoOpTemplateCache.java | 6 +- .../error/AttributeNotFoundException.java | 2 +- .../error/ClassAccessException.java | 2 +- .../{ => pebble}/error/LoaderException.java | 2 +- .../{ => pebble}/error/ParserException.java | 2 +- .../{ => pebble}/error/PebbleException.java | 2 +- .../error/RootAttributeNotFoundException.java | 2 +- .../extension/AbstractExtension.java | 10 +- .../extension/AbstractNodeVisitor.java | 48 +++--- .../{ => pebble}/extension/Extension.java | 10 +- .../extension/ExtensionCustomizer.java | 12 +- .../extension/ExtensionRegistry.java | 10 +- .../extension/ExtensionRegistryFactory.java | 16 +- .../{ => pebble}/extension/Filter.java | 11 +- .../{ => pebble}/extension/Function.java | 9 +- .../extension/NamedArguments.java | 2 +- .../{ => pebble}/extension/NodeVisitor.java | 42 +++--- .../extension/NodeVisitorFactory.java | 4 +- .../{ => pebble}/extension/Test.java | 11 +- .../extension/core/AbbreviateFilter.java | 13 +- .../extension/core/AbsFilter.java | 13 +- .../core/AttributeResolverExtension.java | 9 +- .../extension/core/Base64DecoderFilter.java | 12 +- .../extension/core/Base64EncoderFilter.java | 12 +- .../extension/core/CapitalizeFilter.java | 11 +- .../extension/core/CoreExtension.java | 141 +++++++++--------- .../extension/core/DateFilter.java | 14 +- .../extension/core/DefaultFilter.java | 15 +- .../extension/core/DefinedTest.java | 9 +- .../extension/core/EmptyTest.java | 11 +- .../{ => pebble}/extension/core/EvenTest.java | 12 +- .../extension/core/FirstFilter.java | 11 +- .../extension/core/IterableTest.java | 10 +- .../extension/core/JoinFilter.java | 13 +- .../extension/core/LastFilter.java | 11 +- .../extension/core/LengthFilter.java | 11 +- .../extension/core/LowerFilter.java | 11 +- .../MacroAndBlockRegistrantNodeVisitor.java | 12 +- ...oAndBlockRegistrantNodeVisitorFactory.java | 10 +- .../{ => pebble}/extension/core/MapTest.java | 10 +- .../extension/core/MaxFunction.java | 12 +- .../extension/core/MergeFilter.java | 13 +- .../extension/core/MinFunction.java | 12 +- .../{ => pebble}/extension/core/NullTest.java | 11 +- .../extension/core/NumberFormatFilter.java | 13 +- .../{ => pebble}/extension/core/OddTest.java | 12 +- .../extension/core/RangeFunction.java | 13 +- .../extension/core/ReplaceFilter.java | 13 +- .../extension/core/ReverseFilter.java | 11 +- .../extension/core/RsortFilter.java | 11 +- .../extension/core/Sha256Filter.java | 12 +- .../extension/core/SliceFilter.java | 13 +- .../extension/core/SortFilter.java | 13 +- .../extension/core/SplitFilter.java | 13 +- .../extension/core/TitleFilter.java | 11 +- .../extension/core/TrimFilter.java | 11 +- .../extension/core/UpperFilter.java | 11 +- .../extension/core/UrlEncoderFilter.java | 11 +- .../extension/debug/DebugExtension.java | 7 +- .../debug/PrettyPrintNodeVisitor.java | 56 +++---- .../debug/PrettyPrintNodeVisitorFactory.java | 10 +- .../extension/escaper/EscapeFilter.java | 12 +- .../extension/escaper/EscaperExtension.java | 12 +- .../extension/escaper/EscaperNodeVisitor.java | 32 ++-- .../escaper/EscaperNodeVisitorFactory.java | 10 +- .../extension/escaper/EscapingStrategy.java | 2 +- .../extension/escaper/RawFilter.java | 8 +- .../extension/escaper/SafeString.java | 2 +- .../extension/i18n/I18nExtension.java | 7 +- .../extension/i18n/UTF8Control.java | 2 +- .../extension/i18n/i18nFunction.java | 11 +- .../writer/PooledSpecializedStringWriter.java | 2 +- .../extension/writer/SpecializedWriter.java | 2 +- .../StringWriterSpecializedAdapter.java | 2 +- .../{ => pebble}/lexer/Lexer.java | 2 +- .../{ => pebble}/lexer/LexerImpl.java | 18 +-- .../{ => pebble}/lexer/Syntax.java | 2 +- .../{ => pebble}/lexer/TemplateSource.java | 2 +- .../{ => pebble}/lexer/Token.java | 2 +- .../{ => pebble}/lexer/TokenStream.java | 8 +- .../loader/AbstractServletLoader.java | 7 +- .../{ => pebble}/loader/ClasspathLoader.java | 6 +- .../{ => pebble}/loader/DelegatingLoader.java | 4 +- .../loader/DelegatingLoaderCacheKey.java | 2 +- .../{ => pebble}/loader/FileLoader.java | 6 +- .../{ => pebble}/loader/Loader.java | 4 +- .../{ => pebble}/loader/Servlet5Loader.java | 2 +- .../{ => pebble}/loader/ServletLoader.java | 2 +- .../{ => pebble}/loader/StringLoader.java | 2 +- .../node/AbstractRenderableNode.java | 8 +- .../{ => pebble}/node/ArgumentsNode.java | 12 +- .../{ => pebble}/node/AutoEscapeNode.java | 8 +- .../{ => pebble}/node/BlockNode.java | 10 +- .../{ => pebble}/node/BodyNode.java | 8 +- .../{ => pebble}/node/CacheNode.java | 18 +-- .../{ => pebble}/node/EmbedNode.java | 16 +- .../{ => pebble}/node/ExtendsNode.java | 10 +- .../{ => pebble}/node/FlushNode.java | 8 +- .../{ => pebble}/node/ForNode.java | 20 +-- .../{ => pebble}/node/FromNode.java | 12 +- .../node/FunctionOrMacroNameNode.java | 10 +- .../{ => pebble}/node/IfNode.java | 18 +-- .../{ => pebble}/node/ImportNode.java | 12 +- .../{ => pebble}/node/IncludeNode.java | 16 +- .../{ => pebble}/node/MacroNode.java | 18 +-- .../{ => pebble}/node/NamedArgumentNode.java | 6 +- .../{ => pebble}/node/Node.java | 4 +- .../{ => pebble}/node/ParallelNode.java | 10 +- .../node/PositionalArgumentNode.java | 6 +- .../{ => pebble}/node/PrintNode.java | 20 +-- .../{ => pebble}/node/RenderableNode.java | 6 +- .../{ => pebble}/node/RootNode.java | 8 +- .../{ => pebble}/node/SetNode.java | 10 +- .../node/TestInvocationExpression.java | 10 +- .../{ => pebble}/node/TextNode.java | 8 +- .../node/expression/AddExpression.java | 10 +- .../node/expression/AndExpression.java | 10 +- .../node/expression/ArrayExpression.java | 8 +- .../node/expression/BinaryExpression.java | 4 +- .../expression/BlockFunctionExpression.java | 12 +- .../expression/ConcatenateExpression.java | 6 +- .../node/expression/ContainsExpression.java | 8 +- .../expression/ContextVariableExpression.java | 12 +- .../node/expression/DivideExpression.java | 10 +- .../node/expression/EqualsExpression.java | 10 +- .../node/expression/Expression.java | 8 +- .../node/expression/FilterExpression.java | 20 +-- .../FilterInvocationExpression.java | 10 +- .../FunctionOrMacroInvocationExpression.java | 12 +- .../expression/GetAttributeExpression.java | 24 +-- .../GreaterThanEqualsExpression.java | 10 +- .../expression/GreaterThanExpression.java | 10 +- .../expression/LessThanEqualsExpression.java | 10 +- .../node/expression/LessThanExpression.java | 10 +- .../LiteralBigDecimalExpression.java | 8 +- .../expression/LiteralBooleanExpression.java | 8 +- .../expression/LiteralDoubleExpression.java | 8 +- .../expression/LiteralIntegerExpression.java | 8 +- .../expression/LiteralLongExpression.java | 8 +- .../expression/LiteralNullExpression.java | 8 +- .../expression/LiteralStringExpression.java | 8 +- .../node/expression/MapExpression.java | 8 +- .../node/expression/ModulusExpression.java | 10 +- .../node/expression/MultiplyExpression.java | 10 +- .../expression/NegativeTestExpression.java | 6 +- .../node/expression/NotEqualsExpression.java | 10 +- .../node/expression/OrExpression.java | 10 +- .../expression/ParentFunctionExpression.java | 12 +- .../expression/PositiveTestExpression.java | 18 +-- .../node/expression/RangeExpression.java | 12 +- .../expression/RenderableNodeExpression.java | 12 +- .../node/expression/SubtractExpression.java | 10 +- .../node/expression/TernaryExpression.java | 12 +- .../node/expression/UnaryExpression.java | 4 +- .../node/expression/UnaryMinusExpression.java | 8 +- .../node/expression/UnaryNotExpression.java | 12 +- .../node/expression/UnaryPlusExpression.java | 8 +- .../{ => pebble}/node/fornode/LazyLength.java | 2 +- .../node/fornode/LazyRevIndex.java | 2 +- .../{ => pebble}/operator/Associativity.java | 2 +- .../{ => pebble}/operator/BinaryOperator.java | 4 +- .../operator/BinaryOperatorImpl.java | 12 +- .../operator/BinaryOperatorType.java | 2 +- .../{ => pebble}/operator/UnaryOperator.java | 4 +- .../operator/UnaryOperatorImpl.java | 4 +- .../{ => pebble}/parser/ExpressionParser.java | 68 ++++----- .../{ => pebble}/parser/Parser.java | 8 +- .../{ => pebble}/parser/ParserImpl.java | 28 ++-- .../{ => pebble}/parser/ParserOptions.java | 2 +- .../parser/StoppingCondition.java | 4 +- .../{ => pebble}/template/Block.java | 2 +- .../template/EvaluationContext.java | 2 +- .../template/EvaluationContextImpl.java | 12 +- .../template/EvaluationOptions.java | 4 +- .../{ => pebble}/template/GlobalContext.java | 2 +- .../{ => pebble}/template/Hierarchy.java | 2 +- .../{ => pebble}/template/Macro.java | 4 +- .../template/MacroAttributeProvider.java | 4 +- .../{ => pebble}/template/PebbleTemplate.java | 4 +- .../template/PebbleTemplateImpl.java | 26 ++-- .../template/RenderedSizeContext.java | 2 +- .../{ => pebble}/template/Scope.java | 2 +- .../{ => pebble}/template/ScopeChain.java | 2 +- .../tokenParser/AutoEscapeTokenParser.java | 16 +- .../tokenParser/BlockTokenParser.java | 18 +-- .../tokenParser/CacheTokenParser.java | 18 +-- .../tokenParser/EmbedTokenParser.java | 22 +-- .../tokenParser/ExtendsTokenParser.java | 14 +- .../tokenParser/FilterTokenParser.java | 22 +-- .../tokenParser/FlushTokenParser.java | 12 +- .../tokenParser/ForTokenParser.java | 18 +-- .../tokenParser/FromTokenParser.java | 20 +-- .../tokenParser/IfTokenParser.java | 24 +-- .../tokenParser/ImportTokenParser.java | 16 +- .../tokenParser/IncludeTokenParser.java | 20 +-- .../tokenParser/MacroTokenParser.java | 18 +-- .../tokenParser/ParallelTokenParser.java | 16 +- .../tokenParser/SetTokenParser.java | 16 +- .../{ => pebble}/tokenParser/TokenParser.java | 8 +- .../tokenParser/VerbatimTokenParser.java | 8 +- .../{ => pebble}/utils/Callbacks.java | 2 +- .../{ => pebble}/utils/FutureWriter.java | 2 +- .../{ => pebble}/utils/LimitedSizeWriter.java | 6 +- .../{ => pebble}/utils/OperatorUtils.java | 5 +- .../{ => pebble}/utils/Pair.java | 2 +- .../{ => pebble}/utils/PathUtils.java | 2 +- .../utils/StringLengthComparator.java | 2 +- .../{ => pebble}/utils/StringUtils.java | 2 +- .../{ => pebble}/utils/TypeUtils.java | 2 +- .../{ => pebble}/ArgumentsNodeTest.java | 10 +- .../{ => pebble}/ArraySyntaxTest.java | 11 +- .../AttributeSubscriptSyntaxTest.java | 8 +- .../{ => pebble}/CacheTest.java | 6 +- .../{ => pebble}/CompilerTest.java | 8 +- .../{ => pebble}/ConcurrencyTest.java | 12 +- .../{ => pebble}/ContextTest.java | 10 +- .../{ => pebble}/CoreFiltersTest.java | 15 +- .../{ => pebble}/CoreFunctionsTest.java | 8 +- .../{ => pebble}/CoreTagsTest.java | 10 +- .../{ => pebble}/CoreTestsTest.java | 8 +- .../{ => pebble}/EmbedCachingTagTest.java | 12 +- .../{ => pebble}/EmbedTagTest.java | 16 +- .../{ => pebble}/EnumEqualsTest.java | 8 +- .../{ => pebble}/ErrorReportingTest.java | 12 +- .../{ => pebble}/EscaperExtensionTest.java | 18 +-- .../{ => pebble}/ExtendingPebbleTest.java | 20 +-- .../pebbletemplates/{ => pebble}/ForTest.java | 8 +- .../{ => pebble}/GetAttributeTest.java | 17 ++- .../{ => pebble}/I18nExtensionTest.java | 8 +- .../IncludeWithParameterTest.java | 7 +- .../{ => pebble}/InheritanceTest.java | 8 +- .../{ => pebble}/LoaderTest.java | 20 +-- .../{ => pebble}/LogicTest.java | 10 +- .../{ => pebble}/MacroTest.java | 12 +- .../{ => pebble}/MapSyntaxTest.java | 12 +- .../{ => pebble}/MaxRenderedSizeTest.java | 6 +- .../MethodAccessTemplateTest.java | 11 +- .../{ => pebble}/NewlineTrimmingTest.java | 8 +- .../{ => pebble}/OverloadedMethodTest.java | 8 +- .../OverrideCoreExtensionTest.java | 36 ++--- .../{ => pebble}/ParsingOdditiesTest.java | 10 +- .../{ => pebble}/RenderSingleBlockTest.java | 8 +- .../RenderWithoutEndBlockTest.java | 8 +- .../{ => pebble}/ScopeChainTest.java | 6 +- .../{ => pebble}/ScopeTest.java | 4 +- .../{ => pebble}/SplitFilterTest.java | 8 +- .../{ => pebble}/StrictModeTest.java | 10 +- .../{ => pebble}/StringInterpolationTest.java | 6 +- .../{ => pebble}/TernaryExpressionTest.java | 10 +- .../{ => pebble}/TestParallelParsing.java | 28 ++-- .../{ => pebble}/TestRelativePath.java | 8 +- .../{ => pebble}/WhitespaceControlTest.java | 8 +- .../{ => pebble}/WritingTest.java | 8 +- .../BlacklistMethodAccessValidatorTest.java | 2 +- .../attributes/methodaccess/Foo.java | 2 +- .../methodaccess/InstanceProvider.java | 2 +- .../methodaccess/MethodsProvider.java | 2 +- .../NoOpMethodAccessValidatorTest.java | 2 +- .../extension/ArrayToStringFilter.java | 6 +- .../extension/ExtensionCustomizerTest.java | 8 +- .../extension/InvocationCountingFunction.java | 6 +- .../extension/ListToStringFilter.java | 8 +- .../extension/MapToStringFilter.java | 6 +- .../extension/TestingExtension.java | 2 +- .../extension/escaper/RawFilterTest.java | 10 +- .../{ => pebble}/lexer/IdentifierTest.java | 8 +- .../{ => pebble}/lexer/LexerImplTest.java | 10 +- .../{ => pebble}/lexer/SyntaxTest.java | 2 +- .../macro/MacroGlobalVariablesTest.java | 8 +- .../{ => pebble}/macro/PebbleExtension.java | 6 +- .../{ => pebble}/macro/TestFilter.java | 8 +- .../{ => pebble}/macro/TestMacroCalls.java | 8 +- .../{ => pebble}/node/ForNodeTest.java | 8 +- .../{ => pebble}/node/IfNodeTest.java | 10 +- .../node/expression/AndExpressionTest.java | 2 +- .../node/expression/ExpressionTest.java | 8 +- .../node/expression/OrExpressionTest.java | 2 +- .../StringExpressionParserTest.java | 26 ++-- .../expression/UnaryNotExpressionTest.java | 10 +- .../template/tests/PebbleTestContext.java | 8 +- ...eSpaceControlWithNewLineTrimmingTests.java | 8 +- .../template/tests/input/PebbleTestItem.java | 2 +- .../tests/input/PebbleTestItemType.java | 2 +- .../utils/LimitedSizeWriterTest.java | 6 +- .../{ => pebble}/utils/PathUtilsTest.java | 2 +- .../security/allowedMethods.properties | 10 +- 347 files changed, 1696 insertions(+), 1658 deletions(-) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/PebbleEngine.java (92%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/ArrayResolver.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/AttributeResolver.java (61%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/DefaultAttributeResolver.java (92%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/ListResolver.java (82%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/MacroResolver.java (74%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/MapResolver.java (88%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/MemberCacheUtils.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/ResolvedAttribute.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/methodaccess/BlacklistMethodAccessValidator.java (95%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/methodaccess/MethodAccessValidator.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/attributes/methodaccess/NoOpMethodAccessValidator.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/cache/CacheKey.java (93%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/cache/PebbleCache.java (81%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/cache/tag/CaffeineTagCache.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/cache/tag/ConcurrentMapTagCache.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/cache/tag/NoOpTagCache.java (68%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/cache/template/CaffeineTemplateCache.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/cache/template/ConcurrentMapTemplateCache.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/cache/template/NoOpTemplateCache.java (68%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/error/AttributeNotFoundException.java (94%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/error/ClassAccessException.java (93%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/error/LoaderException.java (91%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/error/ParserException.java (92%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/error/PebbleException.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/error/RootAttributeNotFoundException.java (93%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/AbstractExtension.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/AbstractNodeVisitor.java (72%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/Extension.java (87%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/ExtensionCustomizer.java (84%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/ExtensionRegistry.java (94%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/ExtensionRegistryFactory.java (82%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/Filter.java (60%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/Function.java (65%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/NamedArguments.java (87%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/NodeVisitor.java (59%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/NodeVisitorFactory.java (87%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/Test.java (60%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/AbbreviateFilter.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/AbsFilter.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/AttributeResolverExtension.java (59%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/Base64DecoderFilter.java (75%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/Base64EncoderFilter.java (63%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/CapitalizeFilter.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/CoreExtension.java (56%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/DateFilter.java (90%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/DefaultFilter.java (68%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/DefinedTest.java (67%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/EmptyTest.java (76%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/EvenTest.java (67%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/FirstFilter.java (80%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/IterableTest.java (65%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/JoinFilter.java (85%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/LastFilter.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/LengthFilter.java (81%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/LowerFilter.java (71%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/MacroAndBlockRegistrantNodeVisitor.java (69%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java (57%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/MapTest.java (64%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/MaxFunction.java (72%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/MergeFilter.java (91%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/MinFunction.java (72%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/NullTest.java (65%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/NumberFormatFilter.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/OddTest.java (65%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/RangeFunction.java (90%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/ReplaceFilter.java (75%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/ReverseFilter.java (66%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/RsortFilter.java (73%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/Sha256Filter.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/SliceFilter.java (91%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/SortFilter.java (74%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/SplitFilter.java (76%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/TitleFilter.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/TrimFilter.java (67%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/UpperFilter.java (71%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/core/UrlEncoderFilter.java (72%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/debug/DebugExtension.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/debug/PrettyPrintNodeVisitor.java (74%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/debug/PrettyPrintNodeVisitorFactory.java (52%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/escaper/EscapeFilter.java (89%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/escaper/EscaperExtension.java (85%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/escaper/EscaperNodeVisitor.java (80%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/escaper/EscaperNodeVisitorFactory.java (60%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/escaper/EscapingStrategy.java (57%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/escaper/RawFilter.java (73%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/escaper/SafeString.java (92%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/i18n/I18nExtension.java (75%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/i18n/UTF8Control.java (96%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/i18n/i18nFunction.java (84%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/writer/PooledSpecializedStringWriter.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/writer/SpecializedWriter.java (96%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/extension/writer/StringWriterSpecializedAdapter.java (95%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/lexer/Lexer.java (88%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/lexer/LexerImpl.java (98%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/lexer/Syntax.java (99%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/lexer/TemplateSource.java (99%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/lexer/Token.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/lexer/TokenStream.java (93%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/loader/AbstractServletLoader.java (95%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/loader/ClasspathLoader.java (95%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/loader/DelegatingLoader.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/loader/DelegatingLoaderCacheKey.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/loader/FileLoader.java (95%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/loader/Loader.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/loader/Servlet5Loader.java (94%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/loader/ServletLoader.java (94%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/loader/StringLoader.java (96%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/AbstractRenderableNode.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/ArgumentsNode.java (91%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/AutoEscapeNode.java (82%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/BlockNode.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/BodyNode.java (89%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/CacheNode.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/EmbedNode.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/ExtendsNode.java (75%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/FlushNode.java (74%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/ForNode.java (91%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/FromNode.java (72%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/FunctionOrMacroNameNode.java (74%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/IfNode.java (84%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/ImportNode.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/IncludeNode.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/MacroNode.java (86%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/NamedArgumentNode.java (80%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/Node.java (74%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/ParallelNode.java (90%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/PositionalArgumentNode.java (80%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/PrintNode.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/RenderableNode.java (72%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/RootNode.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/SetNode.java (76%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/TestInvocationExpression.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/TextNode.java (82%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/AddExpression.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/AndExpression.java (81%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/ArrayExpression.java (85%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/BinaryExpression.java (93%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/BlockFunctionExpression.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/ConcatenateExpression.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/ContainsExpression.java (95%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/ContextVariableExpression.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/DivideExpression.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/EqualsExpression.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/Expression.java (69%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/FilterExpression.java (77%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/FilterInvocationExpression.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/FunctionOrMacroInvocationExpression.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/GetAttributeExpression.java (86%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/GreaterThanEqualsExpression.java (71%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/GreaterThanExpression.java (71%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/LessThanEqualsExpression.java (71%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/LessThanExpression.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/LiteralBigDecimalExpression.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/LiteralBooleanExpression.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/LiteralDoubleExpression.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/LiteralIntegerExpression.java (76%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/LiteralLongExpression.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/LiteralNullExpression.java (74%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/LiteralStringExpression.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/MapExpression.java (87%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/ModulusExpression.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/MultiplyExpression.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/NegativeTestExpression.java (71%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/NotEqualsExpression.java (71%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/OrExpression.java (81%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/ParentFunctionExpression.java (82%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/PositiveTestExpression.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/RangeExpression.java (69%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/RenderableNodeExpression.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/SubtractExpression.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/TernaryExpression.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/UnaryExpression.java (90%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/UnaryMinusExpression.java (66%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/UnaryNotExpression.java (77%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/expression/UnaryPlusExpression.java (66%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/fornode/LazyLength.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/node/fornode/LazyRevIndex.java (93%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/operator/Associativity.java (85%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/operator/BinaryOperator.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/operator/BinaryOperatorImpl.java (86%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/operator/BinaryOperatorType.java (57%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/operator/UnaryOperator.java (76%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/operator/UnaryOperatorImpl.java (88%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/parser/ExpressionParser.java (90%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/parser/Parser.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/parser/ParserImpl.java (90%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/parser/ParserOptions.java (94%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/parser/StoppingCondition.java (86%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/Block.java (90%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/EvaluationContext.java (82%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/EvaluationContextImpl.java (96%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/EvaluationOptions.java (86%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/GlobalContext.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/Hierarchy.java (98%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/Macro.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/MacroAttributeProvider.java (87%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/PebbleTemplate.java (97%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/PebbleTemplateImpl.java (96%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/RenderedSizeContext.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/Scope.java (98%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/template/ScopeChain.java (99%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/AutoEscapeTokenParser.java (79%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/BlockTokenParser.java (83%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/CacheTokenParser.java (72%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/EmbedTokenParser.java (85%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/ExtendsTokenParser.java (68%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/FilterTokenParser.java (76%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/FlushTokenParser.java (68%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/ForTokenParser.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/FromTokenParser.java (82%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/IfTokenParser.java (81%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/ImportTokenParser.java (75%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/IncludeTokenParser.java (75%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/MacroTokenParser.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/ParallelTokenParser.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/SetTokenParser.java (70%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/TokenParser.java (91%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/tokenParser/VerbatimTokenParser.java (76%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/utils/Callbacks.java (78%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/utils/FutureWriter.java (98%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/utils/LimitedSizeWriter.java (94%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/utils/OperatorUtils.java (98%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/utils/Pair.java (94%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/utils/PathUtils.java (98%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/utils/StringLengthComparator.java (92%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/utils/StringUtils.java (95%) rename pebble/src/main/java/io/pebbletemplates/{ => pebble}/utils/TypeUtils.java (98%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ArgumentsNodeTest.java (80%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ArraySyntaxTest.java (99%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/AttributeSubscriptSyntaxTest.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/CacheTest.java (97%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/CompilerTest.java (88%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ConcurrencyTest.java (97%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ContextTest.java (97%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/CoreFiltersTest.java (99%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/CoreFunctionsTest.java (98%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/CoreTagsTest.java (99%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/CoreTestsTest.java (97%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/EmbedCachingTagTest.java (85%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/EmbedTagTest.java (91%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/EnumEqualsTest.java (84%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ErrorReportingTest.java (89%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/EscaperExtensionTest.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ExtendingPebbleTest.java (85%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ForTest.java (92%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/GetAttributeTest.java (98%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/I18nExtensionTest.java (92%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/IncludeWithParameterTest.java (93%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/InheritanceTest.java (93%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/LoaderTest.java (90%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/LogicTest.java (99%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/MacroTest.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/MapSyntaxTest.java (98%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/MaxRenderedSizeTest.java (90%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/MethodAccessTemplateTest.java (94%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/NewlineTrimmingTest.java (96%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/OverloadedMethodTest.java (97%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/OverrideCoreExtensionTest.java (83%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ParsingOdditiesTest.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/RenderSingleBlockTest.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/RenderWithoutEndBlockTest.java (97%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ScopeChainTest.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/ScopeTest.java (88%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/SplitFilterTest.java (94%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/StrictModeTest.java (92%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/StringInterpolationTest.java (97%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/TernaryExpressionTest.java (97%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/TestParallelParsing.java (84%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/TestRelativePath.java (94%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/WhitespaceControlTest.java (97%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/WritingTest.java (93%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java (96%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/attributes/methodaccess/Foo.java (71%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/attributes/methodaccess/InstanceProvider.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/attributes/methodaccess/MethodsProvider.java (98%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/attributes/methodaccess/NoOpMethodAccessValidatorTest.java (87%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/extension/ArrayToStringFilter.java (85%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/extension/ExtensionCustomizerTest.java (87%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/extension/InvocationCountingFunction.java (79%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/extension/ListToStringFilter.java (84%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/extension/MapToStringFilter.java (90%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/extension/TestingExtension.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/extension/escaper/RawFilterTest.java (92%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/lexer/IdentifierTest.java (92%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/lexer/LexerImplTest.java (98%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/lexer/SyntaxTest.java (99%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/macro/MacroGlobalVariablesTest.java (81%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/macro/PebbleExtension.java (64%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/macro/TestFilter.java (75%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/macro/TestMacroCalls.java (96%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/node/ForNodeTest.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/node/IfNodeTest.java (90%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/node/expression/AndExpressionTest.java (94%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/node/expression/ExpressionTest.java (73%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/node/expression/OrExpressionTest.java (94%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/node/expression/StringExpressionParserTest.java (92%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/node/expression/UnaryNotExpressionTest.java (90%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/template/tests/PebbleTestContext.java (96%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java (95%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/template/tests/input/PebbleTestItem.java (93%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/template/tests/input/PebbleTestItemType.java (60%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/utils/LimitedSizeWriterTest.java (94%) rename pebble/src/test/java/io/pebbletemplates/{ => pebble}/utils/PathUtilsTest.java (98%) diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java index 82a928beb..7ad8bc858 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java @@ -1,10 +1,10 @@ package io.pebbletemplates.boot.autoconfigure; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.extension.Extension; -import io.pebbletemplates.loader.ClasspathLoader; -import io.pebbletemplates.loader.Loader; -import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.extension.Extension; +import io.pebbletemplates.pebble.loader.ClasspathLoader; +import io.pebbletemplates.pebble.loader.Loader; +import io.pebbletemplates.pebble.attributes.methodaccess.MethodAccessValidator; import io.pebbletemplates.spring.extension.SpringExtension; import java.util.List; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java index 9effc62d9..7b08f8439 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java @@ -1,7 +1,7 @@ package io.pebbletemplates.boot.autoconfigure; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.loader.ClasspathLoader; import io.pebbletemplates.spring.reactive.PebbleReactiveViewResolver; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java index 93f283092..241198b5a 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java @@ -1,7 +1,7 @@ package io.pebbletemplates.boot.autoconfigure; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.loader.ClasspathLoader; import io.pebbletemplates.spring.servlet.PebbleViewResolver; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java index ef4ff5456..f99856e98 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java @@ -1,10 +1,10 @@ package io.pebbletemplates.boot; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Extension; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Extension; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java index 2a1a71da8..e863b118b 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.PebbleEngine; import io.pebbletemplates.boot.Application; import java.io.StringWriter; import org.junit.jupiter.api.Test; diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java index abdd523be..5819d306a 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java @@ -4,11 +4,11 @@ import static java.util.Locale.FRENCH; import static org.assertj.core.api.Assertions.assertThat; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.loader.Loader; -import io.pebbletemplates.attributes.methodaccess.BlacklistMethodAccessValidator; -import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; -import io.pebbletemplates.attributes.methodaccess.NoOpMethodAccessValidator; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.loader.Loader; +import io.pebbletemplates.pebble.attributes.methodaccess.BlacklistMethodAccessValidator; +import io.pebbletemplates.pebble.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.pebble.attributes.methodaccess.NoOpMethodAccessValidator; import io.pebbletemplates.spring.extension.SpringExtension; import io.pebbletemplates.spring.reactive.PebbleReactiveViewResolver; import io.pebbletemplates.spring.servlet.PebbleViewResolver; diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java index 1779ef40c..2d858ea03 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfiguration.java @@ -1,10 +1,10 @@ package io.pebbletemplates.boot.autoconfigure; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; -import io.pebbletemplates.extension.Extension; -import io.pebbletemplates.loader.ClasspathLoader; -import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.pebble.extension.Extension; +import io.pebbletemplates.pebble.loader.ClasspathLoader; +import io.pebbletemplates.pebble.loader.Loader; import io.pebbletemplates.spring.extension.SpringExtension; import java.util.List; diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java index 99728dd73..e10d2c68d 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleReactiveWebConfiguration.java @@ -1,7 +1,7 @@ package io.pebbletemplates.boot.autoconfigure; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.loader.ClasspathLoader; import io.pebbletemplates.spring.reactive.PebbleReactiveViewResolver; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java index 99e767c16..e0846426f 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleServletWebConfiguration.java @@ -1,7 +1,7 @@ package io.pebbletemplates.boot.autoconfigure; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.loader.ClasspathLoader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.loader.ClasspathLoader; import io.pebbletemplates.spring.servlet.PebbleViewResolver; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java index ef4ff5456..f99856e98 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/AppConfig.java @@ -1,10 +1,10 @@ package io.pebbletemplates.boot; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Extension; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Extension; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java index 2a1a71da8..e863b118b 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/NonWebAppTests.java @@ -2,7 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.PebbleEngine; import io.pebbletemplates.boot.Application; import java.io.StringWriter; import org.junit.jupiter.api.Test; diff --git a/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java index 8cac3be8b..93c91afa4 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java +++ b/pebble-spring/pebble-spring-boot-starter/src/test/java/io/pebbletemplates/boot/autoconfigure/PebbleAutoConfigurationTest.java @@ -4,12 +4,12 @@ import static java.util.Locale.FRENCH; import static org.assertj.core.api.Assertions.assertThat; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.attributes.methodaccess.BlacklistMethodAccessValidator; -import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; -import io.pebbletemplates.attributes.methodaccess.NoOpMethodAccessValidator; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.attributes.methodaccess.BlacklistMethodAccessValidator; +import io.pebbletemplates.pebble.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.pebble.attributes.methodaccess.NoOpMethodAccessValidator; import io.pebbletemplates.boot.autoconfigure.PebbleAutoConfiguration; -import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.pebble.loader.Loader; import io.pebbletemplates.spring.extension.SpringExtension; import io.pebbletemplates.spring.reactive.PebbleReactiveViewResolver; import io.pebbletemplates.spring.servlet.PebbleViewResolver; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java index f6c626600..8d41dc86e 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Function; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Function; import io.pebbletemplates.spring.extension.function.HrefFunction; import io.pebbletemplates.spring.extension.function.MessageSourceFunction; import io.pebbletemplates.spring.extension.function.bindingresult.GetAllErrorsFunction; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java index 2136f335d..86ce4a1be 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java @@ -1,9 +1,9 @@ package io.pebbletemplates.spring.extension.function; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.extension.NamedArguments; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.extension.NamedArguments; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.springframework.util.StringUtils; import org.springframework.web.context.request.RequestContextHolder; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java index 78b150244..203abb07b 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java @@ -6,9 +6,9 @@ */ package io.pebbletemplates.spring.extension.function; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java index 35645a0fd..298d31d59 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java @@ -6,9 +6,9 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.GlobalContext; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.GlobalContext; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java index e9540d92b..50aa87886 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java index 88f256e9c..d75a9876c 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java index bbb8a9a33..5576a9c32 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java index 91a99840f..deb381af3 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.Map; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java index f7c33461d..068050fda 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.Map; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java index 7eab92535..843ffee72 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.Map; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java index 86015a756..e6ec4891e 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java @@ -2,10 +2,10 @@ import static java.util.Optional.ofNullable; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; import io.pebbletemplates.spring.context.Beans; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java index d11581687..e6a8a5d4d 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java @@ -1,6 +1,6 @@ package io.pebbletemplates.spring.reactive; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.PebbleEngine; import org.springframework.web.reactive.result.view.AbstractUrlBasedView; import org.springframework.web.reactive.result.view.UrlBasedViewResolver; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java index 4cddeeb28..040d274f9 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java @@ -6,10 +6,10 @@ */ package io.pebbletemplates.spring.servlet; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; import io.pebbletemplates.spring.context.Beans; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java index f4d04599f..7b403240e 100644 --- a/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java +++ b/pebble-spring/pebble-spring5/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.servlet; -import io.pebbletemplates.loader.Loader; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.loader.Loader; +import io.pebbletemplates.pebble.PebbleEngine; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.servlet.view.AbstractTemplateViewResolver; import org.springframework.web.servlet.view.AbstractUrlBasedView; diff --git a/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java b/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java index 01c61facb..dd32d3e6c 100644 --- a/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java +++ b/pebble-spring/pebble-spring5/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java @@ -6,9 +6,9 @@ */ package io.pebbletemplates.spring.config; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.loader.ClasspathLoader; -import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.loader.ClasspathLoader; +import io.pebbletemplates.pebble.loader.Loader; import io.pebbletemplates.spring.bean.SomeBean; import io.pebbletemplates.spring.extension.SpringExtension; import io.pebbletemplates.spring.servlet.PebbleViewResolver; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java index f6c626600..8d41dc86e 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/SpringExtension.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Function; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Function; import io.pebbletemplates.spring.extension.function.HrefFunction; import io.pebbletemplates.spring.extension.function.MessageSourceFunction; import io.pebbletemplates.spring.extension.function.bindingresult.GetAllErrorsFunction; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java index 2f1ec7883..85465feb2 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/HrefFunction.java @@ -1,9 +1,9 @@ package io.pebbletemplates.spring.extension.function; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.extension.NamedArguments; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.NamedArguments; import jakarta.servlet.http.HttpServletRequest; import org.springframework.util.StringUtils; import org.springframework.web.context.request.RequestContextHolder; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java index a4365ec9b..30aaa36d9 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/MessageSourceFunction.java @@ -6,9 +6,9 @@ */ package io.pebbletemplates.spring.extension.function; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java index 35645a0fd..298d31d59 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/BaseBindingResultFunction.java @@ -6,9 +6,9 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.GlobalContext; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.GlobalContext; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java index a656cdf80..22a7f511c 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetAllErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java index dfc7f3856..e4c1be41f 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetFieldErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java index 562d1d61c..05870ab82 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/GetGlobalErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java index 80ac4e4fb..40e3fe0d3 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.Map; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java index d8eec6a22..ee7130bc1 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasFieldErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.Map; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java index 5fa598e95..9b5a17a37 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/extension/function/bindingresult/HasGlobalErrorsFunction.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.extension.function.bindingresult; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.Map; import org.springframework.validation.BindingResult; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java index 9820751f0..e3b5e15aa 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveView.java @@ -2,10 +2,10 @@ import static java.util.Optional.ofNullable; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; import io.pebbletemplates.spring.context.Beans; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java index d11581687..e6a8a5d4d 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/reactive/PebbleReactiveViewResolver.java @@ -1,6 +1,6 @@ package io.pebbletemplates.spring.reactive; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.PebbleEngine; import org.springframework.web.reactive.result.view.AbstractUrlBasedView; import org.springframework.web.reactive.result.view.UrlBasedViewResolver; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java index 6fee497f2..58a6518ef 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleView.java @@ -6,10 +6,10 @@ */ package io.pebbletemplates.spring.servlet; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.error.PebbleException; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; import io.pebbletemplates.spring.context.Beans; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplate; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; diff --git a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java index 9bf7b4b3b..bb4cbb568 100644 --- a/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java +++ b/pebble-spring/pebble-spring6/src/main/java/io/pebbletemplates/spring/servlet/PebbleViewResolver.java @@ -6,8 +6,8 @@ */ package io.pebbletemplates.spring.servlet; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.loader.Loader; import org.springframework.beans.factory.InitializingBean; import org.springframework.web.servlet.view.AbstractTemplateViewResolver; import org.springframework.web.servlet.view.AbstractUrlBasedView; diff --git a/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java b/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java index 01c61facb..dd32d3e6c 100644 --- a/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java +++ b/pebble-spring/pebble-spring6/src/test/java/io/pebbletemplates/spring/config/MVCConfig.java @@ -6,9 +6,9 @@ */ package io.pebbletemplates.spring.config; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.loader.ClasspathLoader; -import io.pebbletemplates.loader.Loader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.loader.ClasspathLoader; +import io.pebbletemplates.pebble.loader.Loader; import io.pebbletemplates.spring.bean.SomeBean; import io.pebbletemplates.spring.extension.SpringExtension; import io.pebbletemplates.spring.servlet.PebbleViewResolver; diff --git a/pebble/src/main/java/io/pebbletemplates/PebbleEngine.java b/pebble/src/main/java/io/pebbletemplates/pebble/PebbleEngine.java similarity index 92% rename from pebble/src/main/java/io/pebbletemplates/PebbleEngine.java rename to pebble/src/main/java/io/pebbletemplates/pebble/PebbleEngine.java index a7a92bfd3..65e5481b5 100644 --- a/pebble/src/main/java/io/pebbletemplates/PebbleEngine.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/PebbleEngine.java @@ -6,35 +6,36 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; - - -import io.pebbletemplates.cache.CacheKey; -import io.pebbletemplates.cache.PebbleCache; -import io.pebbletemplates.cache.tag.ConcurrentMapTagCache; -import io.pebbletemplates.cache.tag.NoOpTagCache; -import io.pebbletemplates.cache.template.ConcurrentMapTemplateCache; -import io.pebbletemplates.cache.template.NoOpTemplateCache; -import io.pebbletemplates.error.LoaderException; -import io.pebbletemplates.extension.*; -import io.pebbletemplates.lexer.LexerImpl; -import io.pebbletemplates.lexer.Syntax; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.RootNode; -import io.pebbletemplates.parser.Parser; -import io.pebbletemplates.parser.ParserImpl; -import io.pebbletemplates.parser.ParserOptions; -import io.pebbletemplates.attributes.methodaccess.BlacklistMethodAccessValidator; -import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; -import io.pebbletemplates.extension.escaper.EscapingStrategy; -import io.pebbletemplates.loader.ClasspathLoader; -import io.pebbletemplates.loader.DelegatingLoader; -import io.pebbletemplates.loader.FileLoader; -import io.pebbletemplates.loader.Loader; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.EvaluationOptions; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.template.PebbleTemplateImpl; +package io.pebbletemplates.pebble; + + +import io.pebbletemplates.pebble.cache.CacheKey; +import io.pebbletemplates.pebble.cache.PebbleCache; +import io.pebbletemplates.pebble.cache.tag.ConcurrentMapTagCache; +import io.pebbletemplates.pebble.cache.tag.NoOpTagCache; +import io.pebbletemplates.pebble.cache.template.ConcurrentMapTemplateCache; +import io.pebbletemplates.pebble.cache.template.NoOpTemplateCache; +import io.pebbletemplates.pebble.error.LoaderException; +import io.pebbletemplates.pebble.lexer.LexerImpl; +import io.pebbletemplates.pebble.lexer.Syntax; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.parser.Parser; +import io.pebbletemplates.pebble.parser.ParserImpl; +import io.pebbletemplates.pebble.parser.ParserOptions; +import io.pebbletemplates.pebble.attributes.methodaccess.BlacklistMethodAccessValidator; +import io.pebbletemplates.pebble.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.pebble.extension.escaper.EscapingStrategy; +import io.pebbletemplates.pebble.loader.ClasspathLoader; +import io.pebbletemplates.pebble.loader.DelegatingLoader; +import io.pebbletemplates.pebble.loader.FileLoader; +import io.pebbletemplates.pebble.loader.Loader; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.extension.*; +import io.pebbletemplates.pebble.template.EvaluationOptions; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; + import java.io.IOException; import java.io.Reader; import java.util.ArrayList; @@ -43,7 +44,7 @@ import java.util.concurrent.ExecutorService; import java.util.function.Function; -import io.pebbletemplates.utils.TypeUtils; +import io.pebbletemplates.pebble.utils.TypeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/ArrayResolver.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/ArrayResolver.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/attributes/ArrayResolver.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/ArrayResolver.java index fc0bd8977..cfc22a2a0 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/ArrayResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/ArrayResolver.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.attributes; +package io.pebbletemplates.pebble.attributes; -import io.pebbletemplates.error.AttributeNotFoundException; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.error.AttributeNotFoundException; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; import java.lang.reflect.Array; diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/AttributeResolver.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/AttributeResolver.java similarity index 61% rename from pebble/src/main/java/io/pebbletemplates/attributes/AttributeResolver.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/AttributeResolver.java index 50ff05cf3..94e2fe9e7 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/AttributeResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/AttributeResolver.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.attributes; +package io.pebbletemplates.pebble.attributes; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; public interface AttributeResolver { diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/DefaultAttributeResolver.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/DefaultAttributeResolver.java similarity index 92% rename from pebble/src/main/java/io/pebbletemplates/attributes/DefaultAttributeResolver.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/DefaultAttributeResolver.java index 90de96f79..1858c2c56 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/DefaultAttributeResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/DefaultAttributeResolver.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.attributes; +package io.pebbletemplates.pebble.attributes; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.MacroAttributeProvider; -import io.pebbletemplates.utils.TypeUtils; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.MacroAttributeProvider; +import io.pebbletemplates.pebble.utils.TypeUtils; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/ListResolver.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/ListResolver.java similarity index 82% rename from pebble/src/main/java/io/pebbletemplates/attributes/ListResolver.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/ListResolver.java index 608e1a73d..d3eb7a9bd 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/ListResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/ListResolver.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.attributes; +package io.pebbletemplates.pebble.attributes; -import io.pebbletemplates.error.AttributeNotFoundException; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.error.AttributeNotFoundException; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/MacroResolver.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/MacroResolver.java similarity index 74% rename from pebble/src/main/java/io/pebbletemplates/attributes/MacroResolver.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/MacroResolver.java index 8bee3b405..7b6e65670 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/MacroResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/MacroResolver.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.attributes; +package io.pebbletemplates.pebble.attributes; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.MacroAttributeProvider; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.MacroAttributeProvider; class MacroResolver implements AttributeResolver { diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/MapResolver.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/MapResolver.java similarity index 88% rename from pebble/src/main/java/io/pebbletemplates/attributes/MapResolver.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/MapResolver.java index d947f5db2..3df59ff98 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/MapResolver.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/MapResolver.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.attributes; +package io.pebbletemplates.pebble.attributes; -import io.pebbletemplates.error.AttributeNotFoundException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.error.AttributeNotFoundException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/MemberCacheUtils.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/MemberCacheUtils.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/attributes/MemberCacheUtils.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/MemberCacheUtils.java index 36e150b46..f314dcea2 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/MemberCacheUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/MemberCacheUtils.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.attributes; +package io.pebbletemplates.pebble.attributes; -import io.pebbletemplates.error.ClassAccessException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.EvaluationOptions; +import io.pebbletemplates.pebble.error.ClassAccessException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.EvaluationOptions; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Member; diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/ResolvedAttribute.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/ResolvedAttribute.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/attributes/ResolvedAttribute.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/ResolvedAttribute.java index b03d99675..23e4e8bfb 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/ResolvedAttribute.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/ResolvedAttribute.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.attributes; +package io.pebbletemplates.pebble.attributes; public final class ResolvedAttribute { diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidator.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/methodaccess/BlacklistMethodAccessValidator.java similarity index 95% rename from pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidator.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/methodaccess/BlacklistMethodAccessValidator.java index 9661c700e..54dc1c573 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidator.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/methodaccess/BlacklistMethodAccessValidator.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.attributes.methodaccess; +package io.pebbletemplates.pebble.attributes.methodaccess; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Method; diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/MethodAccessValidator.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/methodaccess/MethodAccessValidator.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/MethodAccessValidator.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/methodaccess/MethodAccessValidator.java index de1dc2105..a3e825077 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/MethodAccessValidator.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/methodaccess/MethodAccessValidator.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.attributes.methodaccess; +package io.pebbletemplates.pebble.attributes.methodaccess; import java.lang.reflect.Method; diff --git a/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidator.java b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/methodaccess/NoOpMethodAccessValidator.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidator.java rename to pebble/src/main/java/io/pebbletemplates/pebble/attributes/methodaccess/NoOpMethodAccessValidator.java index a12a7f774..e7adbca70 100644 --- a/pebble/src/main/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidator.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/attributes/methodaccess/NoOpMethodAccessValidator.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.attributes.methodaccess; +package io.pebbletemplates.pebble.attributes.methodaccess; import java.lang.reflect.Method; diff --git a/pebble/src/main/java/io/pebbletemplates/cache/CacheKey.java b/pebble/src/main/java/io/pebbletemplates/pebble/cache/CacheKey.java similarity index 93% rename from pebble/src/main/java/io/pebbletemplates/cache/CacheKey.java rename to pebble/src/main/java/io/pebbletemplates/pebble/cache/CacheKey.java index 4e920bf58..b2ed94ca4 100644 --- a/pebble/src/main/java/io/pebbletemplates/cache/CacheKey.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/cache/CacheKey.java @@ -1,6 +1,7 @@ -package io.pebbletemplates.cache; +package io.pebbletemplates.pebble.cache; + +import io.pebbletemplates.pebble.node.CacheNode; -import io.pebbletemplates.node.CacheNode; import java.util.Locale; /** diff --git a/pebble/src/main/java/io/pebbletemplates/cache/PebbleCache.java b/pebble/src/main/java/io/pebbletemplates/pebble/cache/PebbleCache.java similarity index 81% rename from pebble/src/main/java/io/pebbletemplates/cache/PebbleCache.java rename to pebble/src/main/java/io/pebbletemplates/pebble/cache/PebbleCache.java index 8b17b2550..1ae31e881 100644 --- a/pebble/src/main/java/io/pebbletemplates/cache/PebbleCache.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/cache/PebbleCache.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.cache; +package io.pebbletemplates.pebble.cache; import java.util.function.Function; diff --git a/pebble/src/main/java/io/pebbletemplates/cache/tag/CaffeineTagCache.java b/pebble/src/main/java/io/pebbletemplates/pebble/cache/tag/CaffeineTagCache.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/cache/tag/CaffeineTagCache.java rename to pebble/src/main/java/io/pebbletemplates/pebble/cache/tag/CaffeineTagCache.java index 5d20cd3b7..e7540fe82 100644 --- a/pebble/src/main/java/io/pebbletemplates/cache/tag/CaffeineTagCache.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/cache/tag/CaffeineTagCache.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.cache.tag; +package io.pebbletemplates.pebble.cache.tag; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import io.pebbletemplates.cache.CacheKey; -import io.pebbletemplates.cache.PebbleCache; +import io.pebbletemplates.pebble.cache.CacheKey; +import io.pebbletemplates.pebble.cache.PebbleCache; import java.util.function.Function; diff --git a/pebble/src/main/java/io/pebbletemplates/cache/tag/ConcurrentMapTagCache.java b/pebble/src/main/java/io/pebbletemplates/pebble/cache/tag/ConcurrentMapTagCache.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/cache/tag/ConcurrentMapTagCache.java rename to pebble/src/main/java/io/pebbletemplates/pebble/cache/tag/ConcurrentMapTagCache.java index ed15f4ed0..08da91be8 100644 --- a/pebble/src/main/java/io/pebbletemplates/cache/tag/ConcurrentMapTagCache.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/cache/tag/ConcurrentMapTagCache.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.cache.tag; +package io.pebbletemplates.pebble.cache.tag; -import io.pebbletemplates.cache.CacheKey; -import io.pebbletemplates.cache.PebbleCache; +import io.pebbletemplates.pebble.cache.CacheKey; +import io.pebbletemplates.pebble.cache.PebbleCache; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/pebble/src/main/java/io/pebbletemplates/cache/tag/NoOpTagCache.java b/pebble/src/main/java/io/pebbletemplates/pebble/cache/tag/NoOpTagCache.java similarity index 68% rename from pebble/src/main/java/io/pebbletemplates/cache/tag/NoOpTagCache.java rename to pebble/src/main/java/io/pebbletemplates/pebble/cache/tag/NoOpTagCache.java index fd2aaa98c..54b90ae4c 100644 --- a/pebble/src/main/java/io/pebbletemplates/cache/tag/NoOpTagCache.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/cache/tag/NoOpTagCache.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.cache.tag; +package io.pebbletemplates.pebble.cache.tag; -import io.pebbletemplates.cache.CacheKey; -import io.pebbletemplates.cache.PebbleCache; +import io.pebbletemplates.pebble.cache.CacheKey; +import io.pebbletemplates.pebble.cache.PebbleCache; import java.util.function.Function; diff --git a/pebble/src/main/java/io/pebbletemplates/cache/template/CaffeineTemplateCache.java b/pebble/src/main/java/io/pebbletemplates/pebble/cache/template/CaffeineTemplateCache.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/cache/template/CaffeineTemplateCache.java rename to pebble/src/main/java/io/pebbletemplates/pebble/cache/template/CaffeineTemplateCache.java index 0584b4659..254ea60d4 100644 --- a/pebble/src/main/java/io/pebbletemplates/cache/template/CaffeineTemplateCache.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/cache/template/CaffeineTemplateCache.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.cache.template; +package io.pebbletemplates.pebble.cache.template; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import io.pebbletemplates.cache.PebbleCache; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.cache.PebbleCache; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.function.Function; diff --git a/pebble/src/main/java/io/pebbletemplates/cache/template/ConcurrentMapTemplateCache.java b/pebble/src/main/java/io/pebbletemplates/pebble/cache/template/ConcurrentMapTemplateCache.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/cache/template/ConcurrentMapTemplateCache.java rename to pebble/src/main/java/io/pebbletemplates/pebble/cache/template/ConcurrentMapTemplateCache.java index ebd72fe20..4c9a91943 100644 --- a/pebble/src/main/java/io/pebbletemplates/cache/template/ConcurrentMapTemplateCache.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/cache/template/ConcurrentMapTemplateCache.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.cache.template; +package io.pebbletemplates.pebble.cache.template; -import io.pebbletemplates.cache.PebbleCache; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.cache.PebbleCache; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/pebble/src/main/java/io/pebbletemplates/cache/template/NoOpTemplateCache.java b/pebble/src/main/java/io/pebbletemplates/pebble/cache/template/NoOpTemplateCache.java similarity index 68% rename from pebble/src/main/java/io/pebbletemplates/cache/template/NoOpTemplateCache.java rename to pebble/src/main/java/io/pebbletemplates/pebble/cache/template/NoOpTemplateCache.java index cc216aa4d..d4d4a8dbb 100644 --- a/pebble/src/main/java/io/pebbletemplates/cache/template/NoOpTemplateCache.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/cache/template/NoOpTemplateCache.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.cache.template; +package io.pebbletemplates.pebble.cache.template; -import io.pebbletemplates.cache.PebbleCache; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.cache.PebbleCache; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.function.Function; diff --git a/pebble/src/main/java/io/pebbletemplates/error/AttributeNotFoundException.java b/pebble/src/main/java/io/pebbletemplates/pebble/error/AttributeNotFoundException.java similarity index 94% rename from pebble/src/main/java/io/pebbletemplates/error/AttributeNotFoundException.java rename to pebble/src/main/java/io/pebbletemplates/pebble/error/AttributeNotFoundException.java index da783292d..5e2ea0f0f 100644 --- a/pebble/src/main/java/io/pebbletemplates/error/AttributeNotFoundException.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/error/AttributeNotFoundException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.error; +package io.pebbletemplates.pebble.error; public class AttributeNotFoundException extends PebbleException { diff --git a/pebble/src/main/java/io/pebbletemplates/error/ClassAccessException.java b/pebble/src/main/java/io/pebbletemplates/pebble/error/ClassAccessException.java similarity index 93% rename from pebble/src/main/java/io/pebbletemplates/error/ClassAccessException.java rename to pebble/src/main/java/io/pebbletemplates/pebble/error/ClassAccessException.java index 940197e07..83986be4d 100644 --- a/pebble/src/main/java/io/pebbletemplates/error/ClassAccessException.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/error/ClassAccessException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.error; +package io.pebbletemplates.pebble.error; import java.lang.reflect.Method; diff --git a/pebble/src/main/java/io/pebbletemplates/error/LoaderException.java b/pebble/src/main/java/io/pebbletemplates/pebble/error/LoaderException.java similarity index 91% rename from pebble/src/main/java/io/pebbletemplates/error/LoaderException.java rename to pebble/src/main/java/io/pebbletemplates/pebble/error/LoaderException.java index 95b062adf..33d156f4c 100644 --- a/pebble/src/main/java/io/pebbletemplates/error/LoaderException.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/error/LoaderException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.error; +package io.pebbletemplates.pebble.error; public class LoaderException extends PebbleException { diff --git a/pebble/src/main/java/io/pebbletemplates/error/ParserException.java b/pebble/src/main/java/io/pebbletemplates/pebble/error/ParserException.java similarity index 92% rename from pebble/src/main/java/io/pebbletemplates/error/ParserException.java rename to pebble/src/main/java/io/pebbletemplates/pebble/error/ParserException.java index d821f52b3..07f8a4fea 100644 --- a/pebble/src/main/java/io/pebbletemplates/error/ParserException.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/error/ParserException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.error; +package io.pebbletemplates.pebble.error; public class ParserException extends PebbleException { diff --git a/pebble/src/main/java/io/pebbletemplates/error/PebbleException.java b/pebble/src/main/java/io/pebbletemplates/pebble/error/PebbleException.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/error/PebbleException.java rename to pebble/src/main/java/io/pebbletemplates/pebble/error/PebbleException.java index c52dc3133..bd6874d5b 100644 --- a/pebble/src/main/java/io/pebbletemplates/error/PebbleException.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/error/PebbleException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.error; +package io.pebbletemplates.pebble.error; public class PebbleException extends RuntimeException { diff --git a/pebble/src/main/java/io/pebbletemplates/error/RootAttributeNotFoundException.java b/pebble/src/main/java/io/pebbletemplates/pebble/error/RootAttributeNotFoundException.java similarity index 93% rename from pebble/src/main/java/io/pebbletemplates/error/RootAttributeNotFoundException.java rename to pebble/src/main/java/io/pebbletemplates/pebble/error/RootAttributeNotFoundException.java index 30948b47b..1d3ec68df 100644 --- a/pebble/src/main/java/io/pebbletemplates/error/RootAttributeNotFoundException.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/error/RootAttributeNotFoundException.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.error; +package io.pebbletemplates.pebble.error; public class RootAttributeNotFoundException extends AttributeNotFoundException { diff --git a/pebble/src/main/java/io/pebbletemplates/extension/AbstractExtension.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/AbstractExtension.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/extension/AbstractExtension.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/AbstractExtension.java index a5190cb92..c299e1a4a 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/AbstractExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/AbstractExtension.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.attributes.AttributeResolver; -import io.pebbletemplates.operator.BinaryOperator; -import io.pebbletemplates.operator.UnaryOperator; -import io.pebbletemplates.tokenParser.TokenParser; +import io.pebbletemplates.pebble.attributes.AttributeResolver; +import io.pebbletemplates.pebble.operator.BinaryOperator; +import io.pebbletemplates.pebble.operator.UnaryOperator; +import io.pebbletemplates.pebble.tokenParser.TokenParser; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/AbstractNodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/AbstractNodeVisitor.java similarity index 72% rename from pebble/src/main/java/io/pebbletemplates/extension/AbstractNodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/AbstractNodeVisitor.java index 64a83622b..ec1491cfb 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/AbstractNodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/AbstractNodeVisitor.java @@ -6,30 +6,30 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; - -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.AutoEscapeNode; -import io.pebbletemplates.node.BlockNode; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.ExtendsNode; -import io.pebbletemplates.node.FlushNode; -import io.pebbletemplates.node.ForNode; -import io.pebbletemplates.node.IfNode; -import io.pebbletemplates.node.ImportNode; -import io.pebbletemplates.node.IncludeNode; -import io.pebbletemplates.node.MacroNode; -import io.pebbletemplates.node.NamedArgumentNode; -import io.pebbletemplates.node.Node; -import io.pebbletemplates.node.ParallelNode; -import io.pebbletemplates.node.PositionalArgumentNode; -import io.pebbletemplates.node.PrintNode; -import io.pebbletemplates.node.RootNode; -import io.pebbletemplates.node.SetNode; -import io.pebbletemplates.node.TextNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.Pair; +package io.pebbletemplates.pebble.extension; + +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.AutoEscapeNode; +import io.pebbletemplates.pebble.node.BlockNode; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.ExtendsNode; +import io.pebbletemplates.pebble.node.FlushNode; +import io.pebbletemplates.pebble.node.ForNode; +import io.pebbletemplates.pebble.node.IfNode; +import io.pebbletemplates.pebble.node.ImportNode; +import io.pebbletemplates.pebble.node.IncludeNode; +import io.pebbletemplates.pebble.node.MacroNode; +import io.pebbletemplates.pebble.node.NamedArgumentNode; +import io.pebbletemplates.pebble.node.Node; +import io.pebbletemplates.pebble.node.ParallelNode; +import io.pebbletemplates.pebble.node.PositionalArgumentNode; +import io.pebbletemplates.pebble.node.PrintNode; +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.node.SetNode; +import io.pebbletemplates.pebble.node.TextNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.Pair; /** * A base node visitor that can be extended for the sake of using it's navigational abilities. diff --git a/pebble/src/main/java/io/pebbletemplates/extension/Extension.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/Extension.java similarity index 87% rename from pebble/src/main/java/io/pebbletemplates/extension/Extension.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/Extension.java index 0c2075fa8..3a5dfcebf 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/Extension.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/Extension.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.attributes.AttributeResolver; -import io.pebbletemplates.operator.BinaryOperator; -import io.pebbletemplates.operator.UnaryOperator; -import io.pebbletemplates.tokenParser.TokenParser; +import io.pebbletemplates.pebble.attributes.AttributeResolver; +import io.pebbletemplates.pebble.operator.BinaryOperator; +import io.pebbletemplates.pebble.operator.UnaryOperator; +import io.pebbletemplates.pebble.tokenParser.TokenParser; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/ExtensionCustomizer.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/ExtensionCustomizer.java similarity index 84% rename from pebble/src/main/java/io/pebbletemplates/extension/ExtensionCustomizer.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/ExtensionCustomizer.java index 83d92175b..053d03723 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/ExtensionCustomizer.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/ExtensionCustomizer.java @@ -1,10 +1,10 @@ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.attributes.AttributeResolver; -import io.pebbletemplates.operator.BinaryOperator; -import io.pebbletemplates.operator.UnaryOperator; -import io.pebbletemplates.tokenParser.TokenParser; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.attributes.AttributeResolver; +import io.pebbletemplates.pebble.operator.BinaryOperator; +import io.pebbletemplates.pebble.operator.UnaryOperator; +import io.pebbletemplates.pebble.tokenParser.TokenParser; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistry.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/ExtensionRegistry.java similarity index 94% rename from pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistry.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/ExtensionRegistry.java index c6cd6f31d..99141b560 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistry.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/ExtensionRegistry.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.attributes.AttributeResolver; -import io.pebbletemplates.operator.BinaryOperator; -import io.pebbletemplates.operator.UnaryOperator; -import io.pebbletemplates.tokenParser.TokenParser; +import io.pebbletemplates.pebble.attributes.AttributeResolver; +import io.pebbletemplates.pebble.operator.BinaryOperator; +import io.pebbletemplates.pebble.operator.UnaryOperator; +import io.pebbletemplates.pebble.tokenParser.TokenParser; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistryFactory.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/ExtensionRegistryFactory.java similarity index 82% rename from pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistryFactory.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/ExtensionRegistryFactory.java index c07abad5f..253b798d8 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/ExtensionRegistryFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/ExtensionRegistryFactory.java @@ -1,11 +1,11 @@ -package io.pebbletemplates.extension; - -import io.pebbletemplates.extension.core.AttributeResolverExtension; -import io.pebbletemplates.extension.i18n.I18nExtension; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.extension.core.CoreExtension; -import io.pebbletemplates.extension.escaper.EscaperExtension; -import io.pebbletemplates.extension.escaper.EscapingStrategy; +package io.pebbletemplates.pebble.extension; + +import io.pebbletemplates.pebble.extension.core.AttributeResolverExtension; +import io.pebbletemplates.pebble.extension.i18n.I18nExtension; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.extension.core.CoreExtension; +import io.pebbletemplates.pebble.extension.escaper.EscaperExtension; +import io.pebbletemplates.pebble.extension.escaper.EscapingStrategy; import java.util.*; import java.util.function.Function; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/Filter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/Filter.java similarity index 60% rename from pebble/src/main/java/io/pebbletemplates/extension/Filter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/Filter.java index 3f5ca59ef..f8cc332dd 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/Filter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/Filter.java @@ -6,16 +6,17 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; public interface Filter extends NamedArguments { Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int + EvaluationContext context, int lineNumber) throws PebbleException; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/Function.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/Function.java similarity index 65% rename from pebble/src/main/java/io/pebbletemplates/extension/Function.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/Function.java index 0c71e623e..c321ccd06 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/Function.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/Function.java @@ -6,15 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; + +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; public interface Function extends NamedArguments { Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber); + int lineNumber); } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/NamedArguments.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/NamedArguments.java similarity index 87% rename from pebble/src/main/java/io/pebbletemplates/extension/NamedArguments.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/NamedArguments.java index 9b33af2b2..29877088c 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/NamedArguments.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/NamedArguments.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/NodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/NodeVisitor.java similarity index 59% rename from pebble/src/main/java/io/pebbletemplates/extension/NodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/NodeVisitor.java index dd8104288..6601f82c1 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/NodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/NodeVisitor.java @@ -6,27 +6,27 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; - -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.AutoEscapeNode; -import io.pebbletemplates.node.BlockNode; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.ExtendsNode; -import io.pebbletemplates.node.FlushNode; -import io.pebbletemplates.node.ForNode; -import io.pebbletemplates.node.IfNode; -import io.pebbletemplates.node.ImportNode; -import io.pebbletemplates.node.IncludeNode; -import io.pebbletemplates.node.MacroNode; -import io.pebbletemplates.node.NamedArgumentNode; -import io.pebbletemplates.node.Node; -import io.pebbletemplates.node.ParallelNode; -import io.pebbletemplates.node.PositionalArgumentNode; -import io.pebbletemplates.node.PrintNode; -import io.pebbletemplates.node.RootNode; -import io.pebbletemplates.node.SetNode; -import io.pebbletemplates.node.TextNode; +package io.pebbletemplates.pebble.extension; + +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.AutoEscapeNode; +import io.pebbletemplates.pebble.node.BlockNode; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.ExtendsNode; +import io.pebbletemplates.pebble.node.FlushNode; +import io.pebbletemplates.pebble.node.ForNode; +import io.pebbletemplates.pebble.node.IfNode; +import io.pebbletemplates.pebble.node.ImportNode; +import io.pebbletemplates.pebble.node.IncludeNode; +import io.pebbletemplates.pebble.node.MacroNode; +import io.pebbletemplates.pebble.node.NamedArgumentNode; +import io.pebbletemplates.pebble.node.Node; +import io.pebbletemplates.pebble.node.ParallelNode; +import io.pebbletemplates.pebble.node.PositionalArgumentNode; +import io.pebbletemplates.pebble.node.PrintNode; +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.node.SetNode; +import io.pebbletemplates.pebble.node.TextNode; /** * Will visit all the nodes of the AST provided by the parser. The NodeVisitor is responsible for diff --git a/pebble/src/main/java/io/pebbletemplates/extension/NodeVisitorFactory.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/NodeVisitorFactory.java similarity index 87% rename from pebble/src/main/java/io/pebbletemplates/extension/NodeVisitorFactory.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/NodeVisitorFactory.java index 65094f26a..66a1039d1 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/NodeVisitorFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/NodeVisitorFactory.java @@ -1,6 +1,6 @@ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplate; /** * The node visitor factory creates {@link NodeVisitor}s. diff --git a/pebble/src/main/java/io/pebbletemplates/extension/Test.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/Test.java similarity index 60% rename from pebble/src/main/java/io/pebbletemplates/extension/Test.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/Test.java index 8734e5f93..f29dd4b5f 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/Test.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/Test.java @@ -6,16 +6,17 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; public interface Test extends NamedArguments { boolean apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int + EvaluationContext context, int lineNumber) throws PebbleException; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/AbbreviateFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/AbbreviateFilter.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/extension/core/AbbreviateFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/AbbreviateFilter.java index c401afe28..5806ff90b 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/AbbreviateFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/AbbreviateFilter.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -31,7 +32,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/AbsFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/AbsFilter.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/extension/core/AbsFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/AbsFilter.java index 2ffbf2c08..27c50b3d0 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/AbsFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/AbsFilter.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.math.BigDecimal; import java.math.BigInteger; import java.util.List; @@ -26,7 +27,7 @@ public List getArgumentNames() { @Override public Number apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { throw new PebbleException(null, "Can not pass null value to \"abs\" filter.", lineNumber, diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/AttributeResolverExtension.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/AttributeResolverExtension.java similarity index 59% rename from pebble/src/main/java/io/pebbletemplates/extension/core/AttributeResolverExtension.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/AttributeResolverExtension.java index 87030fc3f..99d22b223 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/AttributeResolverExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/AttributeResolverExtension.java @@ -1,8 +1,9 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.attributes.AttributeResolver; +import io.pebbletemplates.pebble.attributes.DefaultAttributeResolver; +import io.pebbletemplates.pebble.extension.AbstractExtension; -import io.pebbletemplates.attributes.AttributeResolver; -import io.pebbletemplates.attributes.DefaultAttributeResolver; -import io.pebbletemplates.extension.AbstractExtension; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/Base64DecoderFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/Base64DecoderFilter.java similarity index 75% rename from pebble/src/main/java/io/pebbletemplates/extension/core/Base64DecoderFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/Base64DecoderFilter.java index 26a72f79b..726e00e03 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/Base64DecoderFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/Base64DecoderFilter.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -26,7 +26,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/Base64EncoderFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/Base64EncoderFilter.java similarity index 63% rename from pebble/src/main/java/io/pebbletemplates/extension/core/Base64EncoderFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/Base64EncoderFilter.java index bf4ad0d67..f6e9ecba9 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/Base64EncoderFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/Base64EncoderFilter.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -26,7 +26,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/CapitalizeFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/CapitalizeFilter.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/extension/core/CapitalizeFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/CapitalizeFilter.java index e07d253c5..7c1f0b9da 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/CapitalizeFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/CapitalizeFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -24,7 +25,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/CoreExtension.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/CoreExtension.java similarity index 56% rename from pebble/src/main/java/io/pebbletemplates/extension/core/CoreExtension.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/CoreExtension.java index 2ebbfb12e..252811349 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/CoreExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/CoreExtension.java @@ -6,59 +6,56 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import static io.pebbletemplates.operator.BinaryOperatorType.FILTER; -import static io.pebbletemplates.operator.BinaryOperatorType.NORMAL; -import static io.pebbletemplates.operator.BinaryOperatorType.TEST; - -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.extension.NodeVisitorFactory; -import io.pebbletemplates.extension.Test; -import io.pebbletemplates.node.expression.AddExpression; -import io.pebbletemplates.node.expression.AndExpression; -import io.pebbletemplates.node.expression.ConcatenateExpression; -import io.pebbletemplates.node.expression.ContainsExpression; -import io.pebbletemplates.node.expression.DivideExpression; -import io.pebbletemplates.node.expression.EqualsExpression; -import io.pebbletemplates.node.expression.FilterExpression; -import io.pebbletemplates.node.expression.GreaterThanEqualsExpression; -import io.pebbletemplates.node.expression.GreaterThanExpression; -import io.pebbletemplates.node.expression.LessThanEqualsExpression; -import io.pebbletemplates.node.expression.LessThanExpression; -import io.pebbletemplates.node.expression.ModulusExpression; -import io.pebbletemplates.node.expression.MultiplyExpression; -import io.pebbletemplates.node.expression.NegativeTestExpression; -import io.pebbletemplates.node.expression.NotEqualsExpression; -import io.pebbletemplates.node.expression.OrExpression; -import io.pebbletemplates.node.expression.PositiveTestExpression; -import io.pebbletemplates.node.expression.RangeExpression; -import io.pebbletemplates.node.expression.SubtractExpression; -import io.pebbletemplates.node.expression.UnaryMinusExpression; -import io.pebbletemplates.node.expression.UnaryNotExpression; -import io.pebbletemplates.node.expression.UnaryPlusExpression; -import io.pebbletemplates.operator.Associativity; -import io.pebbletemplates.operator.BinaryOperator; -import io.pebbletemplates.operator.BinaryOperatorImpl; -import io.pebbletemplates.operator.UnaryOperator; -import io.pebbletemplates.operator.UnaryOperatorImpl; -import io.pebbletemplates.tokenParser.BlockTokenParser; -import io.pebbletemplates.tokenParser.CacheTokenParser; -import io.pebbletemplates.tokenParser.EmbedTokenParser; -import io.pebbletemplates.tokenParser.ExtendsTokenParser; -import io.pebbletemplates.tokenParser.FilterTokenParser; -import io.pebbletemplates.tokenParser.FlushTokenParser; -import io.pebbletemplates.tokenParser.ForTokenParser; -import io.pebbletemplates.tokenParser.FromTokenParser; -import io.pebbletemplates.tokenParser.IfTokenParser; -import io.pebbletemplates.tokenParser.ImportTokenParser; -import io.pebbletemplates.tokenParser.IncludeTokenParser; -import io.pebbletemplates.tokenParser.MacroTokenParser; -import io.pebbletemplates.tokenParser.ParallelTokenParser; -import io.pebbletemplates.tokenParser.SetTokenParser; -import io.pebbletemplates.tokenParser.TokenParser; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.extension.NodeVisitorFactory; +import io.pebbletemplates.pebble.extension.Test; +import io.pebbletemplates.pebble.node.expression.AddExpression; +import io.pebbletemplates.pebble.node.expression.AndExpression; +import io.pebbletemplates.pebble.node.expression.ConcatenateExpression; +import io.pebbletemplates.pebble.node.expression.ContainsExpression; +import io.pebbletemplates.pebble.node.expression.DivideExpression; +import io.pebbletemplates.pebble.node.expression.EqualsExpression; +import io.pebbletemplates.pebble.node.expression.FilterExpression; +import io.pebbletemplates.pebble.node.expression.GreaterThanEqualsExpression; +import io.pebbletemplates.pebble.node.expression.GreaterThanExpression; +import io.pebbletemplates.pebble.node.expression.LessThanEqualsExpression; +import io.pebbletemplates.pebble.node.expression.LessThanExpression; +import io.pebbletemplates.pebble.node.expression.ModulusExpression; +import io.pebbletemplates.pebble.node.expression.MultiplyExpression; +import io.pebbletemplates.pebble.node.expression.NegativeTestExpression; +import io.pebbletemplates.pebble.node.expression.NotEqualsExpression; +import io.pebbletemplates.pebble.node.expression.OrExpression; +import io.pebbletemplates.pebble.node.expression.PositiveTestExpression; +import io.pebbletemplates.pebble.node.expression.RangeExpression; +import io.pebbletemplates.pebble.node.expression.SubtractExpression; +import io.pebbletemplates.pebble.node.expression.UnaryMinusExpression; +import io.pebbletemplates.pebble.node.expression.UnaryNotExpression; +import io.pebbletemplates.pebble.node.expression.UnaryPlusExpression; +import io.pebbletemplates.pebble.operator.Associativity; +import io.pebbletemplates.pebble.operator.BinaryOperator; +import io.pebbletemplates.pebble.operator.BinaryOperatorImpl; +import io.pebbletemplates.pebble.operator.UnaryOperator; +import io.pebbletemplates.pebble.operator.UnaryOperatorImpl; +import io.pebbletemplates.pebble.operator.*; +import io.pebbletemplates.pebble.tokenParser.BlockTokenParser; +import io.pebbletemplates.pebble.tokenParser.CacheTokenParser; +import io.pebbletemplates.pebble.tokenParser.EmbedTokenParser; +import io.pebbletemplates.pebble.tokenParser.ExtendsTokenParser; +import io.pebbletemplates.pebble.tokenParser.FilterTokenParser; +import io.pebbletemplates.pebble.tokenParser.FlushTokenParser; +import io.pebbletemplates.pebble.tokenParser.ForTokenParser; +import io.pebbletemplates.pebble.tokenParser.FromTokenParser; +import io.pebbletemplates.pebble.tokenParser.IfTokenParser; +import io.pebbletemplates.pebble.tokenParser.ImportTokenParser; +import io.pebbletemplates.pebble.tokenParser.IncludeTokenParser; +import io.pebbletemplates.pebble.tokenParser.MacroTokenParser; +import io.pebbletemplates.pebble.tokenParser.ParallelTokenParser; +import io.pebbletemplates.pebble.tokenParser.SetTokenParser; +import io.pebbletemplates.pebble.tokenParser.TokenParser; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -100,26 +97,26 @@ public List getUnaryOperators() { @Override public List getBinaryOperators() { List operators = new ArrayList<>(); - operators.add(new BinaryOperatorImpl("or", 10, OrExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("and", 15, AndExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("is", 20, PositiveTestExpression::new, TEST, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("is not", 20, NegativeTestExpression::new, TEST, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("contains", 20, ContainsExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("==", 30, EqualsExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("equals", 30, EqualsExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("!=", 30, NotEqualsExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl(">", 30, GreaterThanExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("<", 30, LessThanExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl(">=", 30, GreaterThanEqualsExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("<=", 30, LessThanEqualsExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("+", 40, AddExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("-", 40, SubtractExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("*", 60, MultiplyExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("/", 60, DivideExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("%", 60, ModulusExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("|", 100, FilterExpression::new, FILTER, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("~", 110, ConcatenateExpression::new, NORMAL, Associativity.LEFT)); - operators.add(new BinaryOperatorImpl("..", 120, RangeExpression::new, NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("or", 10, OrExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("and", 15, AndExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("is", 20, PositiveTestExpression::new, BinaryOperatorType.TEST, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("is not", 20, NegativeTestExpression::new, BinaryOperatorType.TEST, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("contains", 20, ContainsExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("==", 30, EqualsExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("equals", 30, EqualsExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("!=", 30, NotEqualsExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl(">", 30, GreaterThanExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("<", 30, LessThanExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl(">=", 30, GreaterThanEqualsExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("<=", 30, LessThanEqualsExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("+", 40, AddExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("-", 40, SubtractExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("*", 60, MultiplyExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("/", 60, DivideExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("%", 60, ModulusExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("|", 100, FilterExpression::new, BinaryOperatorType.FILTER, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("~", 110, ConcatenateExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); + operators.add(new BinaryOperatorImpl("..", 120, RangeExpression::new, BinaryOperatorType.NORMAL, Associativity.LEFT)); return operators; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/DateFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/DateFilter.java similarity index 90% rename from pebble/src/main/java/io/pebbletemplates/extension/core/DateFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/DateFilter.java index 56d3090df..d742fd908 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/DateFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/DateFilter.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.extension.escaper.SafeString; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.extension.escaper.SafeString; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.text.DateFormat; import java.text.ParseException; @@ -43,7 +43,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/DefaultFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/DefaultFilter.java similarity index 68% rename from pebble/src/main/java/io/pebbletemplates/extension/core/DefaultFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/DefaultFilter.java index cf41eaffa..d9e9849fe 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/DefaultFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/DefaultFilter.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.extension.Test; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.extension.Test; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -33,7 +34,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { Object defaultObj = args.get("default"); diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/DefinedTest.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/DefinedTest.java similarity index 67% rename from pebble/src/main/java/io/pebbletemplates/extension/core/DefinedTest.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/DefinedTest.java index 56653a424..984ba1645 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/DefinedTest.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/DefinedTest.java @@ -1,7 +1,8 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.Map; /** @@ -16,7 +17,7 @@ public class DefinedTest extends NullTest { @Override public boolean apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int + EvaluationContext context, int lineNumber) { return !super.apply(input, args, self, context, lineNumber); } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/EmptyTest.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/EmptyTest.java similarity index 76% rename from pebble/src/main/java/io/pebbletemplates/extension/core/EmptyTest.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/EmptyTest.java index 22a7dd3a1..933c04702 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/EmptyTest.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/EmptyTest.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Test; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Test; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.Collection; import java.util.List; import java.util.Map; @@ -24,7 +25,7 @@ public List getArgumentNames() { @Override public boolean apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { boolean isEmpty = input == null; if (!isEmpty && input instanceof String) { diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/EvenTest.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/EvenTest.java similarity index 67% rename from pebble/src/main/java/io/pebbletemplates/extension/core/EvenTest.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/EvenTest.java index 68fddab6a..b6934cf90 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/EvenTest.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/EvenTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.extension.Test; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.Test; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -25,7 +25,7 @@ public List getArgumentNames() { @Override public boolean apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { throw new PebbleException(null, "Can not pass null value to \"even\" test.", lineNumber, self.getName()); diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/FirstFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/FirstFilter.java similarity index 80% rename from pebble/src/main/java/io/pebbletemplates/extension/core/FirstFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/FirstFilter.java index 89bbdc401..c927392e0 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/FirstFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/FirstFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.Collection; import java.util.Iterator; @@ -31,7 +32,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/IterableTest.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/IterableTest.java similarity index 65% rename from pebble/src/main/java/io/pebbletemplates/extension/core/IterableTest.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/IterableTest.java index e79db4482..56ea427a2 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/IterableTest.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/IterableTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.extension.Test; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.Test; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -24,7 +24,7 @@ public List getArgumentNames() { @Override public boolean apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { return input instanceof Iterable || input instanceof Object[]; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/JoinFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/JoinFilter.java similarity index 85% rename from pebble/src/main/java/io/pebbletemplates/extension/core/JoinFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/JoinFilter.java index 58c3db87b..178d1bdbd 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/JoinFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/JoinFilter.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Collection; @@ -39,7 +40,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { return null; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/LastFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/LastFilter.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/extension/core/LastFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/LastFilter.java index 4e812bcf2..21f96db53 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/LastFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/LastFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.Collection; import java.util.List; @@ -30,7 +31,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/LengthFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/LengthFilter.java similarity index 81% rename from pebble/src/main/java/io/pebbletemplates/extension/core/LengthFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/LengthFilter.java index 4adad1c06..4932c9ebe 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/LengthFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/LengthFilter.java @@ -1,8 +1,9 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.Collection; import java.util.Iterator; @@ -18,7 +19,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int + EvaluationContext context, int lineNumber) { if (input == null) { return 0; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/LowerFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/LowerFilter.java similarity index 71% rename from pebble/src/main/java/io/pebbletemplates/extension/core/LowerFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/LowerFilter.java index a9e3b4427..0ab7b6af0 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/LowerFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/LowerFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -23,7 +24,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MacroAndBlockRegistrantNodeVisitor.java similarity index 69% rename from pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MacroAndBlockRegistrantNodeVisitor.java index 7d657ca7f..e183c3981 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MacroAndBlockRegistrantNodeVisitor.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.AbstractNodeVisitor; -import io.pebbletemplates.node.BlockNode; -import io.pebbletemplates.node.MacroNode; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.AbstractNodeVisitor; +import io.pebbletemplates.pebble.node.BlockNode; +import io.pebbletemplates.pebble.node.MacroNode; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class MacroAndBlockRegistrantNodeVisitor extends AbstractNodeVisitor { diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java similarity index 57% rename from pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java index bc6463e71..376ea2fed 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MacroAndBlockRegistrantNodeVisitorFactory.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.extension.NodeVisitorFactory; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.extension.NodeVisitorFactory; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; /** * Implementation of {@link NodeVisitorFactory} to handle {@link MacroAndBlockRegistrantNodeVisitor}. diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/MapTest.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MapTest.java similarity index 64% rename from pebble/src/main/java/io/pebbletemplates/extension/core/MapTest.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MapTest.java index 76248e1ab..ae67c4ac9 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/MapTest.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MapTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.extension.Test; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.Test; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -24,7 +24,7 @@ public List getArgumentNames() { @Override public boolean apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { return input instanceof Map; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/MaxFunction.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MaxFunction.java similarity index 72% rename from pebble/src/main/java/io/pebbletemplates/extension/core/MaxFunction.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MaxFunction.java index f37c47ac2..0157ff287 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/MaxFunction.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MaxFunction.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.utils.OperatorUtils; import java.util.List; import java.util.Map; @@ -24,7 +24,7 @@ public List getArgumentNames() { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { Object min = null; int i = 0; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/MergeFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MergeFilter.java similarity index 91% rename from pebble/src/main/java/io/pebbletemplates/extension/core/MergeFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MergeFilter.java index f25a27c55..df37ba6fe 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/MergeFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MergeFilter.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.HashMap; @@ -35,7 +36,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { Object items = args.get("items"); if (input == null) { if (items == null) { diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/MinFunction.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MinFunction.java similarity index 72% rename from pebble/src/main/java/io/pebbletemplates/extension/core/MinFunction.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MinFunction.java index 97cb9b708..3473af466 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/MinFunction.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/MinFunction.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.utils.OperatorUtils; import java.util.List; import java.util.Map; @@ -24,7 +24,7 @@ public List getArgumentNames() { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { Object min = null; int i = 0; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/NullTest.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/NullTest.java similarity index 65% rename from pebble/src/main/java/io/pebbletemplates/extension/core/NullTest.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/NullTest.java index e7b701f94..573af93b6 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/NullTest.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/NullTest.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Test; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Test; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -23,7 +24,7 @@ public List getArgumentNames() { @Override public boolean apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int + EvaluationContext context, int lineNumber) { return input == null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/NumberFormatFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/NumberFormatFilter.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/extension/core/NumberFormatFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/NumberFormatFilter.java index 56cc65404..1fecc1d34 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/NumberFormatFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/NumberFormatFilter.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.Format; @@ -36,7 +37,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/OddTest.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/OddTest.java similarity index 65% rename from pebble/src/main/java/io/pebbletemplates/extension/core/OddTest.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/OddTest.java index c8e2daf66..4ce2b0d97 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/OddTest.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/OddTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.extension.Test; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.Test; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -25,7 +25,7 @@ public List getArgumentNames() { @Override public boolean apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { throw new IllegalArgumentException("Can not pass null value to \"odd\" test."); } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/RangeFunction.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/RangeFunction.java similarity index 90% rename from pebble/src/main/java/io/pebbletemplates/extension/core/RangeFunction.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/RangeFunction.java index baa594b4e..56de8f6dd 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/RangeFunction.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/RangeFunction.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -41,7 +42,7 @@ public RangeFunction() { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) throws PebbleException { + int lineNumber) throws PebbleException { Object start = args.get(PARAM_START); Object end = args.get(PARAM_END); Object increment = args.get(PARAM_INCREMENT); diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/ReplaceFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/ReplaceFilter.java similarity index 75% rename from pebble/src/main/java/io/pebbletemplates/extension/core/ReplaceFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/ReplaceFilter.java index f17ac4e6c..f3863563a 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/ReplaceFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/ReplaceFilter.java @@ -1,9 +1,10 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.text.MessageFormat; import java.util.Collections; import java.util.List; @@ -30,7 +31,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { String data = input.toString(); if (args.get(ARGUMENT_NAME) == null) { throw new PebbleException(null, diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/ReverseFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/ReverseFilter.java similarity index 66% rename from pebble/src/main/java/io/pebbletemplates/extension/core/ReverseFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/ReverseFilter.java index 1eb87100e..d771d7c5a 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/ReverseFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/ReverseFilter.java @@ -1,8 +1,9 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.Collections; import java.util.List; import java.util.Map; @@ -22,7 +23,7 @@ public List getArgumentNames() { @SuppressWarnings({"rawtypes", "unchecked"}) @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/RsortFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/RsortFilter.java similarity index 73% rename from pebble/src/main/java/io/pebbletemplates/extension/core/RsortFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/RsortFilter.java index b8687f096..9601ddb52 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/RsortFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/RsortFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.Collections; import java.util.List; import java.util.Map; @@ -30,7 +31,7 @@ public List getArgumentNames() { @SuppressWarnings({"rawtypes", "unchecked"}) @Override public List apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/Sha256Filter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/Sha256Filter.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/extension/core/Sha256Filter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/Sha256Filter.java index a94df9d22..681c0a3d1 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/Sha256Filter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/Sha256Filter.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -26,7 +26,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/SliceFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/SliceFilter.java similarity index 91% rename from pebble/src/main/java/io/pebbletemplates/extension/core/SliceFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/SliceFilter.java index efb24e603..4a2ecd87b 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/SliceFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/SliceFilter.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; @@ -34,7 +35,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { return null; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/SortFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/SortFilter.java similarity index 74% rename from pebble/src/main/java/io/pebbletemplates/extension/core/SortFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/SortFilter.java index dd4a4ae9a..efe332a10 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/SortFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/SortFilter.java @@ -6,12 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -27,7 +28,7 @@ public List getArgumentNames() { @SuppressWarnings({"rawtypes", "unchecked"}) @Override public List apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/SplitFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/SplitFilter.java similarity index 76% rename from pebble/src/main/java/io/pebbletemplates/extension/core/SplitFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/SplitFilter.java index 37324c7ed..3d774e8c9 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/SplitFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/SplitFilter.java @@ -1,9 +1,10 @@ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -23,7 +24,7 @@ public SplitFilter() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) throws PebbleException { + EvaluationContext context, int lineNumber) throws PebbleException { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/TitleFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/TitleFilter.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/extension/core/TitleFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/TitleFilter.java index dfa02928a..e48d3d4fd 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/TitleFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/TitleFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -23,7 +24,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/TrimFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/TrimFilter.java similarity index 67% rename from pebble/src/main/java/io/pebbletemplates/extension/core/TrimFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/TrimFilter.java index 4ccd1a8b9..c2f06eb00 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/TrimFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/TrimFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -23,7 +24,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/UpperFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/UpperFilter.java similarity index 71% rename from pebble/src/main/java/io/pebbletemplates/extension/core/UpperFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/UpperFilter.java index 757e0984c..e57d7d1cd 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/UpperFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/UpperFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.util.List; import java.util.Map; @@ -23,7 +24,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/core/UrlEncoderFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/UrlEncoderFilter.java similarity index 72% rename from pebble/src/main/java/io/pebbletemplates/extension/core/UrlEncoderFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/core/UrlEncoderFilter.java index f1b1065bc..6863d85ac 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/core/UrlEncoderFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/core/UrlEncoderFilter.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.core; +package io.pebbletemplates.pebble.extension.core; + +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.List; @@ -25,7 +26,7 @@ public List getArgumentNames() { @Override public Object apply(Object input, Map args, PebbleTemplate self, - EvaluationContext context, int lineNumber) { + EvaluationContext context, int lineNumber) { if (input == null) { return null; } diff --git a/pebble/src/main/java/io/pebbletemplates/extension/debug/DebugExtension.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/debug/DebugExtension.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/extension/debug/DebugExtension.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/debug/DebugExtension.java index c64c013ef..e9f90d30f 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/debug/DebugExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/debug/DebugExtension.java @@ -6,10 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.debug; +package io.pebbletemplates.pebble.extension.debug; + +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.NodeVisitorFactory; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.NodeVisitorFactory; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/debug/PrettyPrintNodeVisitor.java similarity index 74% rename from pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/debug/PrettyPrintNodeVisitor.java index 7a46f3f33..60b4e751d 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/debug/PrettyPrintNodeVisitor.java @@ -6,34 +6,34 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.debug; - -import io.pebbletemplates.extension.AbstractNodeVisitor; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.BlockNode; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.FlushNode; -import io.pebbletemplates.node.ForNode; -import io.pebbletemplates.node.IfNode; -import io.pebbletemplates.node.ImportNode; -import io.pebbletemplates.node.IncludeNode; -import io.pebbletemplates.node.NamedArgumentNode; -import io.pebbletemplates.node.Node; -import io.pebbletemplates.node.ParallelNode; -import io.pebbletemplates.node.PrintNode; -import io.pebbletemplates.node.RootNode; -import io.pebbletemplates.node.SetNode; -import io.pebbletemplates.node.TestInvocationExpression; -import io.pebbletemplates.node.TextNode; -import io.pebbletemplates.node.expression.BinaryExpression; -import io.pebbletemplates.node.expression.ContextVariableExpression; -import io.pebbletemplates.node.expression.FilterInvocationExpression; -import io.pebbletemplates.node.expression.FunctionOrMacroInvocationExpression; -import io.pebbletemplates.node.expression.GetAttributeExpression; -import io.pebbletemplates.node.expression.ParentFunctionExpression; -import io.pebbletemplates.node.expression.TernaryExpression; -import io.pebbletemplates.node.expression.UnaryExpression; -import io.pebbletemplates.template.PebbleTemplateImpl; +package io.pebbletemplates.pebble.extension.debug; + +import io.pebbletemplates.pebble.extension.AbstractNodeVisitor; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.BlockNode; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.FlushNode; +import io.pebbletemplates.pebble.node.ForNode; +import io.pebbletemplates.pebble.node.IfNode; +import io.pebbletemplates.pebble.node.ImportNode; +import io.pebbletemplates.pebble.node.IncludeNode; +import io.pebbletemplates.pebble.node.NamedArgumentNode; +import io.pebbletemplates.pebble.node.Node; +import io.pebbletemplates.pebble.node.ParallelNode; +import io.pebbletemplates.pebble.node.PrintNode; +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.node.SetNode; +import io.pebbletemplates.pebble.node.TestInvocationExpression; +import io.pebbletemplates.pebble.node.TextNode; +import io.pebbletemplates.pebble.node.expression.BinaryExpression; +import io.pebbletemplates.pebble.node.expression.ContextVariableExpression; +import io.pebbletemplates.pebble.node.expression.FilterInvocationExpression; +import io.pebbletemplates.pebble.node.expression.FunctionOrMacroInvocationExpression; +import io.pebbletemplates.pebble.node.expression.GetAttributeExpression; +import io.pebbletemplates.pebble.node.expression.ParentFunctionExpression; +import io.pebbletemplates.pebble.node.expression.TernaryExpression; +import io.pebbletemplates.pebble.node.expression.UnaryExpression; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class PrettyPrintNodeVisitor extends AbstractNodeVisitor { diff --git a/pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitorFactory.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/debug/PrettyPrintNodeVisitorFactory.java similarity index 52% rename from pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitorFactory.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/debug/PrettyPrintNodeVisitorFactory.java index 0c9002dca..0f89dfed0 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/debug/PrettyPrintNodeVisitorFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/debug/PrettyPrintNodeVisitorFactory.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.extension.debug; +package io.pebbletemplates.pebble.extension.debug; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.extension.NodeVisitorFactory; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.extension.NodeVisitorFactory; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; /** * Implementation of {@link NodeVisitorFactory} to create {@link PrettyPrintNodeVisitor}. diff --git a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapeFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscapeFilter.java similarity index 89% rename from pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapeFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscapeFilter.java index e66132cdd..8f24c9e35 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapeFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscapeFilter.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.escaper; +package io.pebbletemplates.pebble.extension.escaper; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.utils.StringUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.utils.StringUtils; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperExtension.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscaperExtension.java similarity index 85% rename from pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperExtension.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscaperExtension.java index 5909b4775..797eb308f 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscaperExtension.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.escaper; +package io.pebbletemplates.pebble.extension.escaper; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.extension.NodeVisitorFactory; -import io.pebbletemplates.tokenParser.AutoEscapeTokenParser; -import io.pebbletemplates.tokenParser.TokenParser; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.extension.NodeVisitorFactory; +import io.pebbletemplates.pebble.tokenParser.AutoEscapeTokenParser; +import io.pebbletemplates.pebble.tokenParser.TokenParser; import java.util.ArrayList; import java.util.HashMap; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitor.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscaperNodeVisitor.java similarity index 80% rename from pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitor.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscaperNodeVisitor.java index b0122a765..e409b4699 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitor.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscaperNodeVisitor.java @@ -6,22 +6,22 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.escaper; - -import io.pebbletemplates.extension.AbstractNodeVisitor; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.AutoEscapeNode; -import io.pebbletemplates.node.NamedArgumentNode; -import io.pebbletemplates.node.PrintNode; -import io.pebbletemplates.node.expression.BlockFunctionExpression; -import io.pebbletemplates.node.expression.ConcatenateExpression; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.node.expression.FilterExpression; -import io.pebbletemplates.node.expression.FilterInvocationExpression; -import io.pebbletemplates.node.expression.LiteralStringExpression; -import io.pebbletemplates.node.expression.ParentFunctionExpression; -import io.pebbletemplates.node.expression.TernaryExpression; -import io.pebbletemplates.template.PebbleTemplateImpl; +package io.pebbletemplates.pebble.extension.escaper; + +import io.pebbletemplates.pebble.extension.AbstractNodeVisitor; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.AutoEscapeNode; +import io.pebbletemplates.pebble.node.NamedArgumentNode; +import io.pebbletemplates.pebble.node.PrintNode; +import io.pebbletemplates.pebble.node.expression.BlockFunctionExpression; +import io.pebbletemplates.pebble.node.expression.ConcatenateExpression; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.node.expression.FilterExpression; +import io.pebbletemplates.pebble.node.expression.FilterInvocationExpression; +import io.pebbletemplates.pebble.node.expression.LiteralStringExpression; +import io.pebbletemplates.pebble.node.expression.ParentFunctionExpression; +import io.pebbletemplates.pebble.node.expression.TernaryExpression; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.ArrayList; import java.util.LinkedList; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitorFactory.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscaperNodeVisitorFactory.java similarity index 60% rename from pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitorFactory.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscaperNodeVisitorFactory.java index c02da8de6..47cb5200a 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscaperNodeVisitorFactory.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscaperNodeVisitorFactory.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.extension.escaper; +package io.pebbletemplates.pebble.extension.escaper; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.extension.NodeVisitorFactory; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.extension.NodeVisitorFactory; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; /** * Factory class for creating {@link EscaperNodeVisitor}. diff --git a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapingStrategy.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscapingStrategy.java similarity index 57% rename from pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapingStrategy.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscapingStrategy.java index 3efffb50f..b363c1c60 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/escaper/EscapingStrategy.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/EscapingStrategy.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.extension.escaper; +package io.pebbletemplates.pebble.extension.escaper; public interface EscapingStrategy { diff --git a/pebble/src/main/java/io/pebbletemplates/extension/escaper/RawFilter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/RawFilter.java similarity index 73% rename from pebble/src/main/java/io/pebbletemplates/extension/escaper/RawFilter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/RawFilter.java index 018564c1c..af83c84d4 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/escaper/RawFilter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/RawFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.escaper; +package io.pebbletemplates.pebble.extension.escaper; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/escaper/SafeString.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/SafeString.java similarity index 92% rename from pebble/src/main/java/io/pebbletemplates/extension/escaper/SafeString.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/SafeString.java index c2a898eba..23425a08f 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/escaper/SafeString.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/escaper/SafeString.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.extension.escaper; +package io.pebbletemplates.pebble.extension.escaper; /** * Wrap a string in this to mark the string as safe to ignore by the Escape extension. diff --git a/pebble/src/main/java/io/pebbletemplates/extension/i18n/I18nExtension.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/i18n/I18nExtension.java similarity index 75% rename from pebble/src/main/java/io/pebbletemplates/extension/i18n/I18nExtension.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/i18n/I18nExtension.java index b9126e646..1ab1b3cd2 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/i18n/I18nExtension.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/i18n/I18nExtension.java @@ -6,10 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.i18n; +package io.pebbletemplates.pebble.extension.i18n; + +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Function; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Function; import java.util.HashMap; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/i18n/UTF8Control.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/i18n/UTF8Control.java similarity index 96% rename from pebble/src/main/java/io/pebbletemplates/extension/i18n/UTF8Control.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/i18n/UTF8Control.java index 213ebfa3b..db7c9405d 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/i18n/UTF8Control.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/i18n/UTF8Control.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.extension.i18n; +package io.pebbletemplates.pebble.extension.i18n; import java.io.IOException; import java.io.InputStream; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/i18n/i18nFunction.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/i18n/i18nFunction.java similarity index 84% rename from pebble/src/main/java/io/pebbletemplates/extension/i18n/i18nFunction.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/i18n/i18nFunction.java index 308031e57..1e407366a 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/i18n/i18nFunction.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/i18n/i18nFunction.java @@ -6,11 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension.i18n; +package io.pebbletemplates.pebble.extension.i18n; + +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -35,7 +36,7 @@ public List getArgumentNames() { @Override public Object execute(Map args, PebbleTemplate self, EvaluationContext context, - int lineNumber) { + int lineNumber) { String basename = (String) args.get("bundle"); String key = (String) args.get("key"); Object params = args.get("params"); diff --git a/pebble/src/main/java/io/pebbletemplates/extension/writer/PooledSpecializedStringWriter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/writer/PooledSpecializedStringWriter.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/extension/writer/PooledSpecializedStringWriter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/writer/PooledSpecializedStringWriter.java index 97b188b9f..99fd8d37a 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/writer/PooledSpecializedStringWriter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/writer/PooledSpecializedStringWriter.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.extension.writer; +package io.pebbletemplates.pebble.extension.writer; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/writer/SpecializedWriter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/writer/SpecializedWriter.java similarity index 96% rename from pebble/src/main/java/io/pebbletemplates/extension/writer/SpecializedWriter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/writer/SpecializedWriter.java index 8cdf7ecce..760e91968 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/writer/SpecializedWriter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/writer/SpecializedWriter.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.extension.writer; +package io.pebbletemplates.pebble.extension.writer; import java.math.BigDecimal; diff --git a/pebble/src/main/java/io/pebbletemplates/extension/writer/StringWriterSpecializedAdapter.java b/pebble/src/main/java/io/pebbletemplates/pebble/extension/writer/StringWriterSpecializedAdapter.java similarity index 95% rename from pebble/src/main/java/io/pebbletemplates/extension/writer/StringWriterSpecializedAdapter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/extension/writer/StringWriterSpecializedAdapter.java index 57e2e7f26..3c9c29ea3 100644 --- a/pebble/src/main/java/io/pebbletemplates/extension/writer/StringWriterSpecializedAdapter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/extension/writer/StringWriterSpecializedAdapter.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.extension.writer; +package io.pebbletemplates.pebble.extension.writer; import java.io.StringWriter; diff --git a/pebble/src/main/java/io/pebbletemplates/lexer/Lexer.java b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/Lexer.java similarity index 88% rename from pebble/src/main/java/io/pebbletemplates/lexer/Lexer.java rename to pebble/src/main/java/io/pebbletemplates/pebble/lexer/Lexer.java index d732af3f7..172c59baa 100644 --- a/pebble/src/main/java/io/pebbletemplates/lexer/Lexer.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/Lexer.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.lexer; +package io.pebbletemplates.pebble.lexer; import java.io.Reader; diff --git a/pebble/src/main/java/io/pebbletemplates/lexer/LexerImpl.java b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/LexerImpl.java similarity index 98% rename from pebble/src/main/java/io/pebbletemplates/lexer/LexerImpl.java rename to pebble/src/main/java/io/pebbletemplates/pebble/lexer/LexerImpl.java index f59920180..4f2789682 100644 --- a/pebble/src/main/java/io/pebbletemplates/lexer/LexerImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/LexerImpl.java @@ -3,15 +3,15 @@ * copyright and license information, please view the LICENSE file that was distributed with this * source code. */ -package io.pebbletemplates.lexer; - -import io.pebbletemplates.operator.BinaryOperator; -import io.pebbletemplates.operator.UnaryOperator; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token.Type; -import io.pebbletemplates.utils.Pair; -import io.pebbletemplates.utils.StringLengthComparator; -import io.pebbletemplates.utils.StringUtils; +package io.pebbletemplates.pebble.lexer; + +import io.pebbletemplates.pebble.operator.BinaryOperator; +import io.pebbletemplates.pebble.operator.UnaryOperator; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.Token.Type; +import io.pebbletemplates.pebble.utils.Pair; +import io.pebbletemplates.pebble.utils.StringLengthComparator; +import io.pebbletemplates.pebble.utils.StringUtils; import java.io.IOException; import java.io.Reader; import java.util.ArrayDeque; diff --git a/pebble/src/main/java/io/pebbletemplates/lexer/Syntax.java b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/Syntax.java similarity index 99% rename from pebble/src/main/java/io/pebbletemplates/lexer/Syntax.java rename to pebble/src/main/java/io/pebbletemplates/pebble/lexer/Syntax.java index 879746909..cc49dcc77 100644 --- a/pebble/src/main/java/io/pebbletemplates/lexer/Syntax.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/Syntax.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.lexer; +package io.pebbletemplates.pebble.lexer; import java.util.regex.Pattern; diff --git a/pebble/src/main/java/io/pebbletemplates/lexer/TemplateSource.java b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/TemplateSource.java similarity index 99% rename from pebble/src/main/java/io/pebbletemplates/lexer/TemplateSource.java rename to pebble/src/main/java/io/pebbletemplates/pebble/lexer/TemplateSource.java index 8dacaf34a..d0a6e896b 100644 --- a/pebble/src/main/java/io/pebbletemplates/lexer/TemplateSource.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/TemplateSource.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.lexer; +package io.pebbletemplates.pebble.lexer; import java.io.IOException; import java.io.Reader; diff --git a/pebble/src/main/java/io/pebbletemplates/lexer/Token.java b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/Token.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/lexer/Token.java rename to pebble/src/main/java/io/pebbletemplates/pebble/lexer/Token.java index 79f183995..52d9e0796 100644 --- a/pebble/src/main/java/io/pebbletemplates/lexer/Token.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/Token.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE file that was distributed * with this source code. */ -package io.pebbletemplates.lexer; +package io.pebbletemplates.pebble.lexer; import java.util.Arrays; diff --git a/pebble/src/main/java/io/pebbletemplates/lexer/TokenStream.java b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/TokenStream.java similarity index 93% rename from pebble/src/main/java/io/pebbletemplates/lexer/TokenStream.java rename to pebble/src/main/java/io/pebbletemplates/pebble/lexer/TokenStream.java index 9cd40708d..745407403 100644 --- a/pebble/src/main/java/io/pebbletemplates/lexer/TokenStream.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/lexer/TokenStream.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.lexer; +package io.pebbletemplates.pebble.lexer; + +import io.pebbletemplates.pebble.error.ParserException; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token.Type; import java.util.ArrayList; import java.util.Collection; @@ -96,7 +96,7 @@ public Token peek(int number) { } public boolean isEOF() { - return this.tokens.get(this.current).getType().equals(Type.EOF); + return this.tokens.get(this.current).getType().equals(Token.Type.EOF); } @Override diff --git a/pebble/src/main/java/io/pebbletemplates/loader/AbstractServletLoader.java b/pebble/src/main/java/io/pebbletemplates/pebble/loader/AbstractServletLoader.java similarity index 95% rename from pebble/src/main/java/io/pebbletemplates/loader/AbstractServletLoader.java rename to pebble/src/main/java/io/pebbletemplates/pebble/loader/AbstractServletLoader.java index a3a8d99dc..b53365ae3 100644 --- a/pebble/src/main/java/io/pebbletemplates/loader/AbstractServletLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/loader/AbstractServletLoader.java @@ -1,7 +1,8 @@ -package io.pebbletemplates.loader; +package io.pebbletemplates.pebble.loader; + +import io.pebbletemplates.pebble.error.LoaderException; +import io.pebbletemplates.pebble.utils.PathUtils; -import io.pebbletemplates.error.LoaderException; -import io.pebbletemplates.utils.PathUtils; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/pebble/src/main/java/io/pebbletemplates/loader/ClasspathLoader.java b/pebble/src/main/java/io/pebbletemplates/pebble/loader/ClasspathLoader.java similarity index 95% rename from pebble/src/main/java/io/pebbletemplates/loader/ClasspathLoader.java rename to pebble/src/main/java/io/pebbletemplates/pebble/loader/ClasspathLoader.java index d5b705a8f..fd2c3ee71 100644 --- a/pebble/src/main/java/io/pebbletemplates/loader/ClasspathLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/loader/ClasspathLoader.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.loader; +package io.pebbletemplates.pebble.loader; -import io.pebbletemplates.error.LoaderException; -import io.pebbletemplates.utils.PathUtils; +import io.pebbletemplates.pebble.error.LoaderException; +import io.pebbletemplates.pebble.utils.PathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoader.java b/pebble/src/main/java/io/pebbletemplates/pebble/loader/DelegatingLoader.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoader.java rename to pebble/src/main/java/io/pebbletemplates/pebble/loader/DelegatingLoader.java index 0170a1378..61ec7418e 100644 --- a/pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/loader/DelegatingLoader.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.loader; +package io.pebbletemplates.pebble.loader; -import io.pebbletemplates.error.LoaderException; +import io.pebbletemplates.pebble.error.LoaderException; import java.io.Reader; import java.util.ArrayList; diff --git a/pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoaderCacheKey.java b/pebble/src/main/java/io/pebbletemplates/pebble/loader/DelegatingLoaderCacheKey.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoaderCacheKey.java rename to pebble/src/main/java/io/pebbletemplates/pebble/loader/DelegatingLoaderCacheKey.java index 71f2022d4..70d6d7e42 100644 --- a/pebble/src/main/java/io/pebbletemplates/loader/DelegatingLoaderCacheKey.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/loader/DelegatingLoaderCacheKey.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.loader; +package io.pebbletemplates.pebble.loader; import java.util.ArrayList; import java.util.Collections; diff --git a/pebble/src/main/java/io/pebbletemplates/loader/FileLoader.java b/pebble/src/main/java/io/pebbletemplates/pebble/loader/FileLoader.java similarity index 95% rename from pebble/src/main/java/io/pebbletemplates/loader/FileLoader.java rename to pebble/src/main/java/io/pebbletemplates/pebble/loader/FileLoader.java index f973aded2..fd6dd0e61 100644 --- a/pebble/src/main/java/io/pebbletemplates/loader/FileLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/loader/FileLoader.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.loader; +package io.pebbletemplates.pebble.loader; -import io.pebbletemplates.error.LoaderException; -import io.pebbletemplates.utils.PathUtils; +import io.pebbletemplates.pebble.error.LoaderException; +import io.pebbletemplates.pebble.utils.PathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pebble/src/main/java/io/pebbletemplates/loader/Loader.java b/pebble/src/main/java/io/pebbletemplates/pebble/loader/Loader.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/loader/Loader.java rename to pebble/src/main/java/io/pebbletemplates/pebble/loader/Loader.java index e91dc7aa9..aa53e9442 100644 --- a/pebble/src/main/java/io/pebbletemplates/loader/Loader.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/loader/Loader.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.loader; +package io.pebbletemplates.pebble.loader; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.PebbleEngine; import java.io.Reader; diff --git a/pebble/src/main/java/io/pebbletemplates/loader/Servlet5Loader.java b/pebble/src/main/java/io/pebbletemplates/pebble/loader/Servlet5Loader.java similarity index 94% rename from pebble/src/main/java/io/pebbletemplates/loader/Servlet5Loader.java rename to pebble/src/main/java/io/pebbletemplates/pebble/loader/Servlet5Loader.java index 75a77b74d..df4b9419c 100644 --- a/pebble/src/main/java/io/pebbletemplates/loader/Servlet5Loader.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/loader/Servlet5Loader.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.loader; +package io.pebbletemplates.pebble.loader; import jakarta.servlet.ServletContext; import java.io.InputStream; diff --git a/pebble/src/main/java/io/pebbletemplates/loader/ServletLoader.java b/pebble/src/main/java/io/pebbletemplates/pebble/loader/ServletLoader.java similarity index 94% rename from pebble/src/main/java/io/pebbletemplates/loader/ServletLoader.java rename to pebble/src/main/java/io/pebbletemplates/pebble/loader/ServletLoader.java index 33a4b4a20..7eaedc8b7 100644 --- a/pebble/src/main/java/io/pebbletemplates/loader/ServletLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/loader/ServletLoader.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.loader; +package io.pebbletemplates.pebble.loader; import java.io.InputStream; import java.net.MalformedURLException; diff --git a/pebble/src/main/java/io/pebbletemplates/loader/StringLoader.java b/pebble/src/main/java/io/pebbletemplates/pebble/loader/StringLoader.java similarity index 96% rename from pebble/src/main/java/io/pebbletemplates/loader/StringLoader.java rename to pebble/src/main/java/io/pebbletemplates/pebble/loader/StringLoader.java index 83a21d17c..cace9d571 100644 --- a/pebble/src/main/java/io/pebbletemplates/loader/StringLoader.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/loader/StringLoader.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.loader; +package io.pebbletemplates.pebble.loader; import java.io.Reader; import java.io.StringReader; diff --git a/pebble/src/main/java/io/pebbletemplates/node/AbstractRenderableNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/AbstractRenderableNode.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/node/AbstractRenderableNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/AbstractRenderableNode.java index 7e1f521a6..b7ab24304 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/AbstractRenderableNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/AbstractRenderableNode.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/ArgumentsNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/ArgumentsNode.java similarity index 91% rename from pebble/src/main/java/io/pebbletemplates/node/ArgumentsNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/ArgumentsNode.java index b1d465726..d41c8ffb6 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/ArgumentsNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/ArgumentsNode.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.NamedArguments; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.NamedArguments; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.HashMap; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/node/AutoEscapeNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/AutoEscapeNode.java similarity index 82% rename from pebble/src/main/java/io/pebbletemplates/node/AutoEscapeNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/AutoEscapeNode.java index 722205f19..9d516ade5 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/AutoEscapeNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/AutoEscapeNode.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/BlockNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/BlockNode.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/node/BlockNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/BlockNode.java index 8e6ceff9f..7d9df5387 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/BlockNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/BlockNode.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.Block; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.Block; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/BodyNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/BodyNode.java similarity index 89% rename from pebble/src/main/java/io/pebbletemplates/node/BodyNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/BodyNode.java index 0d2a277d3..9cdefd858 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/BodyNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/BodyNode.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/CacheNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/CacheNode.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/node/CacheNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/CacheNode.java index 978456736..d9c3f2fb1 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/CacheNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/CacheNode.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.cache.CacheKey; -import io.pebbletemplates.cache.PebbleCache; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.LimitedSizeWriter; +import io.pebbletemplates.pebble.cache.CacheKey; +import io.pebbletemplates.pebble.cache.PebbleCache; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.LimitedSizeWriter; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/main/java/io/pebbletemplates/node/EmbedNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/EmbedNode.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/node/EmbedNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/EmbedNode.java index 9b003d3bc..76916cd60 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/EmbedNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/EmbedNode.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; - -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.node.expression.MapExpression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +package io.pebbletemplates.pebble.node; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.node.expression.MapExpression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/ExtendsNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/ExtendsNode.java similarity index 75% rename from pebble/src/main/java/io/pebbletemplates/node/ExtendsNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/ExtendsNode.java index 2cef53cd4..8251f4e96 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/ExtendsNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/ExtendsNode.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/FlushNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/FlushNode.java similarity index 74% rename from pebble/src/main/java/io/pebbletemplates/node/FlushNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/FlushNode.java index f5c60767c..e11a31b99 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/FlushNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/FlushNode.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/ForNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/ForNode.java similarity index 91% rename from pebble/src/main/java/io/pebbletemplates/node/ForNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/ForNode.java index d8724a138..25dc16f00 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/ForNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/ForNode.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; - -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.node.fornode.LazyLength; -import io.pebbletemplates.node.fornode.LazyRevIndex; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.template.ScopeChain; +package io.pebbletemplates.pebble.node; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.node.fornode.LazyLength; +import io.pebbletemplates.pebble.node.fornode.LazyRevIndex; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.template.ScopeChain; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/FromNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/FromNode.java similarity index 72% rename from pebble/src/main/java/io/pebbletemplates/node/FromNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/FromNode.java index c73b8df9d..4580f45bb 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/FromNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/FromNode.java @@ -1,10 +1,10 @@ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.Pair; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.Pair; import java.io.Writer; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/node/FunctionOrMacroNameNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/FunctionOrMacroNameNode.java similarity index 74% rename from pebble/src/main/java/io/pebbletemplates/node/FunctionOrMacroNameNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/FunctionOrMacroNameNode.java index 6f197ca00..0bf439e22 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/FunctionOrMacroNameNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/FunctionOrMacroNameNode.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class FunctionOrMacroNameNode implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/IfNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/IfNode.java similarity index 84% rename from pebble/src/main/java/io/pebbletemplates/node/IfNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/IfNode.java index e83be81a0..b4d171ace 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/IfNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/IfNode.java @@ -6,21 +6,21 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.Pair; -import io.pebbletemplates.utils.TypeUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.Pair; +import io.pebbletemplates.pebble.utils.TypeUtils; import java.io.IOException; import java.io.Writer; import java.util.List; -import static io.pebbletemplates.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.pebble.utils.TypeUtils.compatibleCast; public class IfNode extends AbstractRenderableNode { diff --git a/pebble/src/main/java/io/pebbletemplates/node/ImportNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/ImportNode.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/node/ImportNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/ImportNode.java index a9518d4dd..97f31659b 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/ImportNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/ImportNode.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.MacroAttributeProvider; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.MacroAttributeProvider; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/IncludeNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/IncludeNode.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/node/IncludeNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/IncludeNode.java index fca0b8907..309973607 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/IncludeNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/IncludeNode.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; - -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.node.expression.MapExpression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +package io.pebbletemplates.pebble.node; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.node.expression.MapExpression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/MacroNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/MacroNode.java similarity index 86% rename from pebble/src/main/java/io/pebbletemplates/node/MacroNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/MacroNode.java index 533d95271..22d9c888d 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/MacroNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/MacroNode.java @@ -6,15 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; - -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.Macro; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.template.ScopeChain; -import io.pebbletemplates.utils.LimitedSizeWriter; +package io.pebbletemplates.pebble.node; + +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.Macro; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.template.ScopeChain; +import io.pebbletemplates.pebble.utils.LimitedSizeWriter; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/main/java/io/pebbletemplates/node/NamedArgumentNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/NamedArgumentNode.java similarity index 80% rename from pebble/src/main/java/io/pebbletemplates/node/NamedArgumentNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/NamedArgumentNode.java index f4f9eef09..2261a0386 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/NamedArgumentNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/NamedArgumentNode.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; public class NamedArgumentNode implements Node { diff --git a/pebble/src/main/java/io/pebbletemplates/node/Node.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/Node.java similarity index 74% rename from pebble/src/main/java/io/pebbletemplates/node/Node.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/Node.java index c80419f42..a3bc92a5b 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/Node.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/Node.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.pebble.extension.NodeVisitor; public interface Node { diff --git a/pebble/src/main/java/io/pebbletemplates/node/ParallelNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/ParallelNode.java similarity index 90% rename from pebble/src/main/java/io/pebbletemplates/node/ParallelNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/ParallelNode.java index abaf69e76..e75f8544d 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/ParallelNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/ParallelNode.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.FutureWriter; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.FutureWriter; import java.io.IOException; import java.io.StringWriter; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/PositionalArgumentNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/PositionalArgumentNode.java similarity index 80% rename from pebble/src/main/java/io/pebbletemplates/node/PositionalArgumentNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/PositionalArgumentNode.java index 9f4fc0469..461c5534f 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/PositionalArgumentNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/PositionalArgumentNode.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; public class PositionalArgumentNode implements Node { diff --git a/pebble/src/main/java/io/pebbletemplates/node/PrintNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/PrintNode.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/node/PrintNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/PrintNode.java index 3abd760cb..1e050d9ce 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/PrintNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/PrintNode.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; - -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.extension.writer.SpecializedWriter; -import io.pebbletemplates.extension.writer.StringWriterSpecializedAdapter; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.StringUtils; +package io.pebbletemplates.pebble.node; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.extension.writer.SpecializedWriter; +import io.pebbletemplates.pebble.extension.writer.StringWriterSpecializedAdapter; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.StringUtils; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/main/java/io/pebbletemplates/node/RenderableNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/RenderableNode.java similarity index 72% rename from pebble/src/main/java/io/pebbletemplates/node/RenderableNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/RenderableNode.java index 69d4db922..3b86a3527 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/RenderableNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/RenderableNode.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/RootNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/RootNode.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/node/RootNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/RootNode.java index acc89a5b3..ec66010ee 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/RootNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/RootNode.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/SetNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/SetNode.java similarity index 76% rename from pebble/src/main/java/io/pebbletemplates/node/SetNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/SetNode.java index 30ecac7c6..fd6676080 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/SetNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/SetNode.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/TestInvocationExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/TestInvocationExpression.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/node/TestInvocationExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/TestInvocationExpression.java index cb40dc80a..aa40c5bc5 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/TestInvocationExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/TestInvocationExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; /** * The right hand side to the test expression. diff --git a/pebble/src/main/java/io/pebbletemplates/node/TextNode.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/TextNode.java similarity index 82% rename from pebble/src/main/java/io/pebbletemplates/node/TextNode.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/TextNode.java index c144e2673..346fd6482 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/TextNode.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/TextNode.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/AddExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/AddExpression.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/node/expression/AddExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/AddExpression.java index 2324f720d..cf62d1d4a 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/AddExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/AddExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class AddExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/AndExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/AndExpression.java similarity index 81% rename from pebble/src/main/java/io/pebbletemplates/node/expression/AndExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/AndExpression.java index da2bde283..335fe7025 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/AndExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/AndExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; -import static io.pebbletemplates.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.pebble.utils.TypeUtils.compatibleCast; public class AndExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/ArrayExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ArrayExpression.java similarity index 85% rename from pebble/src/main/java/io/pebbletemplates/node/expression/ArrayExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ArrayExpression.java index a05c4a319..cbb4c9c7a 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/ArrayExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ArrayExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.ArrayList; import java.util.Collections; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/BinaryExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/BinaryExpression.java similarity index 93% rename from pebble/src/main/java/io/pebbletemplates/node/expression/BinaryExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/BinaryExpression.java index 72a2793a5..7c9d95f12 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/BinaryExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/BinaryExpression.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.pebble.extension.NodeVisitor; public abstract class BinaryExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/BlockFunctionExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/BlockFunctionExpression.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/node/expression/BlockFunctionExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/BlockFunctionExpression.java index b5ee414ba..5f2de8213 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/BlockFunctionExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/BlockFunctionExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/ConcatenateExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ConcatenateExpression.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/node/expression/ConcatenateExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ConcatenateExpression.java index dd8bc5942..6225961b0 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/ConcatenateExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ConcatenateExpression.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; /** * Expression which implements the string concatenation. diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/ContainsExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ContainsExpression.java similarity index 95% rename from pebble/src/main/java/io/pebbletemplates/node/expression/ContainsExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ContainsExpression.java index 19d48d558..d5fdd00d7 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/ContainsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ContainsExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.Collection; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/ContextVariableExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ContextVariableExpression.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/node/expression/ContextVariableExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ContextVariableExpression.java index c17c91f0f..0584c26c3 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/ContextVariableExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ContextVariableExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.RootAttributeNotFoundException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.template.ScopeChain; +import io.pebbletemplates.pebble.error.RootAttributeNotFoundException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.template.ScopeChain; public class ContextVariableExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/DivideExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/DivideExpression.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/node/expression/DivideExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/DivideExpression.java index dc416eb40..79ef2a5b0 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/DivideExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/DivideExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class DivideExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/EqualsExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/EqualsExpression.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/node/expression/EqualsExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/EqualsExpression.java index c9a9edb78..3f9ff0636 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/EqualsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/EqualsExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class EqualsExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/Expression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/Expression.java similarity index 69% rename from pebble/src/main/java/io/pebbletemplates/node/expression/Expression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/Expression.java index a55fc0cdb..4fad8ccc1 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/Expression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/Expression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.node.Node; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.node.Node; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public interface Expression extends Node { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/FilterExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/FilterExpression.java similarity index 77% rename from pebble/src/main/java/io/pebbletemplates/node/expression/FilterExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/FilterExpression.java index e59bdf5df..1295965a6 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/FilterExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/FilterExpression.java @@ -6,17 +6,17 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.extension.core.DefaultFilter; -import io.pebbletemplates.error.AttributeNotFoundException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.escaper.EscapeFilter; -import io.pebbletemplates.extension.escaper.SafeString; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.extension.core.DefaultFilter; +import io.pebbletemplates.pebble.error.AttributeNotFoundException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.escaper.EscapeFilter; +import io.pebbletemplates.pebble.extension.escaper.SafeString; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/FilterInvocationExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/FilterInvocationExpression.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/node/expression/FilterInvocationExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/FilterInvocationExpression.java index 38562e75e..2e1dc8e78 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/FilterInvocationExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/FilterInvocationExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; /** * The right hand side to the filter expression. diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/FunctionOrMacroInvocationExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/FunctionOrMacroInvocationExpression.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/node/expression/FunctionOrMacroInvocationExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/FunctionOrMacroInvocationExpression.java index ff2913f1e..7efed94bf 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/FunctionOrMacroInvocationExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/FunctionOrMacroInvocationExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/GetAttributeExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/GetAttributeExpression.java similarity index 86% rename from pebble/src/main/java/io/pebbletemplates/node/expression/GetAttributeExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/GetAttributeExpression.java index 0346dc8ae..d95117954 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/GetAttributeExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/GetAttributeExpression.java @@ -6,18 +6,18 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; - -import io.pebbletemplates.error.AttributeNotFoundException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.error.RootAttributeNotFoundException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.attributes.AttributeResolver; -import io.pebbletemplates.attributes.ResolvedAttribute; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.PositionalArgumentNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +package io.pebbletemplates.pebble.node.expression; + +import io.pebbletemplates.pebble.error.AttributeNotFoundException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.error.RootAttributeNotFoundException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.attributes.AttributeResolver; +import io.pebbletemplates.pebble.attributes.ResolvedAttribute; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.PositionalArgumentNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanEqualsExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/GreaterThanEqualsExpression.java similarity index 71% rename from pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanEqualsExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/GreaterThanEqualsExpression.java index 3548f10eb..b98d35701 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanEqualsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/GreaterThanEqualsExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class GreaterThanEqualsExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/GreaterThanExpression.java similarity index 71% rename from pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/GreaterThanExpression.java index 21b1d7044..04f749122 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/GreaterThanExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/GreaterThanExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class GreaterThanExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/LessThanEqualsExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LessThanEqualsExpression.java similarity index 71% rename from pebble/src/main/java/io/pebbletemplates/node/expression/LessThanEqualsExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LessThanEqualsExpression.java index d28ed6bf6..6040e2e34 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/LessThanEqualsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LessThanEqualsExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class LessThanEqualsExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/LessThanExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LessThanExpression.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/node/expression/LessThanExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LessThanExpression.java index ffe04d878..f4e709386 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/LessThanExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LessThanExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class LessThanExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBigDecimalExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralBigDecimalExpression.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBigDecimalExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralBigDecimalExpression.java index 8eec46061..0d94779db 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBigDecimalExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralBigDecimalExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.math.BigDecimal; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBooleanExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralBooleanExpression.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBooleanExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralBooleanExpression.java index b761dbd30..c88e4f796 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralBooleanExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralBooleanExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class LiteralBooleanExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralDoubleExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralDoubleExpression.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/node/expression/LiteralDoubleExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralDoubleExpression.java index bbbd7b927..7e9ea6582 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralDoubleExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralDoubleExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class LiteralDoubleExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralIntegerExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralIntegerExpression.java similarity index 76% rename from pebble/src/main/java/io/pebbletemplates/node/expression/LiteralIntegerExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralIntegerExpression.java index 36337507b..96c8781c1 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralIntegerExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralIntegerExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class LiteralIntegerExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralLongExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralLongExpression.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/node/expression/LiteralLongExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralLongExpression.java index 871cbe1c9..d3464c1da 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralLongExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralLongExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class LiteralLongExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralNullExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralNullExpression.java similarity index 74% rename from pebble/src/main/java/io/pebbletemplates/node/expression/LiteralNullExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralNullExpression.java index 39546b1bc..976656835 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralNullExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralNullExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class LiteralNullExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralStringExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralStringExpression.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/node/expression/LiteralStringExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralStringExpression.java index 098745c50..e64c70a1a 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/LiteralStringExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/LiteralStringExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class LiteralStringExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/MapExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/MapExpression.java similarity index 87% rename from pebble/src/main/java/io/pebbletemplates/node/expression/MapExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/MapExpression.java index 6a1c96906..4ba67474e 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/MapExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/MapExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.Collections; import java.util.HashMap; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/ModulusExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ModulusExpression.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/node/expression/ModulusExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ModulusExpression.java index 77f371ed4..329b48028 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/ModulusExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ModulusExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class ModulusExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/MultiplyExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/MultiplyExpression.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/node/expression/MultiplyExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/MultiplyExpression.java index 8070a5efa..167a7ae04 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/MultiplyExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/MultiplyExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class MultiplyExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/NegativeTestExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/NegativeTestExpression.java similarity index 71% rename from pebble/src/main/java/io/pebbletemplates/node/expression/NegativeTestExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/NegativeTestExpression.java index dc95f8d1f..0e8f032fc 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/NegativeTestExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/NegativeTestExpression.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; public class NegativeTestExpression extends PositiveTestExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/NotEqualsExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/NotEqualsExpression.java similarity index 71% rename from pebble/src/main/java/io/pebbletemplates/node/expression/NotEqualsExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/NotEqualsExpression.java index dc921489a..415a43e9d 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/NotEqualsExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/NotEqualsExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class NotEqualsExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/OrExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/OrExpression.java similarity index 81% rename from pebble/src/main/java/io/pebbletemplates/node/expression/OrExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/OrExpression.java index 47410c79a..8927fc8a4 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/OrExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/OrExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; -import static io.pebbletemplates.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.pebble.utils.TypeUtils.compatibleCast; public class OrExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/ParentFunctionExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ParentFunctionExpression.java similarity index 82% rename from pebble/src/main/java/io/pebbletemplates/node/expression/ParentFunctionExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ParentFunctionExpression.java index fd7a9b239..fbe61ba2d 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/ParentFunctionExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/ParentFunctionExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.Hierarchy; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.Hierarchy; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/PositiveTestExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/PositiveTestExpression.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/node/expression/PositiveTestExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/PositiveTestExpression.java index db35b59b2..8ff508023 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/PositiveTestExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/PositiveTestExpression.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.AttributeNotFoundException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.Test; -import io.pebbletemplates.extension.core.DefinedTest; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.TestInvocationExpression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.error.AttributeNotFoundException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.Test; +import io.pebbletemplates.pebble.extension.core.DefinedTest; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.TestInvocationExpression; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.Map; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/RangeExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/RangeExpression.java similarity index 69% rename from pebble/src/main/java/io/pebbletemplates/node/expression/RangeExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/RangeExpression.java index 84ed838c5..316bd5995 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/RangeExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/RangeExpression.java @@ -1,10 +1,10 @@ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.core.RangeFunction; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.PositionalArgumentNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.core.RangeFunction; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.PositionalArgumentNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/RenderableNodeExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/RenderableNodeExpression.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/node/expression/RenderableNodeExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/RenderableNodeExpression.java index a47f76d16..41d3dada4 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/RenderableNodeExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/RenderableNodeExpression.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.LimitedSizeWriter; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.LimitedSizeWriter; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/SubtractExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/SubtractExpression.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/node/expression/SubtractExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/SubtractExpression.java index 549705567..3e3854746 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/SubtractExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/SubtractExpression.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class SubtractExpression extends BinaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/TernaryExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/TernaryExpression.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/node/expression/TernaryExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/TernaryExpression.java index e1eda1e29..bc5770797 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/TernaryExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/TernaryExpression.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.TypeUtils; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.TypeUtils; -import static io.pebbletemplates.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.pebble.utils.TypeUtils.compatibleCast; public class TernaryExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryExpression.java similarity index 90% rename from pebble/src/main/java/io/pebbletemplates/node/expression/UnaryExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryExpression.java index 8b8a49d5b..f295ca5c6 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryExpression.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.extension.NodeVisitor; +import io.pebbletemplates.pebble.extension.NodeVisitor; public abstract class UnaryExpression implements Expression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryMinusExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryMinusExpression.java similarity index 66% rename from pebble/src/main/java/io/pebbletemplates/node/expression/UnaryMinusExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryMinusExpression.java index d98c34e57..06063cfe1 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryMinusExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryMinusExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class UnaryMinusExpression extends UnaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryNotExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryNotExpression.java similarity index 77% rename from pebble/src/main/java/io/pebbletemplates/node/expression/UnaryNotExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryNotExpression.java index 02f9364fe..640f279d7 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryNotExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryNotExpression.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.TypeUtils; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.TypeUtils; -import static io.pebbletemplates.utils.TypeUtils.compatibleCast; +import static io.pebbletemplates.pebble.utils.TypeUtils.compatibleCast; public class UnaryNotExpression extends UnaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryPlusExpression.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryPlusExpression.java similarity index 66% rename from pebble/src/main/java/io/pebbletemplates/node/expression/UnaryPlusExpression.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryPlusExpression.java index 781c573cb..9ae71ccb8 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/expression/UnaryPlusExpression.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/expression/UnaryPlusExpression.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.utils.OperatorUtils; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.utils.OperatorUtils; public class UnaryPlusExpression extends UnaryExpression { diff --git a/pebble/src/main/java/io/pebbletemplates/node/fornode/LazyLength.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/fornode/LazyLength.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/node/fornode/LazyLength.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/fornode/LazyLength.java index 1fad2553f..e98efa186 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/fornode/LazyLength.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/fornode/LazyLength.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.node.fornode; +package io.pebbletemplates.pebble.node.fornode; import java.lang.reflect.Array; import java.util.Collection; diff --git a/pebble/src/main/java/io/pebbletemplates/node/fornode/LazyRevIndex.java b/pebble/src/main/java/io/pebbletemplates/pebble/node/fornode/LazyRevIndex.java similarity index 93% rename from pebble/src/main/java/io/pebbletemplates/node/fornode/LazyRevIndex.java rename to pebble/src/main/java/io/pebbletemplates/pebble/node/fornode/LazyRevIndex.java index db85e1dce..5788c2a72 100644 --- a/pebble/src/main/java/io/pebbletemplates/node/fornode/LazyRevIndex.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/node/fornode/LazyRevIndex.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.node.fornode; +package io.pebbletemplates.pebble.node.fornode; public class LazyRevIndex extends Number { private final int value; diff --git a/pebble/src/main/java/io/pebbletemplates/operator/Associativity.java b/pebble/src/main/java/io/pebbletemplates/pebble/operator/Associativity.java similarity index 85% rename from pebble/src/main/java/io/pebbletemplates/operator/Associativity.java rename to pebble/src/main/java/io/pebbletemplates/pebble/operator/Associativity.java index ea1a3be4a..07d43ba18 100644 --- a/pebble/src/main/java/io/pebbletemplates/operator/Associativity.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/operator/Associativity.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.operator; +package io.pebbletemplates.pebble.operator; public enum Associativity { LEFT, RIGHT diff --git a/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperator.java b/pebble/src/main/java/io/pebbletemplates/pebble/operator/BinaryOperator.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/operator/BinaryOperator.java rename to pebble/src/main/java/io/pebbletemplates/pebble/operator/BinaryOperator.java index e90ba0492..231c1ac0f 100644 --- a/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperator.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/operator/BinaryOperator.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.operator; +package io.pebbletemplates.pebble.operator; -import io.pebbletemplates.node.expression.BinaryExpression; +import io.pebbletemplates.pebble.node.expression.BinaryExpression; public interface BinaryOperator { diff --git a/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorImpl.java b/pebble/src/main/java/io/pebbletemplates/pebble/operator/BinaryOperatorImpl.java similarity index 86% rename from pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorImpl.java rename to pebble/src/main/java/io/pebbletemplates/pebble/operator/BinaryOperatorImpl.java index 369aeccc2..1f6df32ad 100644 --- a/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/operator/BinaryOperatorImpl.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.operator; +package io.pebbletemplates.pebble.operator; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.node.expression.BinaryExpression; -import io.pebbletemplates.node.expression.FilterExpression; -import io.pebbletemplates.node.expression.NegativeTestExpression; -import io.pebbletemplates.node.expression.PositiveTestExpression; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.node.expression.BinaryExpression; +import io.pebbletemplates.pebble.node.expression.FilterExpression; +import io.pebbletemplates.pebble.node.expression.NegativeTestExpression; +import io.pebbletemplates.pebble.node.expression.PositiveTestExpression; import java.util.function.Supplier; public class BinaryOperatorImpl implements BinaryOperator { diff --git a/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorType.java b/pebble/src/main/java/io/pebbletemplates/pebble/operator/BinaryOperatorType.java similarity index 57% rename from pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorType.java rename to pebble/src/main/java/io/pebbletemplates/pebble/operator/BinaryOperatorType.java index 390fa7434..aefe7b69b 100644 --- a/pebble/src/main/java/io/pebbletemplates/operator/BinaryOperatorType.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/operator/BinaryOperatorType.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.operator; +package io.pebbletemplates.pebble.operator; public enum BinaryOperatorType { NORMAL, FILTER, TEST diff --git a/pebble/src/main/java/io/pebbletemplates/operator/UnaryOperator.java b/pebble/src/main/java/io/pebbletemplates/pebble/operator/UnaryOperator.java similarity index 76% rename from pebble/src/main/java/io/pebbletemplates/operator/UnaryOperator.java rename to pebble/src/main/java/io/pebbletemplates/pebble/operator/UnaryOperator.java index 8d2e16c1a..fac81512b 100644 --- a/pebble/src/main/java/io/pebbletemplates/operator/UnaryOperator.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/operator/UnaryOperator.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.operator; +package io.pebbletemplates.pebble.operator; -import io.pebbletemplates.node.expression.UnaryExpression; +import io.pebbletemplates.pebble.node.expression.UnaryExpression; public interface UnaryOperator { diff --git a/pebble/src/main/java/io/pebbletemplates/operator/UnaryOperatorImpl.java b/pebble/src/main/java/io/pebbletemplates/pebble/operator/UnaryOperatorImpl.java similarity index 88% rename from pebble/src/main/java/io/pebbletemplates/operator/UnaryOperatorImpl.java rename to pebble/src/main/java/io/pebbletemplates/pebble/operator/UnaryOperatorImpl.java index 54f5fd36c..5a4ae8287 100644 --- a/pebble/src/main/java/io/pebbletemplates/operator/UnaryOperatorImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/operator/UnaryOperatorImpl.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.operator; +package io.pebbletemplates.pebble.operator; -import io.pebbletemplates.node.expression.UnaryExpression; +import io.pebbletemplates.pebble.node.expression.UnaryExpression; public class UnaryOperatorImpl implements UnaryOperator { diff --git a/pebble/src/main/java/io/pebbletemplates/parser/ExpressionParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/parser/ExpressionParser.java similarity index 90% rename from pebble/src/main/java/io/pebbletemplates/parser/ExpressionParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/parser/ExpressionParser.java index 69f03187d..25833a569 100644 --- a/pebble/src/main/java/io/pebbletemplates/parser/ExpressionParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/parser/ExpressionParser.java @@ -6,40 +6,40 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.parser; - -import io.pebbletemplates.operator.Associativity; -import io.pebbletemplates.operator.BinaryOperator; -import io.pebbletemplates.operator.BinaryOperatorType; -import io.pebbletemplates.operator.UnaryOperator; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.FunctionOrMacroNameNode; -import io.pebbletemplates.node.NamedArgumentNode; -import io.pebbletemplates.node.PositionalArgumentNode; -import io.pebbletemplates.node.TestInvocationExpression; -import io.pebbletemplates.node.expression.ArrayExpression; -import io.pebbletemplates.node.expression.BinaryExpression; -import io.pebbletemplates.node.expression.BlockFunctionExpression; -import io.pebbletemplates.node.expression.ConcatenateExpression; -import io.pebbletemplates.node.expression.ContextVariableExpression; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.node.expression.FilterInvocationExpression; -import io.pebbletemplates.node.expression.FunctionOrMacroInvocationExpression; -import io.pebbletemplates.node.expression.GetAttributeExpression; -import io.pebbletemplates.node.expression.LiteralBigDecimalExpression; -import io.pebbletemplates.node.expression.LiteralBooleanExpression; -import io.pebbletemplates.node.expression.LiteralDoubleExpression; -import io.pebbletemplates.node.expression.LiteralIntegerExpression; -import io.pebbletemplates.node.expression.LiteralLongExpression; -import io.pebbletemplates.node.expression.LiteralNullExpression; -import io.pebbletemplates.node.expression.LiteralStringExpression; -import io.pebbletemplates.node.expression.MapExpression; -import io.pebbletemplates.node.expression.ParentFunctionExpression; -import io.pebbletemplates.node.expression.TernaryExpression; -import io.pebbletemplates.node.expression.UnaryExpression; +package io.pebbletemplates.pebble.parser; + +import io.pebbletemplates.pebble.operator.Associativity; +import io.pebbletemplates.pebble.operator.BinaryOperator; +import io.pebbletemplates.pebble.operator.BinaryOperatorType; +import io.pebbletemplates.pebble.operator.UnaryOperator; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.FunctionOrMacroNameNode; +import io.pebbletemplates.pebble.node.NamedArgumentNode; +import io.pebbletemplates.pebble.node.PositionalArgumentNode; +import io.pebbletemplates.pebble.node.TestInvocationExpression; +import io.pebbletemplates.pebble.node.expression.ArrayExpression; +import io.pebbletemplates.pebble.node.expression.BinaryExpression; +import io.pebbletemplates.pebble.node.expression.BlockFunctionExpression; +import io.pebbletemplates.pebble.node.expression.ConcatenateExpression; +import io.pebbletemplates.pebble.node.expression.ContextVariableExpression; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.node.expression.FilterInvocationExpression; +import io.pebbletemplates.pebble.node.expression.FunctionOrMacroInvocationExpression; +import io.pebbletemplates.pebble.node.expression.GetAttributeExpression; +import io.pebbletemplates.pebble.node.expression.LiteralBigDecimalExpression; +import io.pebbletemplates.pebble.node.expression.LiteralBooleanExpression; +import io.pebbletemplates.pebble.node.expression.LiteralDoubleExpression; +import io.pebbletemplates.pebble.node.expression.LiteralIntegerExpression; +import io.pebbletemplates.pebble.node.expression.LiteralLongExpression; +import io.pebbletemplates.pebble.node.expression.LiteralNullExpression; +import io.pebbletemplates.pebble.node.expression.LiteralStringExpression; +import io.pebbletemplates.pebble.node.expression.MapExpression; +import io.pebbletemplates.pebble.node.expression.ParentFunctionExpression; +import io.pebbletemplates.pebble.node.expression.TernaryExpression; +import io.pebbletemplates.pebble.node.expression.UnaryExpression; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/pebble/src/main/java/io/pebbletemplates/parser/Parser.java b/pebble/src/main/java/io/pebbletemplates/pebble/parser/Parser.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/parser/Parser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/parser/Parser.java index c18e410e1..56cb84b40 100644 --- a/pebble/src/main/java/io/pebbletemplates/parser/Parser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/parser/Parser.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.parser; +package io.pebbletemplates.pebble.parser; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.RootNode; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.RootNode; public interface Parser { diff --git a/pebble/src/main/java/io/pebbletemplates/parser/ParserImpl.java b/pebble/src/main/java/io/pebbletemplates/pebble/parser/ParserImpl.java similarity index 90% rename from pebble/src/main/java/io/pebbletemplates/parser/ParserImpl.java rename to pebble/src/main/java/io/pebbletemplates/pebble/parser/ParserImpl.java index 45688c5af..548730ad2 100644 --- a/pebble/src/main/java/io/pebbletemplates/parser/ParserImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/parser/ParserImpl.java @@ -6,20 +6,20 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.parser; - -import io.pebbletemplates.operator.BinaryOperator; -import io.pebbletemplates.operator.UnaryOperator; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.PrintNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.RootNode; -import io.pebbletemplates.node.TextNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.tokenParser.TokenParser; +package io.pebbletemplates.pebble.parser; + +import io.pebbletemplates.pebble.operator.BinaryOperator; +import io.pebbletemplates.pebble.operator.UnaryOperator; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.PrintNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.node.TextNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.tokenParser.TokenParser; import java.util.ArrayList; import java.util.LinkedList; diff --git a/pebble/src/main/java/io/pebbletemplates/parser/ParserOptions.java b/pebble/src/main/java/io/pebbletemplates/pebble/parser/ParserOptions.java similarity index 94% rename from pebble/src/main/java/io/pebbletemplates/parser/ParserOptions.java rename to pebble/src/main/java/io/pebbletemplates/pebble/parser/ParserOptions.java index 0bbd98246..f4dd3d761 100644 --- a/pebble/src/main/java/io/pebbletemplates/parser/ParserOptions.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/parser/ParserOptions.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.parser; +package io.pebbletemplates.pebble.parser; /** * Parser options. diff --git a/pebble/src/main/java/io/pebbletemplates/parser/StoppingCondition.java b/pebble/src/main/java/io/pebbletemplates/pebble/parser/StoppingCondition.java similarity index 86% rename from pebble/src/main/java/io/pebbletemplates/parser/StoppingCondition.java rename to pebble/src/main/java/io/pebbletemplates/pebble/parser/StoppingCondition.java index 5b9f7a740..3016f5b59 100644 --- a/pebble/src/main/java/io/pebbletemplates/parser/StoppingCondition.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/parser/StoppingCondition.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.parser; +package io.pebbletemplates.pebble.parser; -import io.pebbletemplates.lexer.Token; +import io.pebbletemplates.pebble.lexer.Token; /** * Implementations of this class are provided by the TokenParsers and handed to the main Parser. The diff --git a/pebble/src/main/java/io/pebbletemplates/template/Block.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/Block.java similarity index 90% rename from pebble/src/main/java/io/pebbletemplates/template/Block.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/Block.java index a7d28663d..93153f2bd 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/Block.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/Block.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/template/EvaluationContext.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/EvaluationContext.java similarity index 82% rename from pebble/src/main/java/io/pebbletemplates/template/EvaluationContext.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/EvaluationContext.java index 770326265..727e5bc54 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/EvaluationContext.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/EvaluationContext.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; import java.util.Locale; diff --git a/pebble/src/main/java/io/pebbletemplates/template/EvaluationContextImpl.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/EvaluationContextImpl.java similarity index 96% rename from pebble/src/main/java/io/pebbletemplates/template/EvaluationContextImpl.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/EvaluationContextImpl.java index c65b544a1..750e4f126 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/EvaluationContextImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/EvaluationContextImpl.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; -import io.pebbletemplates.cache.CacheKey; -import io.pebbletemplates.cache.PebbleCache; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.ExtensionRegistry; -import io.pebbletemplates.utils.Callbacks; +import io.pebbletemplates.pebble.cache.CacheKey; +import io.pebbletemplates.pebble.cache.PebbleCache; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.ExtensionRegistry; +import io.pebbletemplates.pebble.utils.Callbacks; import java.io.IOException; import java.util.ArrayList; diff --git a/pebble/src/main/java/io/pebbletemplates/template/EvaluationOptions.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/EvaluationOptions.java similarity index 86% rename from pebble/src/main/java/io/pebbletemplates/template/EvaluationOptions.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/EvaluationOptions.java index 51a9071c5..938abfaf9 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/EvaluationOptions.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/EvaluationOptions.java @@ -1,6 +1,6 @@ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; -import io.pebbletemplates.attributes.methodaccess.MethodAccessValidator; +import io.pebbletemplates.pebble.attributes.methodaccess.MethodAccessValidator; /** * Evaluation options. diff --git a/pebble/src/main/java/io/pebbletemplates/template/GlobalContext.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/GlobalContext.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/template/GlobalContext.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/GlobalContext.java index 3350eb321..f1d31e3a3 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/GlobalContext.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/GlobalContext.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; import java.util.Collection; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/template/Hierarchy.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/Hierarchy.java similarity index 98% rename from pebble/src/main/java/io/pebbletemplates/template/Hierarchy.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/Hierarchy.java index af898b347..f470dcea5 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/Hierarchy.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/Hierarchy.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; import java.util.ArrayList; diff --git a/pebble/src/main/java/io/pebbletemplates/template/Macro.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/Macro.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/template/Macro.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/Macro.java index c78f4fcd0..6adcf6939 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/Macro.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/Macro.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; -import io.pebbletemplates.extension.NamedArguments; +import io.pebbletemplates.pebble.extension.NamedArguments; import java.util.Map; public interface Macro extends NamedArguments { diff --git a/pebble/src/main/java/io/pebbletemplates/template/MacroAttributeProvider.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/MacroAttributeProvider.java similarity index 87% rename from pebble/src/main/java/io/pebbletemplates/template/MacroAttributeProvider.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/MacroAttributeProvider.java index f24f5dbab..ead004402 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/MacroAttributeProvider.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/MacroAttributeProvider.java @@ -1,6 +1,6 @@ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; -import io.pebbletemplates.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.ArgumentsNode; public class MacroAttributeProvider { diff --git a/pebble/src/main/java/io/pebbletemplates/template/PebbleTemplate.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/PebbleTemplate.java similarity index 97% rename from pebble/src/main/java/io/pebbletemplates/template/PebbleTemplate.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/PebbleTemplate.java index 2eb75f377..729db1f12 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/PebbleTemplate.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/PebbleTemplate.java @@ -6,9 +6,9 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.PebbleEngine; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/template/PebbleTemplateImpl.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/PebbleTemplateImpl.java similarity index 96% rename from pebble/src/main/java/io/pebbletemplates/template/PebbleTemplateImpl.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/PebbleTemplateImpl.java index c722f8249..f70ffdc61 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/PebbleTemplateImpl.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/PebbleTemplateImpl.java @@ -6,19 +6,19 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.template; - -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.escaper.SafeString; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.BlockNode; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.RootNode; -import io.pebbletemplates.utils.FutureWriter; -import io.pebbletemplates.utils.LimitedSizeWriter; -import io.pebbletemplates.utils.Pair; +package io.pebbletemplates.pebble.template; + +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.escaper.SafeString; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.BlockNode; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.utils.FutureWriter; +import io.pebbletemplates.pebble.utils.LimitedSizeWriter; +import io.pebbletemplates.pebble.utils.Pair; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/template/RenderedSizeContext.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/RenderedSizeContext.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/template/RenderedSizeContext.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/RenderedSizeContext.java index db9e72f07..a141cd9fa 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/RenderedSizeContext.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/RenderedSizeContext.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; public interface RenderedSizeContext { int getMaxRenderedSize(); diff --git a/pebble/src/main/java/io/pebbletemplates/template/Scope.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/Scope.java similarity index 98% rename from pebble/src/main/java/io/pebbletemplates/template/Scope.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/Scope.java index f6c9506f1..c58d17910 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/Scope.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/Scope.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; import java.util.HashMap; import java.util.Set; diff --git a/pebble/src/main/java/io/pebbletemplates/template/ScopeChain.java b/pebble/src/main/java/io/pebbletemplates/pebble/template/ScopeChain.java similarity index 99% rename from pebble/src/main/java/io/pebbletemplates/template/ScopeChain.java rename to pebble/src/main/java/io/pebbletemplates/pebble/template/ScopeChain.java index 2ad59831d..622598f39 100644 --- a/pebble/src/main/java/io/pebbletemplates/template/ScopeChain.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/template/ScopeChain.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.template; +package io.pebbletemplates.pebble.template; import java.util.ArrayList; import java.util.HashMap; diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/AutoEscapeTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/AutoEscapeTokenParser.java similarity index 79% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/AutoEscapeTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/AutoEscapeTokenParser.java index 6757c0be9..b315f7b6e 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/AutoEscapeTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/AutoEscapeTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.AutoEscapeNode; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.AutoEscapeNode; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.parser.Parser; public class AutoEscapeTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/BlockTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/BlockTokenParser.java similarity index 83% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/BlockTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/BlockTokenParser.java index d5cc23c76..1331aad6a 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/BlockTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/BlockTokenParser.java @@ -6,15 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.BlockNode; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.BlockNode; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.parser.Parser; public class BlockTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/CacheTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/CacheTokenParser.java similarity index 72% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/CacheTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/CacheTokenParser.java index 8594c850e..3a65c0587 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/CacheTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/CacheTokenParser.java @@ -6,15 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.CacheNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.CacheNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.parser.Parser; /** * Token parser for the cache tag diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/EmbedTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/EmbedTokenParser.java similarity index 85% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/EmbedTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/EmbedTokenParser.java index d15fad66e..ad8068a90 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/EmbedTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/EmbedTokenParser.java @@ -6,17 +6,17 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.BlockNode; -import io.pebbletemplates.node.EmbedNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.node.expression.MapExpression; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.BlockNode; +import io.pebbletemplates.pebble.node.EmbedNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.node.expression.MapExpression; +import io.pebbletemplates.pebble.parser.Parser; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/ExtendsTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ExtendsTokenParser.java similarity index 68% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/ExtendsTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ExtendsTokenParser.java index 9c7d0364f..530455e86 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/ExtendsTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ExtendsTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; +package io.pebbletemplates.pebble.tokenParser; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.ExtendsNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.ExtendsNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.parser.Parser; public class ExtendsTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/FilterTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/FilterTokenParser.java similarity index 76% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/FilterTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/FilterTokenParser.java index 04a1ef2af..921c07a54 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/FilterTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/FilterTokenParser.java @@ -6,17 +6,17 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.PrintNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.node.expression.FilterExpression; -import io.pebbletemplates.node.expression.RenderableNodeExpression; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.PrintNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.node.expression.FilterExpression; +import io.pebbletemplates.pebble.node.expression.RenderableNodeExpression; +import io.pebbletemplates.pebble.parser.Parser; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/FlushTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/FlushTokenParser.java similarity index 68% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/FlushTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/FlushTokenParser.java index a8091666f..6279e4f30 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/FlushTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/FlushTokenParser.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; +package io.pebbletemplates.pebble.tokenParser; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.FlushNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.FlushNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.parser.Parser; public class FlushTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/ForTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ForTokenParser.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/ForTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ForTokenParser.java index 936b3bbf0..5a9787da1 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/ForTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ForTokenParser.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; +package io.pebbletemplates.pebble.tokenParser; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.ForNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.ForNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.parser.Parser; public class ForTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/FromTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/FromTokenParser.java similarity index 82% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/FromTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/FromTokenParser.java index a56728d39..070812ae0 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/FromTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/FromTokenParser.java @@ -1,13 +1,13 @@ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.FromNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.parser.Parser; -import io.pebbletemplates.utils.Pair; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.FromNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.parser.Parser; +import io.pebbletemplates.pebble.utils.Pair; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/IfTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/IfTokenParser.java similarity index 81% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/IfTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/IfTokenParser.java index 8458d8790..682fd42c7 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/IfTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/IfTokenParser.java @@ -6,18 +6,18 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.IfNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.parser.Parser; -import io.pebbletemplates.parser.StoppingCondition; -import io.pebbletemplates.utils.Pair; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.IfNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.parser.Parser; +import io.pebbletemplates.pebble.parser.StoppingCondition; +import io.pebbletemplates.pebble.utils.Pair; import java.util.ArrayList; import java.util.List; diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/ImportTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ImportTokenParser.java similarity index 75% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/ImportTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ImportTokenParser.java index 1718fe0b5..f5b34b4e9 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/ImportTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ImportTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.ImportNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.ImportNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.parser.Parser; public class ImportTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/IncludeTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/IncludeTokenParser.java similarity index 75% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/IncludeTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/IncludeTokenParser.java index 7bee7e835..32c71c61c 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/IncludeTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/IncludeTokenParser.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.IncludeNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.node.expression.MapExpression; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.IncludeNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.node.expression.MapExpression; +import io.pebbletemplates.pebble.parser.Parser; public class IncludeTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/MacroTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/MacroTokenParser.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/MacroTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/MacroTokenParser.java index 04eb1b731..603eed50e 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/MacroTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/MacroTokenParser.java @@ -6,15 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.MacroNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.MacroNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.parser.Parser; public class MacroTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/ParallelTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ParallelTokenParser.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/ParallelTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ParallelTokenParser.java index a1713e196..f56f49f8a 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/ParallelTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/ParallelTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.BodyNode; -import io.pebbletemplates.node.ParallelNode; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.ParallelNode; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.parser.Parser; public class ParallelTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/SetTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/SetTokenParser.java similarity index 70% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/SetTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/SetTokenParser.java index bf9265c49..ce42a2a34 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/SetTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/SetTokenParser.java @@ -6,14 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; - -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.node.SetNode; -import io.pebbletemplates.node.expression.Expression; -import io.pebbletemplates.parser.Parser; +package io.pebbletemplates.pebble.tokenParser; + +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.node.SetNode; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.parser.Parser; public class SetTokenParser implements TokenParser { diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/TokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/TokenParser.java similarity index 91% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/TokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/TokenParser.java index bbce9e936..f9d8a8ece 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/TokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/TokenParser.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; +package io.pebbletemplates.pebble.tokenParser; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.parser.Parser; /** * A TokenParser is responsible for converting a stream of Tokens into a Node. A TokenParser often diff --git a/pebble/src/main/java/io/pebbletemplates/tokenParser/VerbatimTokenParser.java b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/VerbatimTokenParser.java similarity index 76% rename from pebble/src/main/java/io/pebbletemplates/tokenParser/VerbatimTokenParser.java rename to pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/VerbatimTokenParser.java index d1e0e3ff1..59316dc42 100644 --- a/pebble/src/main/java/io/pebbletemplates/tokenParser/VerbatimTokenParser.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/tokenParser/VerbatimTokenParser.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.tokenParser; +package io.pebbletemplates.pebble.tokenParser; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.parser.Parser; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.parser.Parser; /** * This is just a dummy class to point developers into the right direction; the verbatim tag had to diff --git a/pebble/src/main/java/io/pebbletemplates/utils/Callbacks.java b/pebble/src/main/java/io/pebbletemplates/pebble/utils/Callbacks.java similarity index 78% rename from pebble/src/main/java/io/pebbletemplates/utils/Callbacks.java rename to pebble/src/main/java/io/pebbletemplates/pebble/utils/Callbacks.java index b0d10a753..2d42a51e5 100644 --- a/pebble/src/main/java/io/pebbletemplates/utils/Callbacks.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/utils/Callbacks.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; import java.io.IOException; diff --git a/pebble/src/main/java/io/pebbletemplates/utils/FutureWriter.java b/pebble/src/main/java/io/pebbletemplates/pebble/utils/FutureWriter.java similarity index 98% rename from pebble/src/main/java/io/pebbletemplates/utils/FutureWriter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/utils/FutureWriter.java index 545bc7435..1b3cd9e2f 100644 --- a/pebble/src/main/java/io/pebbletemplates/utils/FutureWriter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/utils/FutureWriter.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/utils/LimitedSizeWriter.java b/pebble/src/main/java/io/pebbletemplates/pebble/utils/LimitedSizeWriter.java similarity index 94% rename from pebble/src/main/java/io/pebbletemplates/utils/LimitedSizeWriter.java rename to pebble/src/main/java/io/pebbletemplates/pebble/utils/LimitedSizeWriter.java index defdc12eb..99ddf82d3 100644 --- a/pebble/src/main/java/io/pebbletemplates/utils/LimitedSizeWriter.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/utils/LimitedSizeWriter.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.RenderedSizeContext; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.RenderedSizeContext; import java.io.IOException; import java.io.Writer; diff --git a/pebble/src/main/java/io/pebbletemplates/utils/OperatorUtils.java b/pebble/src/main/java/io/pebbletemplates/pebble/utils/OperatorUtils.java similarity index 98% rename from pebble/src/main/java/io/pebbletemplates/utils/OperatorUtils.java rename to pebble/src/main/java/io/pebbletemplates/pebble/utils/OperatorUtils.java index 9d0d0f3e5..edd3edb1f 100644 --- a/pebble/src/main/java/io/pebbletemplates/utils/OperatorUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/utils/OperatorUtils.java @@ -6,9 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; + +import io.pebbletemplates.pebble.extension.escaper.SafeString; -import io.pebbletemplates.extension.escaper.SafeString; import java.math.BigDecimal; import java.math.MathContext; import java.util.Collection; diff --git a/pebble/src/main/java/io/pebbletemplates/utils/Pair.java b/pebble/src/main/java/io/pebbletemplates/pebble/utils/Pair.java similarity index 94% rename from pebble/src/main/java/io/pebbletemplates/utils/Pair.java rename to pebble/src/main/java/io/pebbletemplates/pebble/utils/Pair.java index 74b91f771..6351f2270 100644 --- a/pebble/src/main/java/io/pebbletemplates/utils/Pair.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/utils/Pair.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; /** * A small utility class used to pair relevant objects together. diff --git a/pebble/src/main/java/io/pebbletemplates/utils/PathUtils.java b/pebble/src/main/java/io/pebbletemplates/pebble/utils/PathUtils.java similarity index 98% rename from pebble/src/main/java/io/pebbletemplates/utils/PathUtils.java rename to pebble/src/main/java/io/pebbletemplates/pebble/utils/PathUtils.java index 6819d0aad..6f9f482f8 100644 --- a/pebble/src/main/java/io/pebbletemplates/utils/PathUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/utils/PathUtils.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/pebble/src/main/java/io/pebbletemplates/utils/StringLengthComparator.java b/pebble/src/main/java/io/pebbletemplates/pebble/utils/StringLengthComparator.java similarity index 92% rename from pebble/src/main/java/io/pebbletemplates/utils/StringLengthComparator.java rename to pebble/src/main/java/io/pebbletemplates/pebble/utils/StringLengthComparator.java index ae8c2a10b..218869dc6 100644 --- a/pebble/src/main/java/io/pebbletemplates/utils/StringLengthComparator.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/utils/StringLengthComparator.java @@ -6,7 +6,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; public class StringLengthComparator implements java.util.Comparator { diff --git a/pebble/src/main/java/io/pebbletemplates/utils/StringUtils.java b/pebble/src/main/java/io/pebbletemplates/pebble/utils/StringUtils.java similarity index 95% rename from pebble/src/main/java/io/pebbletemplates/utils/StringUtils.java rename to pebble/src/main/java/io/pebbletemplates/pebble/utils/StringUtils.java index 02ff0fa51..6244ca844 100644 --- a/pebble/src/main/java/io/pebbletemplates/utils/StringUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/utils/StringUtils.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; import java.math.BigDecimal; diff --git a/pebble/src/main/java/io/pebbletemplates/utils/TypeUtils.java b/pebble/src/main/java/io/pebbletemplates/pebble/utils/TypeUtils.java similarity index 98% rename from pebble/src/main/java/io/pebbletemplates/utils/TypeUtils.java rename to pebble/src/main/java/io/pebbletemplates/pebble/utils/TypeUtils.java index 2c596cf91..ca4d7b41e 100644 --- a/pebble/src/main/java/io/pebbletemplates/utils/TypeUtils.java +++ b/pebble/src/main/java/io/pebbletemplates/pebble/utils/TypeUtils.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/pebble/src/test/java/io/pebbletemplates/ArgumentsNodeTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ArgumentsNodeTest.java similarity index 80% rename from pebble/src/test/java/io/pebbletemplates/ArgumentsNodeTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ArgumentsNodeTest.java index bd6c10ed9..ab3232d5f 100644 --- a/pebble/src/test/java/io/pebbletemplates/ArgumentsNodeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ArgumentsNodeTest.java @@ -1,9 +1,9 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.node.ArgumentsNode; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/ArraySyntaxTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ArraySyntaxTest.java similarity index 99% rename from pebble/src/test/java/io/pebbletemplates/ArraySyntaxTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ArraySyntaxTest.java index 2f2f413b4..d1f605797 100644 --- a/pebble/src/test/java/io/pebbletemplates/ArraySyntaxTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ArraySyntaxTest.java @@ -6,16 +6,17 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; + import java.io.IOException; import java.io.StringWriter; import java.io.Writer; diff --git a/pebble/src/test/java/io/pebbletemplates/AttributeSubscriptSyntaxTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/AttributeSubscriptSyntaxTest.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/AttributeSubscriptSyntaxTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/AttributeSubscriptSyntaxTest.java index 273eb53dd..43427ed94 100644 --- a/pebble/src/test/java/io/pebbletemplates/AttributeSubscriptSyntaxTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/AttributeSubscriptSyntaxTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/CacheTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/CacheTest.java similarity index 97% rename from pebble/src/test/java/io/pebbletemplates/CacheTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/CacheTest.java index e5a910d0a..418850d00 100644 --- a/pebble/src/test/java/io/pebbletemplates/CacheTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/CacheTest.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/CompilerTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/CompilerTest.java similarity index 88% rename from pebble/src/test/java/io/pebbletemplates/CompilerTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/CompilerTest.java index 069dbf533..a0bc9990e 100644 --- a/pebble/src/test/java/io/pebbletemplates/CompilerTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/CompilerTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/pebble/src/test/java/io/pebbletemplates/ConcurrencyTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ConcurrencyTest.java similarity index 97% rename from pebble/src/test/java/io/pebbletemplates/ConcurrencyTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ConcurrencyTest.java index 3bed08565..d8c209c52 100644 --- a/pebble/src/test/java/io/pebbletemplates/ConcurrencyTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ConcurrencyTest.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.LoaderException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.Loader; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.LoaderException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.Loader; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/ContextTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ContextTest.java similarity index 97% rename from pebble/src/test/java/io/pebbletemplates/ContextTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ContextTest.java index 242ce409a..331ed0cd4 100644 --- a/pebble/src/test/java/io/pebbletemplates/ContextTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ContextTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.error.RootAttributeNotFoundException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.error.RootAttributeNotFoundException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/CoreFiltersTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/CoreFiltersTest.java similarity index 99% rename from pebble/src/test/java/io/pebbletemplates/CoreFiltersTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/CoreFiltersTest.java index c558873da..f8e7abcf6 100644 --- a/pebble/src/test/java/io/pebbletemplates/CoreFiltersTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/CoreFiltersTest.java @@ -6,13 +6,14 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; - -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.TestingExtension; -import io.pebbletemplates.extension.core.*; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +package io.pebbletemplates.pebble; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.TestingExtension; +import io.pebbletemplates.pebble.extension.core.*; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.extension.core.*; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/CoreFunctionsTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/CoreFunctionsTest.java similarity index 98% rename from pebble/src/test/java/io/pebbletemplates/CoreFunctionsTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/CoreFunctionsTest.java index 40be61a20..83a6a4699 100644 --- a/pebble/src/test/java/io/pebbletemplates/CoreFunctionsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/CoreFunctionsTest.java @@ -7,11 +7,11 @@ * For the full copyright and license information, please view the LICENSE file that was distributed * with this source code. **************************************************************************** */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/CoreTagsTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/CoreTagsTest.java similarity index 99% rename from pebble/src/test/java/io/pebbletemplates/CoreTagsTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/CoreTagsTest.java index 749c74eb6..0b4c1462c 100644 --- a/pebble/src/test/java/io/pebbletemplates/CoreTagsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/CoreTagsTest.java @@ -7,12 +7,12 @@ * For the full copyright and license information, please view the LICENSE file that was distributed * with this source code. **************************************************************************** */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/pebble/src/test/java/io/pebbletemplates/CoreTestsTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/CoreTestsTest.java similarity index 97% rename from pebble/src/test/java/io/pebbletemplates/CoreTestsTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/CoreTestsTest.java index e3011b6da..02668f880 100644 --- a/pebble/src/test/java/io/pebbletemplates/CoreTestsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/CoreTestsTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/EmbedCachingTagTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/EmbedCachingTagTest.java similarity index 85% rename from pebble/src/test/java/io/pebbletemplates/EmbedCachingTagTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/EmbedCachingTagTest.java index 3bf84925c..97630e68d 100644 --- a/pebble/src/test/java/io/pebbletemplates/EmbedCachingTagTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/EmbedCachingTagTest.java @@ -1,10 +1,10 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.ClasspathLoader; -import io.pebbletemplates.loader.DelegatingLoader; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.ClasspathLoader; +import io.pebbletemplates.pebble.loader.DelegatingLoader; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/EmbedTagTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/EmbedTagTest.java similarity index 91% rename from pebble/src/test/java/io/pebbletemplates/EmbedTagTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/EmbedTagTest.java index 540927a95..4e5696010 100644 --- a/pebble/src/test/java/io/pebbletemplates/EmbedTagTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/EmbedTagTest.java @@ -1,11 +1,11 @@ -package io.pebbletemplates; - -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.ClasspathLoader; -import io.pebbletemplates.loader.DelegatingLoader; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.utils.Pair; +package io.pebbletemplates.pebble; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.ClasspathLoader; +import io.pebbletemplates.pebble.loader.DelegatingLoader; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.utils.Pair; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/pebble/src/test/java/io/pebbletemplates/EnumEqualsTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/EnumEqualsTest.java similarity index 84% rename from pebble/src/test/java/io/pebbletemplates/EnumEqualsTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/EnumEqualsTest.java index 167abdfd6..20e81c7c4 100644 --- a/pebble/src/test/java/io/pebbletemplates/EnumEqualsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/EnumEqualsTest.java @@ -1,8 +1,8 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/ErrorReportingTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ErrorReportingTest.java similarity index 89% rename from pebble/src/test/java/io/pebbletemplates/ErrorReportingTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ErrorReportingTest.java index 178d3a51d..3c90c6ccc 100644 --- a/pebble/src/test/java/io/pebbletemplates/ErrorReportingTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ErrorReportingTest.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.error.RootAttributeNotFoundException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.error.RootAttributeNotFoundException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/EscaperExtensionTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/EscaperExtensionTest.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/EscaperExtensionTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/EscaperExtensionTest.java index eda24f525..566878f81 100644 --- a/pebble/src/test/java/io/pebbletemplates/EscaperExtensionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/EscaperExtensionTest.java @@ -6,14 +6,15 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.extension.escaper.EscapeFilter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; @@ -26,7 +27,6 @@ import java.util.List; import java.util.Map; -import static io.pebbletemplates.extension.escaper.EscapeFilter.JSON_ESCAPE_STRATEGY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -281,7 +281,7 @@ void testEscapeJson() throws PebbleException, IOException { PebbleEngine pebble = new PebbleEngine.Builder() .loader(new StringLoader()) .strictVariables(false) - .defaultEscapingStrategy(JSON_ESCAPE_STRATEGY) + .defaultEscapingStrategy(EscapeFilter.JSON_ESCAPE_STRATEGY) .build(); PebbleTemplate template = pebble.getTemplate("{{ text }}"); diff --git a/pebble/src/test/java/io/pebbletemplates/ExtendingPebbleTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ExtendingPebbleTest.java similarity index 85% rename from pebble/src/test/java/io/pebbletemplates/ExtendingPebbleTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ExtendingPebbleTest.java index cae60b7f8..6fcc09a45 100644 --- a/pebble/src/test/java/io/pebbletemplates/ExtendingPebbleTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ExtendingPebbleTest.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; - -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.attributes.AttributeResolver; -import io.pebbletemplates.attributes.ResolvedAttribute; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +package io.pebbletemplates.pebble; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.attributes.AttributeResolver; +import io.pebbletemplates.pebble.attributes.ResolvedAttribute; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/ForTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ForTest.java similarity index 92% rename from pebble/src/test/java/io/pebbletemplates/ForTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ForTest.java index fe9f0e112..189f347af 100644 --- a/pebble/src/test/java/io/pebbletemplates/ForTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ForTest.java @@ -1,8 +1,8 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/GetAttributeTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/GetAttributeTest.java similarity index 98% rename from pebble/src/test/java/io/pebbletemplates/GetAttributeTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/GetAttributeTest.java index 701bbc4b4..536dc9c33 100644 --- a/pebble/src/test/java/io/pebbletemplates/GetAttributeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/GetAttributeTest.java @@ -6,19 +6,20 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; -import io.pebbletemplates.error.AttributeNotFoundException; -import io.pebbletemplates.error.ClassAccessException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.error.RootAttributeNotFoundException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.attributes.methodaccess.NoOpMethodAccessValidator; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.AttributeNotFoundException; +import io.pebbletemplates.pebble.error.ClassAccessException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.error.RootAttributeNotFoundException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.attributes.methodaccess.NoOpMethodAccessValidator; +import io.pebbletemplates.pebble.template.PebbleTemplate; + import java.io.IOException; import java.io.StringWriter; import java.io.Writer; diff --git a/pebble/src/test/java/io/pebbletemplates/I18nExtensionTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/I18nExtensionTest.java similarity index 92% rename from pebble/src/test/java/io/pebbletemplates/I18nExtensionTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/I18nExtensionTest.java index 159482083..8c20d86a8 100644 --- a/pebble/src/test/java/io/pebbletemplates/I18nExtensionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/I18nExtensionTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/IncludeWithParameterTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/IncludeWithParameterTest.java similarity index 93% rename from pebble/src/test/java/io/pebbletemplates/IncludeWithParameterTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/IncludeWithParameterTest.java index abb0ed803..5e2f671fc 100644 --- a/pebble/src/test/java/io/pebbletemplates/IncludeWithParameterTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/IncludeWithParameterTest.java @@ -1,9 +1,10 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; import static org.junit.jupiter.api.Assertions.assertEquals; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; + import java.io.IOException; import java.io.StringWriter; import java.io.Writer; diff --git a/pebble/src/test/java/io/pebbletemplates/InheritanceTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/InheritanceTest.java similarity index 93% rename from pebble/src/test/java/io/pebbletemplates/InheritanceTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/InheritanceTest.java index 191ed4385..67945a14e 100644 --- a/pebble/src/test/java/io/pebbletemplates/InheritanceTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/InheritanceTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/LoaderTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/LoaderTest.java similarity index 90% rename from pebble/src/test/java/io/pebbletemplates/LoaderTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/LoaderTest.java index b35da8b9f..cdbddb527 100644 --- a/pebble/src/test/java/io/pebbletemplates/LoaderTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/LoaderTest.java @@ -6,16 +6,16 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; - -import io.pebbletemplates.error.LoaderException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.ClasspathLoader; -import io.pebbletemplates.loader.DelegatingLoader; -import io.pebbletemplates.loader.FileLoader; -import io.pebbletemplates.loader.Loader; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +package io.pebbletemplates.pebble; + +import io.pebbletemplates.pebble.error.LoaderException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.ClasspathLoader; +import io.pebbletemplates.pebble.loader.DelegatingLoader; +import io.pebbletemplates.pebble.loader.FileLoader; +import io.pebbletemplates.pebble.loader.Loader; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/LogicTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/LogicTest.java similarity index 99% rename from pebble/src/test/java/io/pebbletemplates/LogicTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/LogicTest.java index fa3f894df..df7be1a53 100644 --- a/pebble/src/test/java/io/pebbletemplates/LogicTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/LogicTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.utils.Pair; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.utils.Pair; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/MacroTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/MacroTest.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/MacroTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/MacroTest.java index e055d3dac..523a6e20c 100644 --- a/pebble/src/test/java/io/pebbletemplates/MacroTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/MacroTest.java @@ -1,10 +1,10 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.InvocationCountingFunction; -import io.pebbletemplates.extension.TestingExtension; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.InvocationCountingFunction; +import io.pebbletemplates.pebble.extension.TestingExtension; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/MapSyntaxTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/MapSyntaxTest.java similarity index 98% rename from pebble/src/test/java/io/pebbletemplates/MapSyntaxTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/MapSyntaxTest.java index 34308680d..8ffb0e3c8 100644 --- a/pebble/src/test/java/io/pebbletemplates/MapSyntaxTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/MapSyntaxTest.java @@ -6,13 +6,13 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.TestingExtension; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.TestingExtension; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/MaxRenderedSizeTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/MaxRenderedSizeTest.java similarity index 90% rename from pebble/src/test/java/io/pebbletemplates/MaxRenderedSizeTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/MaxRenderedSizeTest.java index 1cff2a8e9..d2ec263b5 100644 --- a/pebble/src/test/java/io/pebbletemplates/MaxRenderedSizeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/MaxRenderedSizeTest.java @@ -1,7 +1,7 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/MethodAccessTemplateTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/MethodAccessTemplateTest.java similarity index 94% rename from pebble/src/test/java/io/pebbletemplates/MethodAccessTemplateTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/MethodAccessTemplateTest.java index 1a144774e..386167396 100644 --- a/pebble/src/test/java/io/pebbletemplates/MethodAccessTemplateTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/MethodAccessTemplateTest.java @@ -1,11 +1,12 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; import static org.junit.jupiter.api.Assertions.assertThrows; -import io.pebbletemplates.error.ClassAccessException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.attributes.methodaccess.NoOpMethodAccessValidator; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.ClassAccessException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.attributes.methodaccess.NoOpMethodAccessValidator; +import io.pebbletemplates.pebble.template.PebbleTemplate; + import java.io.IOException; import java.io.StringWriter; import java.io.Writer; diff --git a/pebble/src/test/java/io/pebbletemplates/NewlineTrimmingTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/NewlineTrimmingTest.java similarity index 96% rename from pebble/src/test/java/io/pebbletemplates/NewlineTrimmingTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/NewlineTrimmingTest.java index 0afe90e4c..5e008ddf5 100644 --- a/pebble/src/test/java/io/pebbletemplates/NewlineTrimmingTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/NewlineTrimmingTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/OverloadedMethodTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/OverloadedMethodTest.java similarity index 97% rename from pebble/src/test/java/io/pebbletemplates/OverloadedMethodTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/OverloadedMethodTest.java index 5b6513993..22b541b91 100644 --- a/pebble/src/test/java/io/pebbletemplates/OverloadedMethodTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/OverloadedMethodTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. ******************************************************************************/ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/OverrideCoreExtensionTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/OverrideCoreExtensionTest.java similarity index 83% rename from pebble/src/test/java/io/pebbletemplates/OverrideCoreExtensionTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/OverrideCoreExtensionTest.java index 54de1b249..4642e95f0 100644 --- a/pebble/src/test/java/io/pebbletemplates/OverrideCoreExtensionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/OverrideCoreExtensionTest.java @@ -1,21 +1,21 @@ -package io.pebbletemplates; - -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.extension.Function; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.node.expression.UnaryExpression; -import io.pebbletemplates.node.expression.BinaryExpression; -import io.pebbletemplates.operator.Associativity; -import io.pebbletemplates.operator.BinaryOperator; -import io.pebbletemplates.operator.BinaryOperatorImpl; -import io.pebbletemplates.operator.UnaryOperator; -import io.pebbletemplates.operator.UnaryOperatorImpl; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.template.PebbleTemplateImpl; +package io.pebbletemplates.pebble; + +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.node.expression.UnaryExpression; +import io.pebbletemplates.pebble.node.expression.BinaryExpression; +import io.pebbletemplates.pebble.operator.Associativity; +import io.pebbletemplates.pebble.operator.BinaryOperator; +import io.pebbletemplates.pebble.operator.BinaryOperatorImpl; +import io.pebbletemplates.pebble.operator.UnaryOperator; +import io.pebbletemplates.pebble.operator.UnaryOperatorImpl; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/ParsingOdditiesTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ParsingOdditiesTest.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/ParsingOdditiesTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ParsingOdditiesTest.java index 9aa22cc48..2e77f7082 100644 --- a/pebble/src/test/java/io/pebbletemplates/ParsingOdditiesTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ParsingOdditiesTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/RenderSingleBlockTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/RenderSingleBlockTest.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/RenderSingleBlockTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/RenderSingleBlockTest.java index 9cec1023a..f5eb5875a 100644 --- a/pebble/src/test/java/io/pebbletemplates/RenderSingleBlockTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/RenderSingleBlockTest.java @@ -1,8 +1,8 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/RenderWithoutEndBlockTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/RenderWithoutEndBlockTest.java similarity index 97% rename from pebble/src/test/java/io/pebbletemplates/RenderWithoutEndBlockTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/RenderWithoutEndBlockTest.java index 79ec5a402..771125630 100644 --- a/pebble/src/test/java/io/pebbletemplates/RenderWithoutEndBlockTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/RenderWithoutEndBlockTest.java @@ -1,8 +1,8 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/ScopeChainTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ScopeChainTest.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/ScopeChainTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ScopeChainTest.java index 0a40decd2..034724b0f 100644 --- a/pebble/src/test/java/io/pebbletemplates/ScopeChainTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ScopeChainTest.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.ScopeChain; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.ScopeChain; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/ScopeTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/ScopeTest.java similarity index 88% rename from pebble/src/test/java/io/pebbletemplates/ScopeTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/ScopeTest.java index 1b0d74df4..cc47c94c0 100644 --- a/pebble/src/test/java/io/pebbletemplates/ScopeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/ScopeTest.java @@ -1,6 +1,6 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.template.Scope; +import io.pebbletemplates.pebble.template.Scope; import org.junit.jupiter.api.Test; import java.util.HashMap; diff --git a/pebble/src/test/java/io/pebbletemplates/SplitFilterTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/SplitFilterTest.java similarity index 94% rename from pebble/src/test/java/io/pebbletemplates/SplitFilterTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/SplitFilterTest.java index 7e7faff02..02a8a1a4c 100644 --- a/pebble/src/test/java/io/pebbletemplates/SplitFilterTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/SplitFilterTest.java @@ -1,8 +1,8 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/StrictModeTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/StrictModeTest.java similarity index 92% rename from pebble/src/test/java/io/pebbletemplates/StrictModeTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/StrictModeTest.java index a356a0c52..08582a3f9 100644 --- a/pebble/src/test/java/io/pebbletemplates/StrictModeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/StrictModeTest.java @@ -1,9 +1,9 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.error.RootAttributeNotFoundException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.error.RootAttributeNotFoundException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/StringInterpolationTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/StringInterpolationTest.java similarity index 97% rename from pebble/src/test/java/io/pebbletemplates/StringInterpolationTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/StringInterpolationTest.java index 466d691ef..93b4ad41f 100644 --- a/pebble/src/test/java/io/pebbletemplates/StringInterpolationTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/StringInterpolationTest.java @@ -1,7 +1,7 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/TernaryExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/TernaryExpressionTest.java similarity index 97% rename from pebble/src/test/java/io/pebbletemplates/TernaryExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/TernaryExpressionTest.java index 8b4ccdfba..4ccc2603b 100644 --- a/pebble/src/test/java/io/pebbletemplates/TernaryExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/TernaryExpressionTest.java @@ -6,12 +6,12 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/TestParallelParsing.java b/pebble/src/test/java/io/pebbletemplates/pebble/TestParallelParsing.java similarity index 84% rename from pebble/src/test/java/io/pebbletemplates/TestParallelParsing.java rename to pebble/src/test/java/io/pebbletemplates/pebble/TestParallelParsing.java index c624e7a56..df2ea38da 100644 --- a/pebble/src/test/java/io/pebbletemplates/TestParallelParsing.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/TestParallelParsing.java @@ -1,17 +1,17 @@ -package io.pebbletemplates; - -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.NodeVisitor; -import io.pebbletemplates.lexer.Token; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.parser.Parser; -import io.pebbletemplates.node.RenderableNode; -import io.pebbletemplates.template.EvaluationContextImpl; -import io.pebbletemplates.template.PebbleTemplate; -import io.pebbletemplates.template.PebbleTemplateImpl; -import io.pebbletemplates.tokenParser.TokenParser; +package io.pebbletemplates.pebble; + +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.lexer.Token; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.parser.Parser; +import io.pebbletemplates.pebble.node.RenderableNode; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.tokenParser.TokenParser; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/TestRelativePath.java b/pebble/src/test/java/io/pebbletemplates/pebble/TestRelativePath.java similarity index 94% rename from pebble/src/test/java/io/pebbletemplates/TestRelativePath.java rename to pebble/src/test/java/io/pebbletemplates/pebble/TestRelativePath.java index e6a4bb35f..5eabda4dc 100644 --- a/pebble/src/test/java/io/pebbletemplates/TestRelativePath.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/TestRelativePath.java @@ -1,8 +1,8 @@ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.FileLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.FileLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/WhitespaceControlTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/WhitespaceControlTest.java similarity index 97% rename from pebble/src/test/java/io/pebbletemplates/WhitespaceControlTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/WhitespaceControlTest.java index b83b9a662..2d6e03abc 100644 --- a/pebble/src/test/java/io/pebbletemplates/WhitespaceControlTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/WhitespaceControlTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/WritingTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/WritingTest.java similarity index 93% rename from pebble/src/test/java/io/pebbletemplates/WritingTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/WritingTest.java index 60bc17f06..bd81e4534 100644 --- a/pebble/src/test/java/io/pebbletemplates/WritingTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/WritingTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates; +package io.pebbletemplates.pebble; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java similarity index 96% rename from pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java index 19dad9d96..b16fd35f8 100644 --- a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/BlacklistMethodAccessValidatorTest.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.attributes.methodaccess; +package io.pebbletemplates.pebble.attributes.methodaccess; import static org.assertj.core.api.Assertions.assertThat; diff --git a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/Foo.java b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/Foo.java similarity index 71% rename from pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/Foo.java rename to pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/Foo.java index 6220a2d64..7838c2cae 100644 --- a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/Foo.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/Foo.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.attributes.methodaccess; +package io.pebbletemplates.pebble.attributes.methodaccess; public class Foo { diff --git a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/InstanceProvider.java b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/InstanceProvider.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/InstanceProvider.java rename to pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/InstanceProvider.java index d6f365a35..b0d1f0ff2 100644 --- a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/InstanceProvider.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/InstanceProvider.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.attributes.methodaccess; +package io.pebbletemplates.pebble.attributes.methodaccess; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Constructor; diff --git a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/MethodsProvider.java b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/MethodsProvider.java similarity index 98% rename from pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/MethodsProvider.java rename to pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/MethodsProvider.java index b602f0dd1..28c180077 100644 --- a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/MethodsProvider.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/MethodsProvider.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.attributes.methodaccess; +package io.pebbletemplates.pebble.attributes.methodaccess; import java.io.IOException; diff --git a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidatorTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/NoOpMethodAccessValidatorTest.java similarity index 87% rename from pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidatorTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/NoOpMethodAccessValidatorTest.java index 5398d28de..cb2d8abca 100644 --- a/pebble/src/test/java/io/pebbletemplates/attributes/methodaccess/NoOpMethodAccessValidatorTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/attributes/methodaccess/NoOpMethodAccessValidatorTest.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.attributes.methodaccess; +package io.pebbletemplates.pebble.attributes.methodaccess; import static org.assertj.core.api.Assertions.assertThat; diff --git a/pebble/src/test/java/io/pebbletemplates/extension/ArrayToStringFilter.java b/pebble/src/test/java/io/pebbletemplates/pebble/extension/ArrayToStringFilter.java similarity index 85% rename from pebble/src/test/java/io/pebbletemplates/extension/ArrayToStringFilter.java rename to pebble/src/test/java/io/pebbletemplates/pebble/extension/ArrayToStringFilter.java index 935ea1cbb..4ee39489a 100644 --- a/pebble/src/test/java/io/pebbletemplates/extension/ArrayToStringFilter.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/extension/ArrayToStringFilter.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.lang.reflect.Array; import java.util.List; diff --git a/pebble/src/test/java/io/pebbletemplates/extension/ExtensionCustomizerTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/extension/ExtensionCustomizerTest.java similarity index 87% rename from pebble/src/test/java/io/pebbletemplates/extension/ExtensionCustomizerTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/extension/ExtensionCustomizerTest.java index 36fcc8c6b..98b2caaf1 100644 --- a/pebble/src/test/java/io/pebbletemplates/extension/ExtensionCustomizerTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/extension/ExtensionCustomizerTest.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/extension/InvocationCountingFunction.java b/pebble/src/test/java/io/pebbletemplates/pebble/extension/InvocationCountingFunction.java similarity index 79% rename from pebble/src/test/java/io/pebbletemplates/extension/InvocationCountingFunction.java rename to pebble/src/test/java/io/pebbletemplates/pebble/extension/InvocationCountingFunction.java index b4f49c72e..f9e8fae7e 100644 --- a/pebble/src/test/java/io/pebbletemplates/extension/InvocationCountingFunction.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/extension/InvocationCountingFunction.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/test/java/io/pebbletemplates/extension/ListToStringFilter.java b/pebble/src/test/java/io/pebbletemplates/pebble/extension/ListToStringFilter.java similarity index 84% rename from pebble/src/test/java/io/pebbletemplates/extension/ListToStringFilter.java rename to pebble/src/test/java/io/pebbletemplates/pebble/extension/ListToStringFilter.java index 242a8e691..26e34d92d 100644 --- a/pebble/src/test/java/io/pebbletemplates/extension/ListToStringFilter.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/extension/ListToStringFilter.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.List; import java.util.Map; diff --git a/pebble/src/test/java/io/pebbletemplates/extension/MapToStringFilter.java b/pebble/src/test/java/io/pebbletemplates/pebble/extension/MapToStringFilter.java similarity index 90% rename from pebble/src/test/java/io/pebbletemplates/extension/MapToStringFilter.java rename to pebble/src/test/java/io/pebbletemplates/pebble/extension/MapToStringFilter.java index ac1316f22..2576d6155 100644 --- a/pebble/src/test/java/io/pebbletemplates/extension/MapToStringFilter.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/extension/MapToStringFilter.java @@ -6,10 +6,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.ArrayList; import java.util.Collections; diff --git a/pebble/src/test/java/io/pebbletemplates/extension/TestingExtension.java b/pebble/src/test/java/io/pebbletemplates/pebble/extension/TestingExtension.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/extension/TestingExtension.java rename to pebble/src/test/java/io/pebbletemplates/pebble/extension/TestingExtension.java index 196a2a9a7..8a0436fb0 100644 --- a/pebble/src/test/java/io/pebbletemplates/extension/TestingExtension.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/extension/TestingExtension.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.extension; +package io.pebbletemplates.pebble.extension; import java.util.HashMap; import java.util.Map; diff --git a/pebble/src/test/java/io/pebbletemplates/extension/escaper/RawFilterTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/extension/escaper/RawFilterTest.java similarity index 92% rename from pebble/src/test/java/io/pebbletemplates/extension/escaper/RawFilterTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/extension/escaper/RawFilterTest.java index e051966ae..258b71567 100644 --- a/pebble/src/test/java/io/pebbletemplates/extension/escaper/RawFilterTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/extension/escaper/RawFilterTest.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.extension.escaper; +package io.pebbletemplates.pebble.extension.escaper; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/lexer/IdentifierTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/lexer/IdentifierTest.java similarity index 92% rename from pebble/src/test/java/io/pebbletemplates/lexer/IdentifierTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/lexer/IdentifierTest.java index 1df4afc5a..df478697a 100644 --- a/pebble/src/test/java/io/pebbletemplates/lexer/IdentifierTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/lexer/IdentifierTest.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.lexer; +package io.pebbletemplates.pebble.lexer; -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.PebbleEngine; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/pebble/src/test/java/io/pebbletemplates/lexer/LexerImplTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/lexer/LexerImplTest.java similarity index 98% rename from pebble/src/test/java/io/pebbletemplates/lexer/LexerImplTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/lexer/LexerImplTest.java index c288f95f5..ec6c0397a 100644 --- a/pebble/src/test/java/io/pebbletemplates/lexer/LexerImplTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/lexer/LexerImplTest.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.lexer; +package io.pebbletemplates.pebble.lexer; -import io.pebbletemplates.extension.ExtensionRegistry; -import io.pebbletemplates.extension.core.CoreExtension; -import io.pebbletemplates.loader.Loader; -import io.pebbletemplates.loader.StringLoader; +import io.pebbletemplates.pebble.extension.ExtensionRegistry; +import io.pebbletemplates.pebble.extension.core.CoreExtension; +import io.pebbletemplates.pebble.loader.Loader; +import io.pebbletemplates.pebble.loader.StringLoader; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/lexer/SyntaxTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/lexer/SyntaxTest.java similarity index 99% rename from pebble/src/test/java/io/pebbletemplates/lexer/SyntaxTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/lexer/SyntaxTest.java index c8ec6cabb..98ad05d57 100644 --- a/pebble/src/test/java/io/pebbletemplates/lexer/SyntaxTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/lexer/SyntaxTest.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.lexer; +package io.pebbletemplates.pebble.lexer; import static org.assertj.core.api.Assertions.assertThat; import java.util.regex.Matcher; diff --git a/pebble/src/test/java/io/pebbletemplates/macro/MacroGlobalVariablesTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/macro/MacroGlobalVariablesTest.java similarity index 81% rename from pebble/src/test/java/io/pebbletemplates/macro/MacroGlobalVariablesTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/macro/MacroGlobalVariablesTest.java index 2719ae4c2..a8e6deaab 100644 --- a/pebble/src/test/java/io/pebbletemplates/macro/MacroGlobalVariablesTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/macro/MacroGlobalVariablesTest.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.macro; +package io.pebbletemplates.pebble.macro; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.PebbleEngine; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/pebble/src/test/java/io/pebbletemplates/macro/PebbleExtension.java b/pebble/src/test/java/io/pebbletemplates/pebble/macro/PebbleExtension.java similarity index 64% rename from pebble/src/test/java/io/pebbletemplates/macro/PebbleExtension.java rename to pebble/src/test/java/io/pebbletemplates/pebble/macro/PebbleExtension.java index bc8c3654d..df23c28e4 100644 --- a/pebble/src/test/java/io/pebbletemplates/macro/PebbleExtension.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/macro/PebbleExtension.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.macro; +package io.pebbletemplates.pebble.macro; -import io.pebbletemplates.extension.AbstractExtension; -import io.pebbletemplates.extension.Filter; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Filter; import java.util.HashMap; import java.util.Map; diff --git a/pebble/src/test/java/io/pebbletemplates/macro/TestFilter.java b/pebble/src/test/java/io/pebbletemplates/pebble/macro/TestFilter.java similarity index 75% rename from pebble/src/test/java/io/pebbletemplates/macro/TestFilter.java rename to pebble/src/test/java/io/pebbletemplates/pebble/macro/TestFilter.java index 48ca14ed7..a9ff88cb9 100644 --- a/pebble/src/test/java/io/pebbletemplates/macro/TestFilter.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/macro/TestFilter.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.macro; +package io.pebbletemplates.pebble.macro; -import io.pebbletemplates.extension.Filter; -import io.pebbletemplates.template.EvaluationContext; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.util.Collections; import java.util.List; diff --git a/pebble/src/test/java/io/pebbletemplates/macro/TestMacroCalls.java b/pebble/src/test/java/io/pebbletemplates/pebble/macro/TestMacroCalls.java similarity index 96% rename from pebble/src/test/java/io/pebbletemplates/macro/TestMacroCalls.java rename to pebble/src/test/java/io/pebbletemplates/pebble/macro/TestMacroCalls.java index 53de9c6b4..c1511738c 100644 --- a/pebble/src/test/java/io/pebbletemplates/macro/TestMacroCalls.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/macro/TestMacroCalls.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.macro; +package io.pebbletemplates.pebble.macro; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/node/ForNodeTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/node/ForNodeTest.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/node/ForNodeTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/node/ForNodeTest.java index ce1fc397e..16e14e95a 100644 --- a/pebble/src/test/java/io/pebbletemplates/node/ForNodeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/node/ForNodeTest.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/node/IfNodeTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/node/IfNodeTest.java similarity index 90% rename from pebble/src/test/java/io/pebbletemplates/node/IfNodeTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/node/IfNodeTest.java index 152cdfe65..43b8b9734 100644 --- a/pebble/src/test/java/io/pebbletemplates/node/IfNodeTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/node/IfNodeTest.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.node; +package io.pebbletemplates.pebble.node; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/node/expression/AndExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/AndExpressionTest.java similarity index 94% rename from pebble/src/test/java/io/pebbletemplates/node/expression/AndExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/node/expression/AndExpressionTest.java index 4ea4155fa..0c8fb80ae 100644 --- a/pebble/src/test/java/io/pebbletemplates/node/expression/AndExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/AndExpressionTest.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/node/expression/ExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/ExpressionTest.java similarity index 73% rename from pebble/src/test/java/io/pebbletemplates/node/expression/ExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/node/expression/ExpressionTest.java index e663633dd..fd0e477d0 100644 --- a/pebble/src/test/java/io/pebbletemplates/node/expression/ExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/ExpressionTest.java @@ -1,8 +1,8 @@ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.template.PebbleTemplate; import java.io.IOException; import java.io.StringWriter; diff --git a/pebble/src/test/java/io/pebbletemplates/node/expression/OrExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/OrExpressionTest.java similarity index 94% rename from pebble/src/test/java/io/pebbletemplates/node/expression/OrExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/node/expression/OrExpressionTest.java index 7ebd8a21a..c7aef680f 100644 --- a/pebble/src/test/java/io/pebbletemplates/node/expression/OrExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/OrExpressionTest.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/node/expression/StringExpressionParserTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/StringExpressionParserTest.java similarity index 92% rename from pebble/src/test/java/io/pebbletemplates/node/expression/StringExpressionParserTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/node/expression/StringExpressionParserTest.java index f391a0102..13ee89609 100644 --- a/pebble/src/test/java/io/pebbletemplates/node/expression/StringExpressionParserTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/StringExpressionParserTest.java @@ -1,16 +1,16 @@ -package io.pebbletemplates.node.expression; - -import io.pebbletemplates.error.ParserException; -import io.pebbletemplates.lexer.LexerImpl; -import io.pebbletemplates.lexer.TokenStream; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.parser.Parser; -import io.pebbletemplates.parser.ParserImpl; -import io.pebbletemplates.parser.ParserOptions; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.node.PrintNode; -import io.pebbletemplates.node.RootNode; -import io.pebbletemplates.utils.Pair; +package io.pebbletemplates.pebble.node.expression; + +import io.pebbletemplates.pebble.error.ParserException; +import io.pebbletemplates.pebble.lexer.LexerImpl; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.parser.Parser; +import io.pebbletemplates.pebble.parser.ParserImpl; +import io.pebbletemplates.pebble.parser.ParserOptions; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.node.PrintNode; +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.utils.Pair; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/node/expression/UnaryNotExpressionTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/UnaryNotExpressionTest.java similarity index 90% rename from pebble/src/test/java/io/pebbletemplates/node/expression/UnaryNotExpressionTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/node/expression/UnaryNotExpressionTest.java index d5e43c900..5b541c659 100644 --- a/pebble/src/test/java/io/pebbletemplates/node/expression/UnaryNotExpressionTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/node/expression/UnaryNotExpressionTest.java @@ -1,9 +1,9 @@ -package io.pebbletemplates.node.expression; +package io.pebbletemplates.pebble.node.expression; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.PebbleEngine; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.PebbleEngine; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/template/tests/PebbleTestContext.java b/pebble/src/test/java/io/pebbletemplates/pebble/template/tests/PebbleTestContext.java similarity index 96% rename from pebble/src/test/java/io/pebbletemplates/template/tests/PebbleTestContext.java rename to pebble/src/test/java/io/pebbletemplates/pebble/template/tests/PebbleTestContext.java index f8c30e0f4..521f9f8cd 100644 --- a/pebble/src/test/java/io/pebbletemplates/template/tests/PebbleTestContext.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/template/tests/PebbleTestContext.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.template.tests; +package io.pebbletemplates.pebble.template.tests; import java.io.IOException; import java.io.StringWriter; @@ -8,13 +8,13 @@ import java.util.HashMap; import java.util.Map; -import io.pebbletemplates.loader.StringLoader; -import io.pebbletemplates.template.PebbleTemplate; +import io.pebbletemplates.pebble.loader.StringLoader; +import io.pebbletemplates.pebble.template.PebbleTemplate; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.pebbletemplates.PebbleEngine; +import io.pebbletemplates.pebble.PebbleEngine; /** * Used by Pebble Template Tests to simply the test code and therefore diff --git a/pebble/src/test/java/io/pebbletemplates/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java b/pebble/src/test/java/io/pebbletemplates/pebble/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java similarity index 95% rename from pebble/src/test/java/io/pebbletemplates/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java rename to pebble/src/test/java/io/pebbletemplates/pebble/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java index 46cbe2aa3..1054b11e1 100644 --- a/pebble/src/test/java/io/pebbletemplates/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/template/tests/WhiteSpaceControlWithNewLineTrimmingTests.java @@ -6,11 +6,11 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ -package io.pebbletemplates.template.tests; +package io.pebbletemplates.pebble.template.tests; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.tests.input.PebbleTestItem; -import io.pebbletemplates.template.tests.input.PebbleTestItemType; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.tests.input.PebbleTestItem; +import io.pebbletemplates.pebble.template.tests.input.PebbleTestItemType; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItem.java b/pebble/src/test/java/io/pebbletemplates/pebble/template/tests/input/PebbleTestItem.java similarity index 93% rename from pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItem.java rename to pebble/src/test/java/io/pebbletemplates/pebble/template/tests/input/PebbleTestItem.java index 544d56a15..e372253e8 100644 --- a/pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItem.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/template/tests/input/PebbleTestItem.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.template.tests.input; +package io.pebbletemplates.pebble.template.tests.input; public class PebbleTestItem { diff --git a/pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItemType.java b/pebble/src/test/java/io/pebbletemplates/pebble/template/tests/input/PebbleTestItemType.java similarity index 60% rename from pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItemType.java rename to pebble/src/test/java/io/pebbletemplates/pebble/template/tests/input/PebbleTestItemType.java index 76e0c3c65..aeaf306ac 100644 --- a/pebble/src/test/java/io/pebbletemplates/template/tests/input/PebbleTestItemType.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/template/tests/input/PebbleTestItemType.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.template.tests.input; +package io.pebbletemplates.pebble.template.tests.input; public enum PebbleTestItemType { ITEM_TYPE1, ITEM_TYPE2, ITEM_TYPE3, ITEM_TYPE4 diff --git a/pebble/src/test/java/io/pebbletemplates/utils/LimitedSizeWriterTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/utils/LimitedSizeWriterTest.java similarity index 94% rename from pebble/src/test/java/io/pebbletemplates/utils/LimitedSizeWriterTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/utils/LimitedSizeWriterTest.java index f888c4536..cada307d4 100644 --- a/pebble/src/test/java/io/pebbletemplates/utils/LimitedSizeWriterTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/utils/LimitedSizeWriterTest.java @@ -1,7 +1,7 @@ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; -import io.pebbletemplates.error.PebbleException; -import io.pebbletemplates.template.RenderedSizeContext; +import io.pebbletemplates.pebble.error.PebbleException; +import io.pebbletemplates.pebble.template.RenderedSizeContext; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/pebble/src/test/java/io/pebbletemplates/utils/PathUtilsTest.java b/pebble/src/test/java/io/pebbletemplates/pebble/utils/PathUtilsTest.java similarity index 98% rename from pebble/src/test/java/io/pebbletemplates/utils/PathUtilsTest.java rename to pebble/src/test/java/io/pebbletemplates/pebble/utils/PathUtilsTest.java index b4eccfe9e..83263f5f6 100644 --- a/pebble/src/test/java/io/pebbletemplates/utils/PathUtilsTest.java +++ b/pebble/src/test/java/io/pebbletemplates/pebble/utils/PathUtilsTest.java @@ -1,4 +1,4 @@ -package io.pebbletemplates.utils; +package io.pebbletemplates.pebble.utils; import org.junit.jupiter.api.Test; diff --git a/pebble/src/test/resources/security/allowedMethods.properties b/pebble/src/test/resources/security/allowedMethods.properties index 33acca1aa..3da0505f4 100644 --- a/pebble/src/test/resources/security/allowedMethods.properties +++ b/pebble/src/test/resources/security/allowedMethods.properties @@ -2,8 +2,8 @@ java.lang.Object.toString() java.lang.Object.hashCode() java.lang.Object.equals(java.lang.Object) -io.pebbletemplates.attributes.methodaccess.Foo.getX() -io.pebbletemplates.attributes.methodaccess.Foo.setX(java.lang.String) -io.pebbletemplates.attributes.methodaccess.Foo.toString() -io.pebbletemplates.attributes.methodaccess.Foo.hashCode() -io.pebbletemplates.attributes.methodaccess.Foo.equals(java.lang.Object) \ No newline at end of file +io.pebbletemplates.pebble.attributes.methodaccess.Foo.getX() +io.pebbletemplates.pebble.attributes.methodaccess.Foo.setX(java.lang.String) +io.pebbletemplates.pebble.attributes.methodaccess.Foo.toString() +io.pebbletemplates.pebble.attributes.methodaccess.Foo.hashCode() +io.pebbletemplates.pebble.attributes.methodaccess.Foo.equals(java.lang.Object) \ No newline at end of file From 68e8c501304dbaff4537178fbfa6aee4aa14427a Mon Sep 17 00:00:00 2001 From: Eric Bussieres Date: Thu, 27 Oct 2022 18:30:01 -0400 Subject: [PATCH 3/8] Rename package from com.mitchellbosecke.pebble to io.pebbletemplates --- .../boot/autoconfigure/PebbleTemplateAvailabilityProvider.java | 3 ++- .../boot/autoconfigure/PebbleTemplateAvailabilityProvider.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java index 643c3a383..6119d8c90 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java @@ -1,5 +1,6 @@ package io.pebbletemplates.boot.autoconfigure; +import io.pebbletemplates.pebble.PebbleEngine; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider; import org.springframework.core.env.Environment; import org.springframework.core.io.ResourceLoader; @@ -12,7 +13,7 @@ public class PebbleTemplateAvailabilityProvider implements TemplateAvailabilityP @Override public boolean isTemplateAvailable(String view, Environment environment, ClassLoader classLoader, ResourceLoader resourceLoader) { - if (ClassUtils.isPresent("io.pebbletemplates.PebbleEngine", classLoader)) { + if (ClassUtils.isPresent(PebbleEngine.class.getCanonicalName(), classLoader)) { String prefix = environment.getProperty("pebble.prefix", PebbleProperties.DEFAULT_PREFIX); String suffix = environment.getProperty("pebble.suffix", PebbleProperties.DEFAULT_SUFFIX); return resourceLoader.getResource(CLASSPATH_URL_PREFIX + prefix + view + suffix).exists(); diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java index 643c3a383..6119d8c90 100644 --- a/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java +++ b/pebble-spring/pebble-spring-boot-starter/src/main/java/io/pebbletemplates/boot/autoconfigure/PebbleTemplateAvailabilityProvider.java @@ -1,5 +1,6 @@ package io.pebbletemplates.boot.autoconfigure; +import io.pebbletemplates.pebble.PebbleEngine; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider; import org.springframework.core.env.Environment; import org.springframework.core.io.ResourceLoader; @@ -12,7 +13,7 @@ public class PebbleTemplateAvailabilityProvider implements TemplateAvailabilityP @Override public boolean isTemplateAvailable(String view, Environment environment, ClassLoader classLoader, ResourceLoader resourceLoader) { - if (ClassUtils.isPresent("io.pebbletemplates.PebbleEngine", classLoader)) { + if (ClassUtils.isPresent(PebbleEngine.class.getCanonicalName(), classLoader)) { String prefix = environment.getProperty("pebble.prefix", PebbleProperties.DEFAULT_PREFIX); String suffix = environment.getProperty("pebble.suffix", PebbleProperties.DEFAULT_SUFFIX); return resourceLoader.getResource(CLASSPATH_URL_PREFIX + prefix + view + suffix).exists(); From f9ec629d246a51d924ab6d92e7e901f973dfbe0d Mon Sep 17 00:00:00 2001 From: Eric Bussieres Date: Thu, 27 Oct 2022 18:31:31 -0400 Subject: [PATCH 4/8] remove useless spring.provides file --- .../src/main/resources/META-INF/spring.provides | 1 - .../src/main/resources/META-INF/spring.provides | 1 - 2 files changed, 2 deletions(-) delete mode 100644 pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring.provides delete mode 100644 pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring.provides diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring.provides b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring.provides deleted file mode 100644 index fa6b11812..000000000 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: pebble,pebble-spring5 diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring.provides b/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring.provides deleted file mode 100644 index 8b2207cf4..000000000 --- a/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: pebble,pebble-spring6 From 3c2a0c7d9630107064c6d1d5c5ea495bb8368b56 Mon Sep 17 00:00:00 2001 From: Eric Bussieres Date: Thu, 27 Oct 2022 18:42:20 -0400 Subject: [PATCH 5/8] Adjust changelog --- README.md | 29 +++++++++---------- docs/src/orchid/resources/changelog/v3_2_0.md | 3 +- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index e2504769f..e11938b7b 100644 --- a/README.md +++ b/README.md @@ -5,22 +5,19 @@ Pebble is a java templating engine inspired by [Twig](http://twig.sensiolabs.org For more information please visit the [website](https://pebbletemplates.io). # Artifact id renaming for pebble-spring-boot-starter -As of version 3.1.0 and in order to follow this naming [recommendation](https://github.com/spring-projects/spring-boot/wiki/Building-On-Spring-Boot#naming), the artifactId of pebble-spring-boot-starter has been renamed as is: - -| Old artifactId | New artifactId | spring-boot version | -| --- |--------------------------------------------------------------------|---------------------| -| pebble-spring-boot-starter | pebble-legacy-spring-boot-starter | 2.7.x | -| pebble-spring-boot-2-starter | pebble-spring-boot-starter | 3.x.x | - -# New group id -Please note that the pebble's groupId has been updated as of version 2.5.0 -``` - - io.pebbletemplates - pebble - 3.1.6 - -``` +As of version 3.1.0 and in order to follow this naming [recommendation](https://github.com/spring-projects/spring-boot/wiki/Building-On-Spring-Boot#naming), the artifactId of pebble-spring-boot-starter has been renamed. Please +use one of the following artifactId according to the spring boot version that you are using + +| ArtifactId | spring-boot version | +|-----------------------------------|---------------------| +| pebble-legacy-spring-boot-starter | 2.7.x | +| pebble-spring-boot-starter | 3.x.x | + +# Breaking changes in version 3.2.x +- Rename package from `com.mitchellbosecke.pebble` to `io.pebbletemplates` +- Change default suffix to `.peb` instead of `.pebble` in spring boot autoconfiguration +- Rename method `getInstance` to `createInstance` in `BinaryOperator` interface (#521) + ## License diff --git a/docs/src/orchid/resources/changelog/v3_2_0.md b/docs/src/orchid/resources/changelog/v3_2_0.md index 5860b6409..73d21b960 100644 --- a/docs/src/orchid/resources/changelog/v3_2_0.md +++ b/docs/src/orchid/resources/changelog/v3_2_0.md @@ -5,4 +5,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) - **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 +- **BREAKING CHANGE**: Rename method getInstance to createInstance in BinaryOperator interface (#521) +- **BREAKING CHANGE**: Rename package from `com.mitchellbosecke.pebble` to `io.pebbletemplates` \ No newline at end of file From 35f5f8871c7ba5cedc6426e20a7a6db57388470a Mon Sep 17 00:00:00 2001 From: Eric Bussieres Date: Thu, 27 Oct 2022 18:49:36 -0400 Subject: [PATCH 6/8] Generate spring-configuration-metadata.json --- .../pebble-legacy-spring-boot-starter/pom.xml | 6 ++ .../spring-configuration-metadata.json | 99 +++++++++++++++++++ .../pebble-spring-boot-starter/pom.xml | 6 ++ .../spring-configuration-metadata.json | 99 +++++++++++++++++++ 4 files changed, 210 insertions(+) create mode 100644 pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json create mode 100644 pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/pom.xml b/pebble-spring/pebble-legacy-spring-boot-starter/pom.xml index a28628a4f..6407118eb 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/pom.xml +++ b/pebble-spring/pebble-legacy-spring-boot-starter/pom.xml @@ -35,6 +35,12 @@ pebble-spring5 ${project.version} + + org.springframework.boot + spring-boot-configuration-processor + ${boot.version} + true + diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json new file mode 100644 index 000000000..4ecb8d16d --- /dev/null +++ b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json @@ -0,0 +1,99 @@ +{ + "groups": [ + { + "name": "pebble", + "type": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + } + ], + "properties": [ + { + "name": "pebble.allow-request-override", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.allow-session-override", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.cache", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.charset", + "type": "java.nio.charset.Charset", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.check-template-location", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.content-type", + "type": "org.springframework.util.MimeType", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.default-locale", + "type": "java.util.Locale", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.enabled", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.expose-request-attributes", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.expose-session-attributes", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.expose-spring-macro-helpers", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.greedy-match-method", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", + "defaultValue": false + }, + { + "name": "pebble.prefix", + "type": "java.lang.String", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.request-context-attribute", + "type": "java.lang.String", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.strict-variables", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", + "defaultValue": false + }, + { + "name": "pebble.suffix", + "type": "java.lang.String", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.view-names", + "type": "java.lang.String[]", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + } + ], + "hints": [] +} \ No newline at end of file diff --git a/pebble-spring/pebble-spring-boot-starter/pom.xml b/pebble-spring/pebble-spring-boot-starter/pom.xml index 6bc14e0b1..8a5d5e709 100644 --- a/pebble-spring/pebble-spring-boot-starter/pom.xml +++ b/pebble-spring/pebble-spring-boot-starter/pom.xml @@ -42,6 +42,12 @@ pebble-spring6 ${project.version} + + org.springframework.boot + spring-boot-configuration-processor + ${boot.version} + true + diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json b/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json new file mode 100644 index 000000000..4ecb8d16d --- /dev/null +++ b/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json @@ -0,0 +1,99 @@ +{ + "groups": [ + { + "name": "pebble", + "type": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + } + ], + "properties": [ + { + "name": "pebble.allow-request-override", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.allow-session-override", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.cache", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.charset", + "type": "java.nio.charset.Charset", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.check-template-location", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.content-type", + "type": "org.springframework.util.MimeType", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.default-locale", + "type": "java.util.Locale", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.enabled", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.expose-request-attributes", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.expose-session-attributes", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.expose-spring-macro-helpers", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.greedy-match-method", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", + "defaultValue": false + }, + { + "name": "pebble.prefix", + "type": "java.lang.String", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.request-context-attribute", + "type": "java.lang.String", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.strict-variables", + "type": "java.lang.Boolean", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", + "defaultValue": false + }, + { + "name": "pebble.suffix", + "type": "java.lang.String", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + }, + { + "name": "pebble.view-names", + "type": "java.lang.String[]", + "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" + } + ], + "hints": [] +} \ No newline at end of file From b3f8ddfb62fe094d1131bd61f9005da3508ff036 Mon Sep 17 00:00:00 2001 From: Eric Bussieres Date: Thu, 27 Oct 2022 18:53:12 -0400 Subject: [PATCH 7/8] Generate spring-autoconfigure-metadata.properties --- .../pebble-legacy-spring-boot-starter/pom.xml | 6 ++ .../spring-configuration-metadata.json | 99 ------------------- .../pebble-spring-boot-starter/pom.xml | 6 ++ .../spring-configuration-metadata.json | 99 ------------------- 4 files changed, 12 insertions(+), 198 deletions(-) delete mode 100644 pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json delete mode 100644 pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/pom.xml b/pebble-spring/pebble-legacy-spring-boot-starter/pom.xml index 6407118eb..6fdbffd1c 100644 --- a/pebble-spring/pebble-legacy-spring-boot-starter/pom.xml +++ b/pebble-spring/pebble-legacy-spring-boot-starter/pom.xml @@ -41,6 +41,12 @@ ${boot.version} true + + org.springframework.boot + spring-boot-autoconfigure-processor + ${boot.version} + true + diff --git a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json b/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 4ecb8d16d..000000000 --- a/pebble-spring/pebble-legacy-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "groups": [ - { - "name": "pebble", - "type": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - } - ], - "properties": [ - { - "name": "pebble.allow-request-override", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.allow-session-override", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.cache", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.charset", - "type": "java.nio.charset.Charset", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.check-template-location", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.content-type", - "type": "org.springframework.util.MimeType", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.default-locale", - "type": "java.util.Locale", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.enabled", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.expose-request-attributes", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.expose-session-attributes", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.expose-spring-macro-helpers", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.greedy-match-method", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", - "defaultValue": false - }, - { - "name": "pebble.prefix", - "type": "java.lang.String", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.request-context-attribute", - "type": "java.lang.String", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.strict-variables", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", - "defaultValue": false - }, - { - "name": "pebble.suffix", - "type": "java.lang.String", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.view-names", - "type": "java.lang.String[]", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/pebble-spring/pebble-spring-boot-starter/pom.xml b/pebble-spring/pebble-spring-boot-starter/pom.xml index 8a5d5e709..ac72b7df0 100644 --- a/pebble-spring/pebble-spring-boot-starter/pom.xml +++ b/pebble-spring/pebble-spring-boot-starter/pom.xml @@ -48,6 +48,12 @@ ${boot.version} true + + org.springframework.boot + spring-boot-autoconfigure-processor + ${boot.version} + true + diff --git a/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json b/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 4ecb8d16d..000000000 --- a/pebble-spring/pebble-spring-boot-starter/src/main/resources/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "groups": [ - { - "name": "pebble", - "type": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - } - ], - "properties": [ - { - "name": "pebble.allow-request-override", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.allow-session-override", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.cache", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.charset", - "type": "java.nio.charset.Charset", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.check-template-location", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.content-type", - "type": "org.springframework.util.MimeType", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.default-locale", - "type": "java.util.Locale", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.enabled", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.expose-request-attributes", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.expose-session-attributes", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.expose-spring-macro-helpers", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.greedy-match-method", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", - "defaultValue": false - }, - { - "name": "pebble.prefix", - "type": "java.lang.String", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.request-context-attribute", - "type": "java.lang.String", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.strict-variables", - "type": "java.lang.Boolean", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties", - "defaultValue": false - }, - { - "name": "pebble.suffix", - "type": "java.lang.String", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - }, - { - "name": "pebble.view-names", - "type": "java.lang.String[]", - "sourceType": "io.pebbletemplates.boot.autoconfigure.PebbleProperties" - } - ], - "hints": [] -} \ No newline at end of file From ea52861ee5780e75f126969f6edd396edf0db61c Mon Sep 17 00:00:00 2001 From: Eric Bussieres Date: Thu, 27 Oct 2022 19:04:38 -0400 Subject: [PATCH 8/8] Adjust changelog --- README.md | 4 ++-- docs/src/orchid/resources/changelog/v3_2_0.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e11938b7b..4474bcd02 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ use one of the following artifactId according to the spring boot version that y | ArtifactId | spring-boot version | |-----------------------------------|---------------------| -| pebble-legacy-spring-boot-starter | 2.7.x | +| pebble-legacy-spring-boot-starter | 2.x.x | | pebble-spring-boot-starter | 3.x.x | # Breaking changes in version 3.2.x -- Rename package from `com.mitchellbosecke.pebble` to `io.pebbletemplates` +- Rename package from `com.mitchellbosecke` to `io.pebbletemplates` - Change default suffix to `.peb` instead of `.pebble` in spring boot autoconfiguration - Rename method `getInstance` to `createInstance` in `BinaryOperator` interface (#521) diff --git a/docs/src/orchid/resources/changelog/v3_2_0.md b/docs/src/orchid/resources/changelog/v3_2_0.md index 73d21b960..3ab95a11b 100644 --- a/docs/src/orchid/resources/changelog/v3_2_0.md +++ b/docs/src/orchid/resources/changelog/v3_2_0.md @@ -4,6 +4,6 @@ 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) -- **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) -- **BREAKING CHANGE**: Rename package from `com.mitchellbosecke.pebble` to `io.pebbletemplates` \ 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) +- **BREAKING CHANGE**: Rename package from `com.mitchellbosecke` to `io.pebbletemplates` (#635) \ No newline at end of file