Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable ReflectionResolver to resolve map keys #138

Closed
wants to merge 55 commits into from

Conversation

AntonOellerer
Copy link
Contributor

@AntonOellerer AntonOellerer commented Apr 13, 2022

This commit adds the functionality s.t. the jocument can resolve placeholders referencing map keys.
It has been integrated into the reflection-based resolvers

Related to https://app.shortcut.com/ddsg/story/4792/implement-dataset-block-for-xlsx-reports

AntonOellerer and others added 30 commits December 21, 2021 10:21
To be able to do more complex operations,
`CustomPlaceholderResolver` is refactored to also
receive the bean of the resolver
To be able to do more complex operations,
`CustomPlaceholderResolver` is refactored to also
receive the bean of the resolver
To be able to use the util functions in packages
utilizing jocument, the methods to figure out the
type and the dimensions of a picture have been made
public.
Also fix usage of deprecated flag
If we have a custom placeholder, which is a set,
jocument would attempt to unroll it before it
does the custom placeholder resolving
…nResolver

Before falling back on the mappings for reflection placeholders we first probe
if the placeholder name can be directly accessed. If so, we resolve it  right
away, otherwise we fallback.
…o feature/placeholder-mapping

# Conflicts:
#	build.gradle
#	src/main/java/com/docutools/jocument/PlaceholderMapper.java
#	src/main/java/com/docutools/jocument/impl/FutureReflectionResolver.java
#	src/main/java/com/docutools/jocument/impl/PlaceholderMapperImpl.java
#	src/main/java/com/docutools/jocument/impl/ReflectionResolver.java
…nResolver

Before falling back on the mappings for reflection placeholders we first probe
if the placeholder name can be directly accessed. If so, we resolve it  right
away, otherwise we fallback.
* Remove incorrect logging statement in
  `TemplateImpl`
* Close document in finally in `ExcelDocumentImpl`
* Use `@Image` annotation for test case
* Cleanup `TemplateLoading.java`
…Ex Placeholder Matching

The MatcherPlaceholder-Annotation Allows to define a regular expression pattern for a method
to be resolved in a ReflectionResolver if the placeholder name passed to `ReflectionResolver#resolve(String, Locale)`
matches against the pattern.
Issues with deployment of .16.
@AntonOellerer AntonOellerer added the enhancement New feature or request label Apr 13, 2022
@AntonOellerer AntonOellerer requested a review from betorcs April 13, 2022 14:04
@AntonOellerer AntonOellerer self-assigned this Apr 13, 2022
@AntonOellerer AntonOellerer changed the title Enable ReflectionResolver to resolve map keys WIPÖ Enable ReflectionResolver to resolve map keys Apr 13, 2022
@AntonOellerer AntonOellerer changed the title WIPÖ Enable ReflectionResolver to resolve map keys WIP: Enable ReflectionResolver to resolve map keys Apr 13, 2022
@AntonOellerer AntonOellerer marked this pull request as draft April 13, 2022 14:33
@AntonOellerer AntonOellerer removed the request for review from betorcs April 13, 2022 14:33
@AntonOellerer AntonOellerer changed the title WIP: Enable ReflectionResolver to resolve map keys Enable ReflectionResolver to resolve map keys Apr 13, 2022
@AntonOellerer AntonOellerer requested a review from betorcs April 13, 2022 15:00
@AntonOellerer AntonOellerer marked this pull request as ready for review April 13, 2022 15:00
@AntonOellerer AntonOellerer force-pushed the feature/placeholder-mapping branch from 61a3f13 to a2f4003 Compare May 9, 2022 12:25
Base automatically changed from feature/placeholder-mapping to master May 17, 2022 08:53
@AntonOellerer
Copy link
Contributor Author

not needed for now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants