Skip to content

Commit 4c181b6

Browse files
committed
Merge branch 'bugfix/model-enhancement'
2 parents 34246cf + 1e96ab7 commit 4c181b6

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
import springfox.documentation.spi.schema.EnumTypeDeterminer;
2525
import springfox.documentation.spi.schema.contexts.ModelContext;
2626

27-
import java.util.HashMap;
27+
import java.util.Collections;
2828
import java.util.Map;
2929
import java.util.Optional;
3030
import java.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 = new HashMap<>(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
import org.slf4j.LoggerFactory;
2424
import springfox.documentation.spi.schema.UniqueTypeNameAdapter;
2525

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

3637
@Override
3738
public Map<String, String> getNames() {
38-
return new HashMap<>(knownNames);
39+
return Collections.unmodifiableMap(knownNames);
3940
}
4041

4142
@Override
@@ -87,10 +88,10 @@ public void registerUniqueType(
8788
String tempName = typeName;
8889
while (knownNames.values().contains(tempName)) {
8990
++nameIndex;
90-
tempName = String.format(
91-
"%s_%s",
92-
typeName,
93-
nameIndex);
91+
tempName = new StringBuilder(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 = new HashSet<>(validationGroups);
7878
this.modelBuilder =
79-
new ModelBuilder(String.format(
80-
"%s_%s",
81-
parameterId,
82-
type.getBriefDescription()));
79+
new ModelBuilder(new StringBuilder(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-
new ModelBuilder(String.format(
103-
"%s_%s",
104-
parameterId,
105-
input.getBriefDescription()));
102+
new ModelBuilder(new StringBuilder(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
public String getTypeId() {
126-
return String.format(
127-
"%s_%s",
128-
parameterId,
129-
type.getBriefDescription());
126+
return new StringBuilder(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)