GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — use diamond operator for collections and maps on SetterWrapperForCollectionsAndMapsWithNullCheck by hduelme · Pull Request #4026 · mapstruct/mapstruct

Conversation

@hduelme

@hduelme hduelme commented Mar 29, 2026

Copy link
Copy Markdown
Contributor

In #3994 I found that MapStruct currently generates invalide copy constructors when trying to map from Collection/Map with <? extends T> or <? super T> bounds to itself.

I fixed the issue by using the diamond operator for SetterWrapperForCollectionsAndMapsWithNullCheck on the constructor.

I found that the same issue is present in ExistingInstanceSetterWrapperForCollectionsAndMaps.ftl. I didn't include that in this PR, as MapStruct tries to use addAll(Collection<? extends E> c)/putAll(Map<? extends K, ? extends V> m). It is impossible to add a super bounded to to an extend bounded one, example

if ( extendTypes.getSimpleObjectsCollection() != null ) {
        Collection<? super SimpleObject> collection = types.getSimpleObjectsCollection();
        if ( collection != null ) {
            extendTypes.getSimpleObjectsCollection().clear();
            extendTypes.getSimpleObjectsCollection().addAll( collection ); // Error
        }
    }
    else {
        Collection<? super SimpleObject> collection = types.getSimpleObjectsCollection();
        if ( collection != null ) {
            extendTypes.setSimpleObjectsCollection( new ArrayList<SimpleObject>( collection ) );
        }
    }
}

I am not sure what the correct solution would be:

  • Only override the values with a copy constructor (linke in the else branch)
  • Reject the complete mapping as impossible

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
hduelme added 2 commits March 30, 2026 01:00
@hduelme
use diamond operator for collections and maps on SetterWrapperForColl…
d36bdff
…ectionsAndMapsWithNullCheck
@hduelme
use diamond operator for collections and maps on SetterWrapperForColl…
231b8d5
…ectionsAndMapsWithNullCheck
@filiphr filiphr added this to the 1.7.0.Beta2 milestone Apr 6, 2026
@filiphr filiphr added the enhancement label Apr 6, 2026
@filiphr filiphr mentioned this pull request May 1, 2026
#1018 Use diamond operator for new expressions in generated code #4045
Merged
@filiphr

filiphr commented May 1, 2026

Copy link
Copy Markdown
Member

@hduelme I went down a rabbit hole while reviewing his one and I came up with #4045, which finally makes #1018 possible. I'll close this one in favor of the new PR. Please feel free to review the PR and let me know what you think

thunderhook reacted with rocket emoji
All reactions
  • 🚀 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@filiphr filiphr closed this May 1, 2026
@filiphr filiphr removed this from the 1.7.0.Beta2 milestone May 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

enhancement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

2 participants

@hduelme @filiphr
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.