Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4c181b6

Browse files
committed
Merge branch 'bugfix/model-enhancement'
2 parents34246cf +1e96ab7 commit4c181b6

File tree

26 files changed

+1836
-361
lines changed

26 files changed

+1836
-361
lines changed

‎springfox-schema/src/main/java/springfox/documentation/schema/ModelReferenceProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
importspringfox.documentation.spi.schema.EnumTypeDeterminer;
2525
importspringfox.documentation.spi.schema.contexts.ModelContext;
2626

27-
importjava.util.HashMap;
27+
importjava.util.Collections;
2828
importjava.util.Map;
2929
importjava.util.Optional;
3030
importjava.util.function.Function;
@@ -50,7 +50,7 @@ class ModelReferenceProvider implements Function<ResolvedType, ModelReference> {
5050
this.typeNameExtractor =typeNameExtractor;
5151
this.enumTypeDeterminer =enumTypeDeterminer;
5252
this.parentContext =parentContext;
53-
this.knownNames =newHashMap<>(knownNames);
53+
this.knownNames =Collections.unmodifiableMap(knownNames);
5454
}
5555

5656
@Override

‎springfox-schema/src/main/java/springfox/documentation/schema/TypeNameIndexingAdapter.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
importorg.slf4j.LoggerFactory;
2424
importspringfox.documentation.spi.schema.UniqueTypeNameAdapter;
2525

26+
importjava.util.Collections;
2627
importjava.util.HashMap;
2728
importjava.util.Map;
2829
importjava.util.Optional;
@@ -35,7 +36,7 @@ public class TypeNameIndexingAdapter implements UniqueTypeNameAdapter {
3536

3637
@Override
3738
publicMap<String,String>getNames() {
38-
returnnewHashMap<>(knownNames);
39+
returnCollections.unmodifiableMap(knownNames);
3940
}
4041

4142
@Override
@@ -87,10 +88,10 @@ public void registerUniqueType(
8788
StringtempName =typeName;
8889
while (knownNames.values().contains(tempName)) {
8990
++nameIndex;
90-
tempName =String.format(
91-
"%s_%s",
92-
typeName,
93-
nameIndex);
91+
tempName =newStringBuilder(typeName)
92+
.append("_")
93+
.append(nameIndex).
94+
toString();
9495
}
9596
knownNames.put(
9697
modelId,

‎springfox-spi/src/main/java/springfox/documentation/spi/schema/contexts/ModelContext.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ private ModelContext(
7676
this.view =view;
7777
this.validationGroups =newHashSet<>(validationGroups);
7878
this.modelBuilder =
79-
newModelBuilder(String.format(
80-
"%s_%s",
81-
parameterId,
82-
type.getBriefDescription()));
79+
newModelBuilder(newStringBuilder(parameterId)
80+
.append("_")
81+
.append(type.getBriefDescription()).
82+
toString());
8383
}
8484

8585
@SuppressWarnings("ParameterNumber")
@@ -99,10 +99,10 @@ private ModelContext(
9999
this.registeredTypes =parentContext.registeredTypes;
100100
this.genericNamingStrategy =parentContext.getGenericNamingStrategy();
101101
this.modelBuilder =
102-
newModelBuilder(String.format(
103-
"%s_%s",
104-
parameterId,
105-
input.getBriefDescription()));
102+
newModelBuilder(newStringBuilder(parameterId)
103+
.append("_")
104+
.append(type.getBriefDescription()).
105+
toString());
106106
}
107107

108108
/**
@@ -123,10 +123,10 @@ public String getParameterId() {
123123
* @return type id behind this context
124124
*/
125125
publicStringgetTypeId() {
126-
returnString.format(
127-
"%s_%s",
128-
parameterId,
129-
type.getBriefDescription());
126+
returnnewStringBuilder(parameterId)
127+
.append("_")
128+
.append(type.getBriefDescription()).
129+
toString();
130130
}
131131

132132
/**
@@ -359,7 +359,7 @@ public String description() {
359359
.append("{")
360360
.append("groupName=").append(this.getGroupName()).append(", ")
361361
.append("type=").append(this.getType()).append(", ")
362-
.append("isReturnType=").append(this.isReturnType())
362+
.append("isReturnType=").append(this.isReturnType()).append(", ")
363363
.append("view=").append(this.getView())
364364
.append("}").toString();
365365
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp