Skip to content

Commit 236651b

Browse files
authored
feat(core): make caption formatters accept a list instead of a collection, some things may rely on order (#681)
1 parent b806e1b commit 236651b

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

cloud-core/src/main/java/org/incendo/cloud/caption/CaptionFormatter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
package org.incendo.cloud.caption;
2525

2626
import java.util.Arrays;
27-
import java.util.Collection;
2827
import java.util.HashMap;
28+
import java.util.List;
2929
import java.util.Map;
3030
import java.util.regex.Matcher;
3131
import java.util.regex.Pattern;
@@ -102,7 +102,7 @@ static Pattern placeholderPattern() {
102102
@NonNull Caption captionKey,
103103
@NonNull C recipient,
104104
@NonNull String caption,
105-
@NonNull Collection<@NonNull CaptionVariable> variables
105+
@NonNull List<@NonNull CaptionVariable> variables
106106
);
107107

108108

@@ -119,7 +119,7 @@ private PatternReplacingCaptionFormatter(final @NonNull Pattern pattern) {
119119
final @NonNull Caption captionKey,
120120
final @NonNull C recipient,
121121
final @NonNull String caption,
122-
final @NonNull Collection<@NonNull CaptionVariable> variables
122+
final @NonNull List<@NonNull CaptionVariable> variables
123123
) {
124124
final Map<String, String> replacements = new HashMap<>();
125125
for (final CaptionVariable variable : variables) {

cloud-core/src/main/java/org/incendo/cloud/context/CommandContext.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
package org.incendo.cloud.context;
2525

2626
import io.leangen.geantyref.TypeToken;
27-
import java.util.Collection;
2827
import java.util.Collections;
2928
import java.util.HashMap;
3029
import java.util.LinkedList;
@@ -120,7 +119,7 @@ public CommandContext(
120119
*/
121120
public @NonNull String formatCaption(
122121
final @NonNull Caption caption,
123-
final @NonNull Collection<@NonNull CaptionVariable> variables
122+
final @NonNull List<@NonNull CaptionVariable> variables
124123
) {
125124
return this.formatCaption(this.commandManager.captionFormatter(), caption, variables);
126125
}
@@ -159,7 +158,7 @@ public CommandContext(
159158
public <T> @NonNull T formatCaption(
160159
final @NonNull CaptionFormatter<C, T> formatter,
161160
final @NonNull Caption caption,
162-
final @NonNull Collection<@NonNull CaptionVariable> variables
161+
final @NonNull List<@NonNull CaptionVariable> variables
163162
) {
164163
return formatter.formatCaption(
165164
caption,

0 commit comments

Comments
 (0)