Skip to content

Commit c61d1e7

Browse files
committed
removed value properties
1 parent d2ed8b3 commit c61d1e7

File tree

11 files changed

+1
-219
lines changed

11 files changed

+1
-219
lines changed

src/main/java/com/github/springfox/loader/EnableSpringfox.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
boolean conventionMode() default true;
2323

24-
boolean listValueProps() default false;
25-
2624
Class<?>[] includeControllers() default {};
2725

2826
}

src/main/java/com/github/springfox/loader/SpringfoxLoader.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ boolean conventionMode() {
103103
return annotation.conventionMode();
104104
}
105105

106-
boolean listValueProps() {
107-
return annotation.listValueProps();
108-
}
109-
110106
String swaggerUiBasePath() {
111107
return val(annotation.swaggerUiBasePath(), loaderProps.getSwaggerUiBasePath());
112108
}

src/main/java/com/github/springfox/loader/SpringfoxLoaderConfig.java

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import com.github.springfox.loader.plugins.LoaderOperationPlugin;
44
import com.github.springfox.loader.plugins.LoaderTagProvider;
5-
import com.github.springfox.loader.valueproperties.ValuePropertiesController;
6-
import com.github.springfox.loader.valueproperties.ValuePropertiesLocator;
75
import io.swagger.annotations.Extension;
86
import io.swagger.annotations.ExtensionProperty;
97
import org.springframework.beans.BeansException;
@@ -30,7 +28,6 @@
3028
import springfox.documentation.spring.web.plugins.Docket;
3129
import springfox.documentation.spring.web.readers.operation.DefaultTagsProvider;
3230

33-
import javax.annotation.PostConstruct;
3431
import java.util.Arrays;
3532
import java.util.Collections;
3633
import java.util.List;
@@ -42,23 +39,11 @@
4239
@ComponentScan(basePackageClasses = SpringfoxLoaderConfig.class)
4340
public class SpringfoxLoaderConfig extends WebMvcConfigurerAdapter implements ApplicationContextAware, EmbeddedValueResolverAware {
4441

45-
@Autowired
46-
private ValuePropertiesController valuePropertiesController;
47-
4842
private SpringfoxLoader springfoxLoader = new SpringfoxLoader();
49-
private ValuePropertiesLocator valuePropertiesLocator;
5043

5144
@Override
5245
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
5346
springfoxLoader.setApplicationContext(applicationContext);
54-
if (springfoxLoader.listValueProps()) {
55-
valuePropertiesLocator = new ValuePropertiesLocator(springfoxLoader.getBasePackage());
56-
}
57-
}
58-
59-
@PostConstruct
60-
public void init() {
61-
valuePropertiesController.setValuePropertiesLocator(valuePropertiesLocator);
6247
}
6348

6449
@Override
@@ -76,11 +61,6 @@ public void setSpringfoxLoaderProps(SpringfoxLoaderProps loaderProps) {
7661
public Docket api() {
7762
ApiSelectorBuilder apiSelectorBuilder = new Docket(DocumentationType.SWAGGER_2).select();
7863
Predicate<RequestHandler> predicate = RequestHandlerSelectors.basePackage(springfoxLoader.getBasePackage())::apply;
79-
if (springfoxLoader.listValueProps()) {
80-
Predicate<RequestHandler> listPropertiesRequestHandler = RequestHandlerSelectors.basePackage(ValuePropertiesController.class.getPackage().getName())::apply;
81-
predicate = predicate.or(listPropertiesRequestHandler);
82-
}
83-
8464
if (springfoxLoader.includeControllers().length > 0) {
8565
Class<?>[] controllers = springfoxLoader.includeControllers();
8666
for (Class<?> controller : controllers) {
@@ -131,10 +111,6 @@ public LoaderOperationPlugin loaderOperationPlugin() {
131111
return new LoaderOperationPlugin(springfoxLoader.conventionMode());
132112
}
133113

134-
ValuePropertiesLocator valuePropertiesLocator() {
135-
return valuePropertiesLocator;
136-
}
137-
138114
@Override
139115
public void addViewControllers(ViewControllerRegistry registry) {
140116
if (!StringUtils.isEmpty(springfoxLoader.swaggerUiBasePath())) {

src/main/java/com/github/springfox/loader/valueproperties/ValuePropertiesController.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/main/java/com/github/springfox/loader/valueproperties/ValuePropertiesLocator.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/main/java/com/github/springfox/loader/valueproperties/ValueProperty.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/test/groovy/com/github/springfox/loader/SpringfoxLoaderConfigSpec.groovy

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,6 @@ class SpringfoxLoaderConfigSpec extends Specification {
4747
enabled
4848
}
4949

50-
def "Get base package"() {
51-
when:
52-
def propertiesLocator = springfoxLoaderConfig.valuePropertiesLocator()
53-
54-
then:
55-
propertiesLocator.properties[0].key == "test.property"
56-
propertiesLocator.properties[0].defaultValue == "test123"
57-
}
58-
5950
def "Custom base path for swagger-ui"() {
6051
when:
6152
def response = restTemplate.getForEntity("/docs/swagger-ui.html", String)

src/test/groovy/com/github/springfox/loader/testutils/TestApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.github.springfox.loader.EnableSpringfox;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55

6-
@EnableSpringfox(listValueProps = true, swaggerUiBasePath = "/docs", includeControllers = TestController.class)
6+
@EnableSpringfox(swaggerUiBasePath = "/docs", includeControllers = TestController.class)
77
@SpringBootApplication
88
public class TestApplication {
99
}

src/test/groovy/com/github/springfox/loader/valueproperties/ValuePropertiesControllerSpec.groovy

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/test/groovy/com/github/springfox/loader/valueproperties/ValuePropertiesLocatorSpec.groovy

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)