Skip to content

Commit 3ee97c0

Browse files
author
springdoc
committed
project cleanup
1 parent 70f66d6 commit 3ee97c0

File tree

44 files changed

+115
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+115
-116
lines changed

‎pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!--suppress ALL -->
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>org.springdoc</groupId>
56
<artifactId>springdoc-openapi</artifactId>
@@ -35,8 +36,8 @@
3536
<url>[email protected]:springdoc/springdoc-openapi.git</url>
3637
<connection>scm:git:[email protected]:springdoc/springdoc-openapi.git</connection>
3738
<developerConnection>scm:git:[email protected]:springdoc/springdoc-openapi.git</developerConnection>
38-
<tag>v1.2.11-SNAPSHOT</tag>
39-
</scm>
39+
<tag>v1.2.11-SNAPSHOT</tag>
40+
</scm>
4041
<distributionManagement>
4142
<snapshotRepository>
4243
<id>ossrh</id>
@@ -56,7 +57,7 @@
5657
<module>springdoc-openapi-webflux-ui</module>
5758
<module>springdoc-openapi-kotlin</module>
5859
<module>springdoc-openapi-data-rest</module>
59-
<module>springdoc-openapi-security</module>
60+
<module>springdoc-openapi-security</module>
6061
</modules>
6162

6263
<properties>

‎springdoc-openapi-common/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<artifactId>springdoc-openapi-common</artifactId>
45
<name>${project.artifactId}</name>

‎springdoc-openapi-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public abstract class AbstractOpenApiResource {
3535
private final AbstractResponseBuilder responseBuilder;
3636
private final OperationBuilder operationParser;
3737
private final Optional<List<OpenApiCustomiser>> openApiCustomisers;
38+
private final AntPathMatcher antPathMatcher = new AntPathMatcher();
3839
private boolean computeDone;
3940
@Value(SPRINGDOC_PACKAGES_TO_SCAN)
4041
private List<String> packagesToScan;
4142
@Value(SPRINGDOC_PATHS_TO_MATCH)
4243
private List<String> pathsToMatch;
43-
private final AntPathMatcher antPathMatcher = new AntPathMatcher();
4444

4545
protected AbstractOpenApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
4646
AbstractResponseBuilder responseBuilder, OperationBuilder operationParser,
@@ -272,6 +272,7 @@ private PathItem buildPathItem(RequestMethod requestMethod, Operation operation,
272272
protected boolean isPackageToScan(String aPackage) {
273273
return CollectionUtils.isEmpty(packagesToScan) || packagesToScan.stream().anyMatch(pack -> aPackage.equals(pack) || aPackage.startsWith(pack + "."));
274274
}
275+
275276
protected boolean isPathToMatch(String operationPath) {
276277
return CollectionUtils.isEmpty(pathsToMatch) || pathsToMatch.stream().anyMatch(pattern -> antPathMatcher.match(pattern, operationPath));
277278
}

‎springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractParameterBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ private JavaType constructType(Type type) {
288288
return TypeFactory.defaultInstance().constructType(type);
289289
}
290290

291-
public boolean isAnnotationToIgnore(java.lang.reflect.Parameter parameter){
292-
return ignoredParameterAnnotations.isAnnotationToIgnore(parameter);
291+
public boolean isAnnotationToIgnore(java.lang.reflect.Parameter parameter) {
292+
return ignoredParameterAnnotations.isAnnotationToIgnore(parameter);
293293
}
294294
}

‎springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractRequestBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525

2626
public abstract class AbstractRequestBuilder {
2727

28-
private final AbstractParameterBuilder parameterBuilder;
29-
private final RequestBodyBuilder requestBodyBuilder;
30-
private final OperationBuilder operationBuilder;
3128
// using string litterals to support both validation-api v1 and v2
3229
private static final String[] ANNOTATIONS_FOR_REQUIRED = {NotNull.class.getName(), "javax.validation.constraints.NotBlank", "javax.validation.constraints.NotEmpty"};
3330
private static final String POSITIVE_OR_ZERO = "javax.validation.constraints.PositiveOrZero";
3431
private static final String NEGATIVE_OR_ZERO = "javax.validation.constraints.NegativeOrZero";
32+
private final AbstractParameterBuilder parameterBuilder;
33+
private final RequestBodyBuilder requestBodyBuilder;
34+
private final OperationBuilder operationBuilder;
3535

3636
protected AbstractRequestBuilder(AbstractParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
3737
OperationBuilder operationBuilder) {

‎springdoc-openapi-common/src/main/java/org/springdoc/core/Constants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public final class Constants {
1212
public static final String SPRINGDOC_SWAGGER_UI_ENABLED = "springdoc.swagger-ui.enabled";
1313
public static final String SPRINGDOC_SHOW_ACTUATOR = "springdoc.show.actuator";
1414
public static final String SPRINGDOC_SHOW_ACTUATOR_VALUE = "${" + SPRINGDOC_SHOW_ACTUATOR + ":false}";
15-
public static final String SPRINGDOC_PACKAGES_TO_SCAN ="${springdoc.packagesToScan:#{null}}";
16-
public static final String SPRINGDOC_PATHS_TO_MATCH ="${springdoc.pathsToMatch:#{null}}";
15+
public static final String SPRINGDOC_PACKAGES_TO_SCAN = "${springdoc.packagesToScan:#{null}}";
16+
public static final String SPRINGDOC_PATHS_TO_MATCH = "${springdoc.pathsToMatch:#{null}}";
1717
public static final String SPRINGDOC_ACTUATOR_TAG = "Actuator";
1818
public static final String DEFAULT_WEB_JARS_PREFIX_URL = "/webjars";
1919
public static final String WEB_JARS_PREFIX_URL = "${springdoc.webjars.prefix:#{T(org.springdoc.core.Constants).DEFAULT_WEB_JARS_PREFIX_URL}}";

‎springdoc-openapi-common/src/main/java/org/springdoc/core/IgnoredParameterAnnotationsDefault.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
import org.springframework.stereotype.Component;
44

55
@Component
6-
public class IgnoredParameterAnnotationsDefault implements IgnoredParameterAnnotations{
6+
public class IgnoredParameterAnnotationsDefault implements IgnoredParameterAnnotations {
77

88
}

‎springdoc-openapi-common/src/main/java/org/springdoc/core/OpenAPIBuilder.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,17 @@ public class OpenAPIBuilder {
6161
this.securityParser = securityParser;
6262
}
6363

64+
private static String splitCamelCase(String str) {
65+
return str.replaceAll(
66+
String.format(
67+
"%s|%s|%s",
68+
"(?<=[A-Z])(?=[A-Z][a-z])",
69+
"(?<=[^A-Z])(?=[A-Z])",
70+
"(?<=[A-Za-z])(?=[^A-Za-z])"),
71+
"-")
72+
.toLowerCase(Locale.ROOT);
73+
}
74+
6475
public OpenAPI getOpenAPI() {
6576
return openAPI;
6677
}
@@ -145,17 +156,6 @@ public Operation buildTags(HandlerMethod handlerMethod, Operation operation, Ope
145156
return operation;
146157
}
147158

148-
private static String splitCamelCase(String str) {
149-
return str.replaceAll(
150-
String.format(
151-
"%s|%s|%s",
152-
"(?<=[A-Z])(?=[A-Z][a-z])",
153-
"(?<=[^A-Z])(?=[A-Z])",
154-
"(?<=[A-Za-z])(?=[^A-Za-z])"),
155-
"-")
156-
.toLowerCase(Locale.ROOT);
157-
}
158-
159159
public void setServerBaseUrl(String serverBaseUrl) {
160160
this.serverBaseUrl = serverBaseUrl;
161161
}

‎springdoc-openapi-common/src/main/java/org/springdoc/core/OperationBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private boolean existOperationId(String operationId, OpenAPI openAPI) {
207207
if (openAPI.getPaths() == null || openAPI.getPaths().isEmpty()) {
208208
return false;
209209
}
210-
for (Iterator<PathItem> iterator = openAPI.getPaths().values().iterator(); iterator.hasNext();) {
210+
for (Iterator<PathItem> iterator = openAPI.getPaths().values().iterator(); iterator.hasNext(); ) {
211211
PathItem path = iterator.next();
212212
Set<String> pathOperationIds = extractOperationIdFromPathItem(path);
213213
if (pathOperationIds.contains(operationId)) {

‎springdoc-openapi-common/src/main/java/org/springdoc/core/ParameterInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
class ParameterInfo {
66

77
private final java.lang.reflect.Parameter parameter;
8+
private final int index;
89
private String pName;
910
private io.swagger.v3.oas.models.parameters.Parameter parameterModel;
10-
private final int index;
1111

1212
public ParameterInfo(String pName, Parameter parameter,
1313
io.swagger.v3.oas.models.parameters.Parameter parameterModel, int index) {

0 commit comments

Comments
 (0)