Skip to content

Commit 4480e0f

Browse files
jasper-vandemallefiliphr
authored andcommitted
Fix minor typos
1 parent 2d75019 commit 4480e0f

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

documentation/src/main/asciidoc/chapter-3-defining-a-mapper.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ When there are multiple constructors then the following is done to pick the one
540540
* If a constructor is annotated with an annotation named `@Default` (from any package) it will be used.
541541
* If a single public constructor exists then it will be used to construct the object, and the other non public constructors will be ignored.
542542
* If a parameterless constructor exists then it will be used to construct the object, and the other constructors will be ignored.
543-
* If there are multiple eligible constructors then there will be a compilation error due to ambigious constructors. In order to break the ambiquity an annotation named `@Default` (from any package) can used.
543+
* If there are multiple eligible constructors then there will be a compilation error due to ambiguous constructors. In order to break the ambiguity an annotation named `@Default` (from any package) can used.
544544

545545
.Deciding which constructor to use
546546
====

documentation/src/main/asciidoc/chapter-6-mapping-collections.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public Map<Long, Date> stringStringMapToLongDateMap(Map<String, String> source)
151151

152152
MapStruct has a `CollectionMappingStrategy`, with the possible values: `ACCESSOR_ONLY`, `SETTER_PREFERRED`, `ADDER_PREFERRED` and `TARGET_IMMUTABLE`.
153153

154-
In the table below, the dash `-` indicates a property name. Next, the trailing `s` indicates the plural form. The table explains the options and how they are applied to the presence/absense of a `set-s`, `add-` and / or `get-s` method on the target object:
154+
In the table below, the dash `-` indicates a property name. Next, the trailing `s` indicates the plural form. The table explains the options and how they are applied to the presence/absence of a `set-s`, `add-` and / or `get-s` method on the target object:
155155

156156
.Collection mapping strategy options
157157
|===

documentation/src/main/asciidoc/chapter-8-mapping-values.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ MapStruct supports enum to a String mapping along the same lines as is described
155155

156156
*`String` to enum*
157157

158-
1. Similarity: All not explicit defined mappings will result in the target enum constant mapped from the `String` value when that maches the target enum constant name.
158+
1. Similarity: All not explicit defined mappings will result in the target enum constant mapped from the `String` value when that matches the target enum constant name.
159159
2. Similarity: `<ANY_UNMAPPED`> stops after handling defined mapping and proceeds to the switch/default clause value.
160160
3. Similarity: `<ANY_REMAINING>` will create a mapping for each target enum constant and proceed to the switch/default clause value.
161161
4. Difference: A switch/default value needs to be provided to have a determined outcome (enum has a limited set of values, `String` has unlimited options). Failing to specify `<ANY_REMAINING>` or `<ANY_UNMAPPED`> will result in a warning.

processor/src/test/java/org/mapstruct/ap/test/collection/adder/AdderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public void testShouldPreferHumanSingular() {
178178
}
179179

180180
@Test
181-
public void testShouldFallBackToDaliSingularInAbsenseOfHumanSingular() {
181+
public void testShouldFallBackToDaliSingularInAbsenceOfHumanSingular() {
182182
AdderUsageObserver.setUsed( false );
183183

184184
SourceTeeth source = new SourceTeeth();

processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousmapping/AmbigiousMapperTest.java renamed to processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousmapping/AmbiguousMapperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@IssueKey("2156")
1919
@RunWith(AnnotationProcessorTestRunner.class)
20-
public class AmbigiousMapperTest {
20+
public class AmbiguousMapperTest {
2121

2222
@Test
2323
@WithClasses( ErroneousWithAmbiguousMethodsMapper.class)

processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousmapping/ErroneousWithAmbiguousMethodsMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ default LeafEntity map1(LeafDTO dto) {
1919
return new LeafEntity();
2020
}
2121

22-
// duplicated method, triggering ambigious mapping method
22+
// duplicated method, triggering ambiguous mapping method
2323
default LeafEntity map2(LeafDTO dto) {
2424
return new LeafEntity();
2525
}

processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousmapping/ErroneousWithMoreThanFiveAmbiguousMethodsMapper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@ default LeafEntity map1(LeafDTO dto) {
2020
return new LeafEntity();
2121
}
2222

23-
// duplicated method, triggering ambigious mapping method
23+
// duplicated method, triggering ambiguous mapping method
2424
default LeafEntity map2(LeafDTO dto) {
2525
return new LeafEntity();
2626
}
2727

28-
// duplicated method, triggering ambigious mapping method
28+
// duplicated method, triggering ambiguous mapping method
2929
default LeafEntity map3(LeafDTO dto) {
3030
return new LeafEntity();
3131
}
3232

33-
// duplicated method, triggering ambigious mapping method
33+
// duplicated method, triggering ambiguous mapping method
3434
default LeafEntity map4(LeafDTO dto) {
3535
return new LeafEntity();
3636
}
3737

38-
// duplicated method, triggering ambigious mapping method
38+
// duplicated method, triggering ambiguous mapping method
3939

4040
default LeafEntity map5(LeafDTO dto) {
4141
return new LeafEntity();
4242
}
4343

44-
// duplicated method, triggering ambigious mapping method
44+
// duplicated method, triggering ambiguous mapping method
4545
default LeafEntity map6(LeafDTO dto) {
4646
return new LeafEntity();
4747
}

processor/src/test/java/org/mapstruct/ap/test/source/manysourcearguments/ManySourceArgumentsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public void shouldUseConfig() {
176176
line = 16,
177177
message = "Several possible source properties for target property \"description\".")
178178
})
179-
public void shouldFailToGenerateMappingsForAmbigiousSourceProperty() {
179+
public void shouldFailToGenerateMappingsForAmbiguousSourceProperty() {
180180
}
181181

182182
@Test

0 commit comments

Comments
 (0)