Skip to content

#3113 Add java LinkedHashSet, LinkedHashSet new factory methods for java >= 19 #3593

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.

Sign up for GitHub

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

Merged
filiphr merged 15 commits into from
Sep 2, 2024
Merged

#3113 Add java LinkedHashSet, LinkedHashSet new factory methods for java >= 19 #3593

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
87f61e6
#3113 Add java HashSet, HashMap, LinkedHashSet, LinkedHashSet new fac…
Obolrom May 5, 2024
9e71988
#3113 Add version information injection
Obolrom May 6, 2024
4d26b1c
#3113 Fixed version information injection
Obolrom May 7, 2024
f1e9a11
#3113 Refactored hardcoded factory method usage
Obolrom May 18, 2024
b748e0a
#3113 Fixed code style
Obolrom May 18, 2024
b047d49
#3113 Extract method name to constant
Obolrom May 23, 2024
bd307f4
#3113 Revert java LTS version CI test config
Obolrom Jun 1, 2024
1b8cd09
Polish
filiphr Jun 18, 2024
58591f1
WIP version based fixtures
filiphr Jun 18, 2024
1e929b7
#3113 Fix tests for java version 21
Obolrom Jun 19, 2024
dc06485
#3113 Fix eclipse fixtures test
Obolrom Jun 19, 2024
064a3e9
#3113 Fix generated code license
Obolrom Jun 19, 2024
832f287
Restart CI
Obolrom Jul 23, 2024
bf29109
Fix fixture for java 21
Obolrom Jul 23, 2024
e34abec
Polish
filiphr Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#3113 Extract method name to constant
  • Loading branch information
@Obolrom
Obolrom committed Aug 30, 2024
commit b047d491a7b4c534ee859976ad6f1cb4c933f322
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [17, 21]
java: [17, 19, 21]
name: 'Linux JDK ${{ matrix.java }}'
runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 4 additions & 2 deletions processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ public class TypeFactory {
sb.append( ')' );
return sb.toString();
};
private static final String LINKED_HASH_SET_FACTORY_METHOD_NAME = "newLinkedHashSet";
private static final String LINKED_HASH_MAP_FACTORY_METHOD_NAME = "newLinkedHashMap";

private final ElementUtils elementUtils;
private final TypeUtils typeUtils;
Expand Down Expand Up @@ -126,7 +128,7 @@ public TypeFactory(ElementUtils elementUtils, TypeUtils typeUtils, FormattingMes
Set.class.getName(),
withLoadFactorAdjustment(
getType( LinkedHashSet.class ),
isSourceVersionAtLeast19() ? "newLinkedHashSet" : null
isSourceVersionAtLeast19() ? LINKED_HASH_SET_FACTORY_METHOD_NAME : null
)
);
implementationTypes.put( SortedSet.class.getName(), withDefaultConstructor( getType( TreeSet.class ) ) );
Expand All @@ -136,7 +138,7 @@ public TypeFactory(ElementUtils elementUtils, TypeUtils typeUtils, FormattingMes
Map.class.getName(),
withLoadFactorAdjustment(
getType( LinkedHashMap.class ),
isSourceVersionAtLeast19() ? "newLinkedHashMap" : null
isSourceVersionAtLeast19() ? LINKED_HASH_MAP_FACTORY_METHOD_NAME : null
)
);
implementationTypes.put( SortedMap.class.getName(), withDefaultConstructor( getType( TreeMap.class ) ) );
Expand Down