Skip to content

#2788 unmapped source properties message improved for forged methods #3522

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 8 commits into from
Feb 11, 2024
Merged

#2788 unmapped source properties message improved for forged methods #3522

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6106d1
#2788 unmapped source properties for forgedMethods now contains infor…
Feb 8, 2024
31045a0
#2788 Removed incorrect test location.
Feb 11, 2024
b05359e
#2788 introduced tests at DottedErrorMessageTest. (1/2 due to renames)
Feb 11, 2024
41110bb
#2788 introduced tests at DottedErrorMessageTest. (2/2 due to renames)
Feb 11, 2024
efa7d79
#2788 fixed line length and UnmappableTarget's still assume source pr…
Feb 11, 2024
275c840
Update processor/src/main/java/org/mapstruct/ap/internal/model/BeanMa…
Zegveld Feb 11, 2024
11a1e14
Update processor/src/main/java/org/mapstruct/ap/internal/model/BeanMa…
Zegveld Feb 11, 2024
394cb01
#2788 added issuekey annotations
Feb 11, 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
#2788 introduced tests at DottedErrorMessageTest. (1/2 due to renames)
  • Loading branch information
Ben Zegveld authored and Ben Zegveld committed Feb 11, 2024
commit b05359e11d17767a7ba413060083352e16932234
277 changes: 225 additions & 52 deletions processor/src/test/java/org/mapstruct/ap/test/nestedbeans/DottedErrorMessageTest.java
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions ...est/nestedbeans/unmappable/erroneous/UnmappableSourceCollectionElementPropertyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.erroneous;

import static org.mapstruct.ReportingPolicy.ERROR;
import static org.mapstruct.ReportingPolicy.IGNORE;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseCollectionElementPropertyMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = IGNORE, unmappedSourcePolicy = ERROR )
public abstract class UnmappableSourceCollectionElementPropertyMapper extends BaseCollectionElementPropertyMapper {
}
17 changes: 17 additions & 0 deletions ...rg/mapstruct/ap/test/nestedbeans/unmappable/erroneous/UnmappableSourceDeepListMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.erroneous;

import static org.mapstruct.ReportingPolicy.ERROR;
import static org.mapstruct.ReportingPolicy.IGNORE;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseDeepListMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = IGNORE, unmappedSourcePolicy = ERROR )
public abstract class UnmappableSourceDeepListMapper extends BaseDeepListMapper {
}
17 changes: 17 additions & 0 deletions .../mapstruct/ap/test/nestedbeans/unmappable/erroneous/UnmappableSourceDeepMapKeyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.erroneous;

import static org.mapstruct.ReportingPolicy.ERROR;
import static org.mapstruct.ReportingPolicy.IGNORE;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseDeepMapKeyMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = IGNORE, unmappedSourcePolicy = ERROR )
public abstract class UnmappableSourceDeepMapKeyMapper extends BaseDeepMapKeyMapper {
}
17 changes: 17 additions & 0 deletions ...apstruct/ap/test/nestedbeans/unmappable/erroneous/UnmappableSourceDeepMapValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.erroneous;

import static org.mapstruct.ReportingPolicy.ERROR;
import static org.mapstruct.ReportingPolicy.IGNORE;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseDeepMapValueMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = IGNORE, unmappedSourcePolicy = ERROR )
public abstract class UnmappableSourceDeepMapValueMapper extends BaseDeepMapValueMapper {
}
17 changes: 17 additions & 0 deletions ...mapstruct/ap/test/nestedbeans/unmappable/erroneous/UnmappableSourceDeepNestingMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.erroneous;

import static org.mapstruct.ReportingPolicy.ERROR;
import static org.mapstruct.ReportingPolicy.IGNORE;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseDeepNestingMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = IGNORE, unmappedSourcePolicy = ERROR )
public abstract class UnmappableSourceDeepNestingMapper extends BaseDeepNestingMapper {
}
2 changes: 1 addition & 1 deletion ...pable/erroneous/UnmappableEnumMapper.java → ...erroneous/UnmappableSourceEnumMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.mapstruct.ap.test.nestedbeans.unmappable.UserDto;

@Mapper
public abstract class UnmappableEnumMapper {
public abstract class UnmappableSourceEnumMapper {

abstract UserDto userToUserDto(User user);

Expand Down
17 changes: 17 additions & 0 deletions ...pstruct/ap/test/nestedbeans/unmappable/erroneous/UnmappableSourceValuePropertyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.erroneous;

import static org.mapstruct.ReportingPolicy.ERROR;
import static org.mapstruct.ReportingPolicy.IGNORE;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseValuePropertyMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = IGNORE, unmappedSourcePolicy = ERROR )
public abstract class UnmappableSourceValuePropertyMapper extends BaseValuePropertyMapper {
}
2 changes: 1 addition & 1 deletion ...pableCollectionElementPropertyMapper.java → ...argetCollectionElementPropertyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR)
public abstract class UnmappableCollectionElementPropertyMapper extends BaseCollectionElementPropertyMapper {
public abstract class UnmappableTargetCollectionElementPropertyMapper extends BaseCollectionElementPropertyMapper {
}
2 changes: 1 addition & 1 deletion ...e/erroneous/UnmappableDeepListMapper.java → ...neous/UnmappableTargetDeepListMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR)
public abstract class UnmappableDeepListMapper extends BaseDeepListMapper {
public abstract class UnmappableTargetDeepListMapper extends BaseDeepListMapper {
}
2 changes: 1 addition & 1 deletion ...erroneous/UnmappableDeepMapKeyMapper.java → ...ous/UnmappableTargetDeepMapKeyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR)
public abstract class UnmappableDeepMapKeyMapper extends BaseDeepMapKeyMapper {
public abstract class UnmappableTargetDeepMapKeyMapper extends BaseDeepMapKeyMapper {
}
2 changes: 1 addition & 1 deletion ...roneous/UnmappableDeepMapValueMapper.java → ...s/UnmappableTargetDeepMapValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR)
public abstract class UnmappableDeepMapValueMapper extends BaseDeepMapValueMapper {
public abstract class UnmappableTargetDeepMapValueMapper extends BaseDeepMapValueMapper {
}
4 changes: 2 additions & 2 deletions ...rroneous/UnmappableDeepNestingMapper.java → ...us/UnmappableTargetDeepNestingMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseDeepNestingMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR)
public abstract class UnmappableDeepNestingMapper extends BaseDeepNestingMapper {
@Mapper(uses = RoofTypeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR, unmappedSourcePolicy = ReportingPolicy.IGNORE)
public abstract class UnmappableTargetDeepNestingMapper extends BaseDeepNestingMapper {
}
2 changes: 1 addition & 1 deletion ...oneous/UnmappableValuePropertyMapper.java → .../UnmappableTargetValuePropertyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class, unmappedTargetPolicy = ReportingPolicy.ERROR)
public abstract class UnmappableValuePropertyMapper extends BaseValuePropertyMapper {
public abstract class UnmappableTargetValuePropertyMapper extends BaseValuePropertyMapper {
}
7 changes: 5 additions & 2 deletions ...eWarnCollectionElementPropertyMapper.java → ...tWarnCollectionElementPropertyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.warn;

import static org.mapstruct.ReportingPolicy.IGNORE;
import static org.mapstruct.ReportingPolicy.WARN;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseCollectionElementPropertyMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class)
public abstract class UnmappableWarnCollectionElementPropertyMapper extends BaseCollectionElementPropertyMapper {
@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = WARN, unmappedSourcePolicy = IGNORE )
public abstract class UnmappableTargetWarnCollectionElementPropertyMapper extends BaseCollectionElementPropertyMapper {
}
7 changes: 5 additions & 2 deletions ...le/warn/UnmappableWarnDeepListMapper.java → ...n/UnmappableTargetWarnDeepListMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.warn;

import static org.mapstruct.ReportingPolicy.IGNORE;
import static org.mapstruct.ReportingPolicy.WARN;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseDeepListMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class)
public abstract class UnmappableWarnDeepListMapper extends BaseDeepListMapper {
@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = WARN, unmappedSourcePolicy = IGNORE )
public abstract class UnmappableTargetWarnDeepListMapper extends BaseDeepListMapper {
}
7 changes: 5 additions & 2 deletions .../warn/UnmappableWarnDeepMapKeyMapper.java → ...UnmappableTargetWarnDeepMapKeyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.warn;

import static org.mapstruct.ReportingPolicy.IGNORE;
import static org.mapstruct.ReportingPolicy.WARN;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseDeepMapKeyMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class)
public abstract class UnmappableWarnDeepMapKeyMapper extends BaseDeepMapKeyMapper {
@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = WARN, unmappedSourcePolicy = IGNORE )
public abstract class UnmappableTargetWarnDeepMapKeyMapper extends BaseDeepMapKeyMapper {
}
7 changes: 5 additions & 2 deletions ...arn/UnmappableWarnDeepMapValueMapper.java → ...mappableTargetWarnDeepMapValueMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.warn;

import static org.mapstruct.ReportingPolicy.IGNORE;
import static org.mapstruct.ReportingPolicy.WARN;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseDeepMapValueMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class)
public abstract class UnmappableWarnDeepMapValueMapper extends BaseDeepMapValueMapper {
@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = WARN, unmappedSourcePolicy = IGNORE )
public abstract class UnmappableTargetWarnDeepMapValueMapper extends BaseDeepMapValueMapper {
}
7 changes: 5 additions & 2 deletions ...warn/UnmappableWarnDeepNestingMapper.java → ...nmappableTargetWarnDeepNestingMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.warn;

import static org.mapstruct.ReportingPolicy.IGNORE;
import static org.mapstruct.ReportingPolicy.WARN;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseDeepNestingMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class)
public abstract class UnmappableWarnDeepNestingMapper extends BaseDeepNestingMapper {
@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = WARN, unmappedSourcePolicy = IGNORE )
public abstract class UnmappableTargetWarnDeepNestingMapper extends BaseDeepNestingMapper {
}
7 changes: 5 additions & 2 deletions ...rn/UnmappableWarnValuePropertyMapper.java → ...appableTargetWarnValuePropertyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
*/
package org.mapstruct.ap.test.nestedbeans.unmappable.warn;

import static org.mapstruct.ReportingPolicy.IGNORE;
import static org.mapstruct.ReportingPolicy.WARN;

import org.mapstruct.Mapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.BaseValuePropertyMapper;
import org.mapstruct.ap.test.nestedbeans.unmappable.RoofTypeMapper;

@Mapper(uses = RoofTypeMapper.class)
public abstract class UnmappableWarnValuePropertyMapper extends BaseValuePropertyMapper {
@Mapper( uses = RoofTypeMapper.class, unmappedTargetPolicy = WARN, unmappedSourcePolicy = IGNORE )
public abstract class UnmappableTargetWarnValuePropertyMapper extends BaseValuePropertyMapper {
}