mapstruct/mapstruct-users

Hi there!
So now I am dealing with a legacy codebase which uses mapstruct 1.2.0.Final and I am trying to upgrade it to 1.4.2.Final. So with the 1.4.2.Final I am having the problem that generated mapper for AddressDto extends wrong class.

@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder(toBuilder = true)
public class CountryDto {
    String name;
    String code;

    @Mapper
    @Component
    public interface Converter {
        CountryDto convert(Country from);

        default List<CountryDto> convert(List<Country> from) {
            if (from == null) {
                return null;
            }
            return from.map(this::convert);
        }

        default List<Country> reverseConvert(List<CountryDto> from) {
            if (from == null) {
                return null;
            }
            return from.map(this::reverseConvert);
        }

        default Country reverseConvert(CountryDto from) {
            if (from == null) {
                return null;
            }
            return Country.builder()
                    .name(from.getName())
                    .code(from.getCode())
                    .build();
        }
    }
}

@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder(toBuilder = true)
public class AddressDto {
    CountryDto country;
    String zipCode;
    String city;
    String street;
    String houseNumber;
    String apartmentNumber;

    @Component
    @Mapper(uses = CountryDto.Converter.class)
    public static abstract class Converter {

        @Autowired
        private CountryDto.Converter countryMapper;

        public Address reverseConvert(AddressDto from) {
            if (from == null) {
                return null;
            }
            return Address.builder()
                    .country(null)
                    .zipCode(from.zipCode)
                    .city(from.city)
                    .street(from.street)
                    .houseNumber(from.houseNumber)
                    .apartmentNumber(from.apartmentNumber)
                    .country(countryMapper.reverseConvert(from.country))
                    .build();
        }

        public abstract AddressDto convert(Address address);
    }
}

So here is the generated mapper for AddressDto and as you can see it extends CountryDto.Converter but it should extend AddressDto.Converter. So what do think will be the best approach to resolve this issue? Maybe there can be done some configuration for mapstruct?

import vlo.domain.rest.controller.products.common.dto.CountryDto.Converter;

@Generated(
    value = "org.mapstruct.ap.MappingProcessor"
)
@Component
public class AddressDto$ConverterImpl extends Converter {

    @Autowired
    private Converter converter;

    @Override
    public AddressDto convert(Address address) {
        if ( address == null ) {
            return null;
        }

        AddressDto addressDto = new AddressDto();

        addressDto.setCountry( converter.convert( address.getCountry() ) );
        addressDto.setZipCode( address.getZipCode() );
        addressDto.setCity( address.getCity() );
        addressDto.setStreet( address.getStreet() );
        addressDto.setHouseNumber( address.getHouseNumber() );
        addressDto.setApartmentNumber( address.getApartmentNumber() );

        return addressDto;
    }
}