AnkitaAdvitot · Oct 2, 2026
diff --git a/documentation/src/main/asciidoc/chapter-3-defining-a-mapper.asciidoc b/documentation/src/main/asciidoc/chapter-3-defining-a-mapper.asciidoc
@@ -710,7 +710,7 @@ public Optional<ProductDto> map(Optional<Product> product) {
         return Optional.empty();
     }
 
-    Product productValue = product.get();
+    Product productValue = product.orElseThrow();
 
     ProductDto productDto = new ProductDto();
 
@@ -734,7 +734,7 @@ public ProductDto unwrap(Optional<Product> product) {
         return null;
     }
 
-    Product productValue = product.get();
+    Product productValue = product.orElseThrow();
 
     ProductDto productDto = new ProductDto();
 
@@ -822,10 +822,10 @@ public class CarMapperImpl implements CarMapper {
         CarDto carDto = new CarDto();
 
         if ( car.getMake().isPresent() ) {
-            carDto.setManufacturer( car.getMake().get() );
+            carDto.setManufacturer( car.getMake().orElseThrow() );
         }
         if ( car.getNumberOfSeats().isPresent() ) {
-            carDto.setSeatCount( car.getNumberOfSeats().get() );
+            carDto.setSeatCount( car.getNumberOfSeats().orElseThrow() );
         }
         carDto.setDriver( personToPersonDto( car.getDriver() ) );
 
@@ -886,10 +886,10 @@ public void updateProduct(ProductUpdateDto dto, Product product) {
     }
 
     if ( dto.getName().isPresent() ) {
-        product.setName( dto.getName().get() );
+        product.setName( dto.getName().orElseThrow() );
     }
     if ( dto.getPrice().isPresent() ) {
-        product.setPrice( dto.getPrice().get() );
+        product.setPrice( dto.getPrice().orElseThrow() );
     }
 }
 ----
@@ -985,7 +985,7 @@ public Optional<PersonDto> map(Optional<Person> person) {
         return Optional.empty();
     }
 
-    Person personValue = person.get();
+    Person personValue = person.orElseThrow();
 
     PersonDto.Builder builder = PersonDto.builder();
 

diff --git a/...src/main/java/org/mapstruct/ap/internal/conversion/OptionalWrapperConversionProvider.java b/...src/main/java/org/mapstruct/ap/internal/conversion/OptionalWrapperConversionProvider.java
@@ -15,6 +15,7 @@
 import org.mapstruct.ap.internal.model.common.FieldReference;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
+import org.mapstruct.ap.internal.version.VersionInformation;
 
 /**
  * A conversion provider that wraps / unwraps the underlying conversion in Optional.
@@ -39,7 +40,11 @@ public Assignment to(ConversionContext conversionContext) {
     @Override
     public Assignment from(ConversionContext conversionContext) {
         Assignment assignment = conversionProvider.to( new OptionalConversionContext( conversionContext ) );
-        return new FromOptionalTypeConversion( conversionContext.getSourceType(), assignment );
+        return new FromOptionalTypeConversion(
+            conversionContext.getSourceType(),
+            assignment,
+            conversionContext.getVersionInformation()
+        );
     }
 
     @Override
@@ -96,5 +101,10 @@ public String getLocale() {
         public TypeFactory getTypeFactory() {
             return delegate.getTypeFactory();
         }
+
+        @Override
+        public VersionInformation getVersionInformation() {
+            return delegate.getVersionInformation();
+        }
     }
 }
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/TypeToOptionalConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/TypeToOptionalConversion.java
@@ -36,11 +36,14 @@ protected Set<Type> getToConversionImportTypes(ConversionContext conversionConte
 
     @Override
     protected String getFromExpression(ConversionContext conversionContext) {
-        StringBuilder sb = new StringBuilder("<SOURCE>.get");
         Type optionalBaseType = conversionContext.getSourceType().getOptionalBaseType();
         if ( optionalBaseType.isPrimitive() ) {
-            sb.append( "As" ).append( Strings.capitalize( optionalBaseType.getName() ) );
+            return "<SOURCE>.getAs" + Strings.capitalize( optionalBaseType.getName() ) + "()";
         }
-        return sb.append( "()" ).toString();
+        if ( conversionContext.getVersionInformation() != null &&
+            conversionContext.getVersionInformation().isSourceVersionAtLeast10() ) {
+            return "<SOURCE>.orElseThrow()";
+        }
+        return "<SOURCE>.get()";
     }
 }
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java
@@ -71,6 +71,7 @@
 import org.mapstruct.ap.internal.util.accessor.PresenceCheckAccessor;
 import org.mapstruct.ap.internal.util.accessor.ReadAccessor;
 import org.mapstruct.ap.internal.util.kotlin.KotlinMetadata;
+import org.mapstruct.ap.internal.version.VersionInformation;
 
 import static org.mapstruct.ap.internal.model.beanmapping.MappingReferences.forSourceMethod;
 import static org.mapstruct.ap.internal.util.Collections.first;
@@ -108,6 +109,7 @@ public class BeanMappingMethod extends NormalTypeMappingMethod {
     private final List<LifecycleCallbackMethodReference> afterMappingReferencesWithOptionalReturnType;
     private final Type subclassExhaustiveException;
     private final Map<String, Parameter> sourceParametersReassignments;
+    private final VersionInformation versionInformation;
 
     private final MappingReferences mappingReferences;
 
@@ -396,7 +398,8 @@ else if ( !method.isUpdateMethod() ) {
                         ParameterBinding.fromParameter( parameter ) :
                         ParameterBinding.fromTypeAndName(
                             parameter.getType(),
-                            parameter.getOriginalName() + ".get()"
+                            parameter.getOriginalName() + ( ctx.getVersionInformation().isSourceVersionAtLeast10() ?
+                                ".orElseThrow()" : ".get()" )
                         ) )
                     .collect( Collectors.toList() );
             List<LifecycleCallbackMethodReference> afterMappingMethods = LifecycleMethodResolver.afterMappingMethods(
@@ -542,7 +545,8 @@ else if ( !method.isUpdateMethod() ) {
                 subclasses,
                 presenceChecksByParameter,
                 subclassExhaustiveExceptionType,
-                sourceParametersReassignments
+                sourceParametersReassignments,
+                ctx.getVersionInformation()
             );
         }
 
@@ -2131,8 +2135,9 @@ private BeanMappingMethod(Method method,
                               MappingReferences mappingReferences,
                               List<SubclassMapping> subclassMappings,
                               Map<String, PresenceCheck> presenceChecksByParameter,
-                              Type subclassExhaustiveException,
-                              Map<String, Parameter> sourceParametersReassignments
+                               Type subclassExhaustiveException,
+                              Map<String, Parameter> sourceParametersReassignments,
+                              VersionInformation versionInformation
     ) {
         super(
             method,
@@ -2206,6 +2211,7 @@ else if ( sourceParameterNames.contains( mapping.getSourceBeanName() ) ) {
             : null;
         this.subclassMappings = subclassMappings;
         this.sourceParametersReassignments = sourceParametersReassignments;
+        this.versionInformation = versionInformation;
     }
 
     public Type getSubclassExhaustiveException() {
@@ -2412,4 +2418,8 @@ public boolean equals(Object obj) {
 
         return true;
     }
+
+    public VersionInformation getVersionInformation() {
+        return versionInformation;
+    }
 }
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/FromOptionalTypeConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/model/FromOptionalTypeConversion.java
@@ -13,6 +13,7 @@
 import org.mapstruct.ap.internal.model.common.ModelElement;
 import org.mapstruct.ap.internal.model.common.PresenceCheck;
 import org.mapstruct.ap.internal.model.common.Type;
+import org.mapstruct.ap.internal.version.VersionInformation;
 
 /**
  * An inline conversion from an optional source to it's value.
@@ -23,10 +24,17 @@ public class FromOptionalTypeConversion extends ModelElement implements Assignme
 
     private final Assignment conversionAssignment;
     private final Type optionalType;
+    private final VersionInformation versionInformation;
 
     public FromOptionalTypeConversion(Type optionalType, Assignment conversionAssignment) {
+        this( optionalType, conversionAssignment, null );
+    }
+
+    public FromOptionalTypeConversion(Type optionalType, Assignment conversionAssignment,
+                                      VersionInformation versionInformation) {
         this.conversionAssignment = conversionAssignment;
         this.optionalType = optionalType;
+        this.versionInformation = versionInformation;
     }
 
     @Override
@@ -95,7 +103,9 @@ public String getSourceParameterName() {
 
     @Override
     public void setAssignment(Assignment assignment) {
-        this.conversionAssignment.setAssignment( new OptionalGetWrapper( assignment, optionalType ) );
+        this.conversionAssignment.setAssignment(
+            new OptionalGetWrapper( assignment, optionalType, versionInformation )
+        );
     }
 
     @Override

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/NestedPropertyMappingMethod.java
@@ -92,7 +92,9 @@ public NestedPropertyMappingMethod build() {
 
                     presenceCheck = getPresenceCheck( propertyEntry, optionalValueSafeName );
 
-                    String optionalValueSource = previousPropertyName + ".get()";
+                    String optionalValueSource = previousPropertyName + (
+                        ctx.getVersionInformation().isSourceVersionAtLeast10() ? ".orElseThrow()" : ".get()"
+                    );
                     boolean doesNotNeedFollowUpProperty = false;
                     if ( i == propertyEntries.size() - 1 ) {
                         // If this is the last property, and we do not have a presence check,

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java
@@ -907,7 +907,9 @@ private PresenceCheck getSourcePresenceCheckerRef(SourceReference sourceReferenc
                                     variableName,
                                     ctx.getVersionInformation()
                                 ) );
-                                variableName = variableName + ".get()";
+                                variableName = variableName + (
+                                    ctx.getVersionInformation().isSourceVersionAtLeast10() ? ".orElseThrow()" : ".get()"
+                                );
                             }
                             else {
                                 presenceChecks.add( new NullPresenceCheck( variableName ) );

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/OptionalGetWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/OptionalGetWrapper.java
@@ -8,6 +8,7 @@
 import org.mapstruct.ap.internal.model.common.Assignment;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.util.Strings;
+import org.mapstruct.ap.internal.version.VersionInformation;
 
 /**
  * Decorates the assignment as an {@link java.util.Optional#get()} call.
@@ -17,19 +18,33 @@
 public class OptionalGetWrapper extends AssignmentWrapper {
 
     private final Type optionalType;
+    private final VersionInformation versionInformation;
 
     public OptionalGetWrapper(Assignment decoratedAssignment, Type optionalType) {
+        this( decoratedAssignment, optionalType, null );
+    }
+
+    public OptionalGetWrapper(Assignment decoratedAssignment, Type optionalType,
+                              VersionInformation versionInformation) {
         super( decoratedAssignment, false );
         this.optionalType = optionalType;
+        this.versionInformation = versionInformation;
     }
 
     public Type getOptionalType() {
         return optionalType;
     }
 
+    public VersionInformation getVersionInformation() {
+        return versionInformation;
+    }
+
     @Override
     public String toString() {
         if ( optionalType.getFullyQualifiedName().equals( "java.util.Optional" ) ) {
+            if ( versionInformation != null && versionInformation.isSourceVersionAtLeast10() ) {
+                return getAssignment() + ".orElseThrow()";
+            }
             return getAssignment() + ".get()";
         }
         return getAssignment() + ".getAs" + Strings.capitalize( optionalType.getOptionalBaseType().getName() ) + "()";

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/ConversionContext.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/ConversionContext.java
@@ -7,6 +7,8 @@
 
 import java.util.Date;
 
+import org.mapstruct.ap.internal.version.VersionInformation;
+
 /**
  * Context object passed to conversion providers and built-in methods.
  *
@@ -43,4 +45,7 @@ public interface ConversionContext {
 
     TypeFactory getTypeFactory();
 
+    default VersionInformation getVersionInformation() {
+        return null;
+    }
 }
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/DefaultConversionContext.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DefaultConversionContext.java
@@ -7,6 +7,7 @@
 
 import org.mapstruct.ap.internal.util.FormattingMessager;
 import org.mapstruct.ap.internal.util.Strings;
+import org.mapstruct.ap.internal.version.VersionInformation;
 
 /**
  * Default implementation of the {@link ConversionContext} passed to conversion providers.
@@ -23,9 +24,16 @@ public class DefaultConversionContext implements ConversionContext {
     private final String numberFormat;
     private final String locale;
     private final TypeFactory typeFactory;
+    private final VersionInformation versionInformation;
 
     public DefaultConversionContext(TypeFactory typeFactory, FormattingMessager messager, Type sourceType,
                                     Type targetType, FormattingParameters formattingParameters) {
+        this( typeFactory, messager, sourceType, targetType, formattingParameters, null );
+    }
+
+    public DefaultConversionContext(TypeFactory typeFactory, FormattingMessager messager, Type sourceType,
+                                    Type targetType, FormattingParameters formattingParameters,
+                                    VersionInformation versionInformation) {
         this.typeFactory = typeFactory;
         this.messager = messager;
         this.sourceType = sourceType;
@@ -34,6 +42,7 @@ public DefaultConversionContext(TypeFactory typeFactory, FormattingMessager mess
         this.dateFormat = this.formattingParameters.getDate();
         this.numberFormat = this.formattingParameters.getNumber();
         this.locale = this.formattingParameters.getLocale();
+        this.versionInformation = versionInformation;
         validateDateFormat();
     }
 
@@ -89,4 +98,9 @@ public TypeFactory getTypeFactory() {
     protected FormattingMessager getMessager() {
         return messager;
     }
+
+    @Override
+    public VersionInformation getVersionInformation() {
+        return versionInformation;
+    }
 }
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/DefaultVersionInformation.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/DefaultVersionInformation.java
@@ -40,6 +40,7 @@ public class DefaultVersionInformation implements VersionInformation {
     private final String runtimeVendor;
     private final String compiler;
     private final boolean sourceVersionAtLeast9;
+    private final boolean sourceVersionAtLeast10;
     private final boolean sourceVersionAtLeast11;
     private final boolean sourceVersionAtLeast14;
     private final boolean sourceVersionAtLeast19;
@@ -55,6 +56,7 @@ public class DefaultVersionInformation implements VersionInformation {
         this.javac = compiler.startsWith( COMPILER_NAME_JAVAC );
         // If the difference between the source version and RELEASE_6 is more that 2 than we are at least on 9
         this.sourceVersionAtLeast9 = sourceVersion.compareTo( SourceVersion.RELEASE_6 ) > 2;
+        this.sourceVersionAtLeast10 = sourceVersion.compareTo( SourceVersion.RELEASE_6 ) > 3;
         this.sourceVersionAtLeast11 = sourceVersion.compareTo( SourceVersion.RELEASE_6 ) > 4;
         this.sourceVersionAtLeast14 = sourceVersion.compareTo( SourceVersion.RELEASE_6 ) > 7;
         this.sourceVersionAtLeast19 = sourceVersion.compareTo( SourceVersion.RELEASE_6 ) > 12;
@@ -85,6 +87,11 @@ public boolean isSourceVersionAtLeast9() {
         return sourceVersionAtLeast9;
     }
 
+    @Override
+    public boolean isSourceVersionAtLeast10() {
+        return sourceVersionAtLeast10;
+    }
+
     @Override
     public boolean isSourceVersionAtLeast11() {
         return sourceVersionAtLeast11;

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java
@@ -132,7 +132,8 @@ public Mapper process(ProcessorContext context, TypeElement mapperTypeElement, L
                 typeFactory,
                 new ArrayList<>( sourceModel ),
                 mapperReferences,
-                options.isVerbose()
+                options.isVerbose(),
+                versionInformation
             ),
             mapperTypeElement,
             //sourceModel is passed only to fetch the after/before mapping methods in lifecycleCallbackFactory;