fixed duplicate tag groups

Author: jarlehansen

README.md

@@ -82,7 +82,7 @@ springfox.version=1.0.0
 __Full example__
 ```java
 @EnableSpringfox(
-    conventionMode = false,
+    convention = false,
     swaggerUiBasePath = "",
     includeControllers = MyController.class,    
     value = @Info(
@@ -98,8 +98,7 @@ __Full example__
 )
 ```
 
-* Use __conventionMode__ to print better names on the swagger-ui page. It will alter the tags (the name of the groups).
-It will remove  _Controller_ at the end of the text if it is present. Additionally, it will split the operation name by
+* Use __convention__ to print better names on the swagger-ui page. It will split the operation name by
 replacing camelcase with space and uppercasing the word (for example the method `getCustomer()` will be displayed as `Get customer`).
 If the `@ApiOperation` annotation is present, these values will be used.
 * __swaggerUiBasePath__ customize the base path to swagger-ui. If the value is for example '/documentation', the path to swagger-ui will be '/documentation/swagger-ui.html'.
@@ -124,7 +123,7 @@ __Application properties__
 * springfox.contact.email
 * springfox.license.name
 * springfox.license.url
-* springfox.activeProfiles - _Enable springfox for the configured profiles. If not set, all profiles loads springfox. Default is all profiles._
+* springfox.profiles - _Enable springfox for the configured profiles. If not set, all profiles loads springfox. Default is all profiles._
 * springfox.swagger-ui-base-path
 
 ### Swagger UI

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

@@ -9,7 +9,7 @@ public class ActiveProfilesCondition implements Condition {
     @Override
     public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) {
         Environment environment = conditionContext.getEnvironment();
-        String[] profiles = environment.getProperty("springfox.activeProfiles", String[].class);
+        String[] profiles = environment.getProperty("springfox.profiles", String[].class);
         return profiles == null || profiles.length == 0 || environment.acceptsProfiles(profiles);
     }
 }

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

@@ -19,7 +19,7 @@
 
     String swaggerUiBasePath() default "";
 
-    boolean conventionMode() default true;
+    boolean convention() default true;
 
     Class<?>[] includeControllers() default {};
 

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

@@ -99,8 +99,8 @@ String getLicenseUrl() {
         return val(license.url(), loaderProps.getLicenseUrl());
     }
 
-    boolean conventionMode() {
-        return annotation.conventionMode();
+    boolean convention() {
+        return annotation.convention();
     }
 
     String swaggerUiBasePath() {

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

@@ -1,7 +1,6 @@
 package com.github.springfox.loader;
 
 import com.github.springfox.loader.plugins.LoaderOperationPlugin;
-import com.github.springfox.loader.plugins.LoaderTagProvider;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.ExtensionProperty;
 import org.springframework.beans.BeansException;
@@ -15,18 +14,14 @@
 import org.springframework.util.StringValueResolver;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import springfox.documentation.RequestHandler;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ObjectVendorExtension;
-import springfox.documentation.service.StringVendorExtension;
-import springfox.documentation.service.VendorExtension;
+import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.ApiSelectorBuilder;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.spring.web.readers.operation.DefaultTagsProvider;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -37,7 +32,7 @@
 @EnableConfigurationProperties
 @Configuration
 @ComponentScan(basePackageClasses = SpringfoxLoaderConfig.class)
-public class SpringfoxLoaderConfig implements WebMvcConfigurer, ApplicationContextAware, EmbeddedValueResolverAware {
+public class SpringfoxLoaderConfig extends WebMvcConfigurerAdapter implements ApplicationContextAware, EmbeddedValueResolverAware {
 
     private SpringfoxLoader springfoxLoader = new SpringfoxLoader();
 
@@ -96,17 +91,10 @@ private List<VendorExtension> getVendorExtensions() {
         }).collect(Collectors.toList());
     }
 
-    @Bean
-    @Primary
-    @Conditional(ActiveProfilesCondition.class)
-    public DefaultTagsProvider loaderDefaultTagsProvider() {
-        return new LoaderTagProvider(springfoxLoader.conventionMode());
-    }
-
     @Bean
     @Conditional(ActiveProfilesCondition.class)
     public LoaderOperationPlugin loaderOperationPlugin() {
-        return new LoaderOperationPlugin(springfoxLoader.conventionMode());
+        return new LoaderOperationPlugin(springfoxLoader.convention());
     }
 
     @Override

src/main/java/com/github/springfox/loader/plugins/LoaderOperationPlugin.java

@@ -10,15 +10,15 @@
 
 @Order(SwaggerPluginSupport.SWAGGER_PLUGIN_ORDER)
 public class LoaderOperationPlugin implements OperationBuilderPlugin {
-    private final boolean conventionMode;
+    private final boolean convention;
 
-    public LoaderOperationPlugin(boolean conventionMode) {
-        this.conventionMode = conventionMode;
+    public LoaderOperationPlugin(boolean convention) {
+        this.convention = convention;
     }
 
     @Override
     public void apply(OperationContext operationContext) {
-        if (conventionMode) {
+        if (convention) {
             String summary = operationContext.operationBuilder().build().getSummary();
             String newSummary = Paths.splitCamelCase(summary, " ").toLowerCase();
             operationContext.operationBuilder().summary(StringUtils.capitalize(newSummary));

src/main/java/com/github/springfox/loader/plugins/LoaderTagProvider.java

@@ -21,7 +21,7 @@ class LoaderOperationPluginSpec extends Specification {
         }
     }
 
-    def "Update summary when creating LoaderOperationPlugin with conventionMode enabled"() {
+    def "Update summary when creating LoaderOperationPlugin with convention enabled"() {
         when:
         def plugin = new LoaderOperationPlugin(true)
         plugin.apply(context)
@@ -30,7 +30,7 @@ class LoaderOperationPluginSpec extends Specification {
         1 * builder.summary('My test')
     }
 
-    def "Do not update summary when creating LoaderOperationPlugin with conventionMode disabled"() {
+    def "Do not update summary when creating LoaderOperationPlugin with convention disabled"() {
         when:
         def plugin = new LoaderOperationPlugin(false)
         plugin.apply(context)

src/test/groovy/com/github/springfox/loader/plugins/LoaderOperationPluginSpec.groovy

@@ -4,6 +4,7 @@
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Info;
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @EnableSpringfox(
@@ -15,4 +16,8 @@
         swaggerUiBasePath = "/docs", includeControllers = TestController.class)
 @SpringBootApplication
 public class TestApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(TestApplication.class, args);
+    }
 }