This commit is contained in:
Michele Artini 2021-01-25 14:47:25 +01:00
parent 7848c5a52c
commit 7ac3d73299
2 changed files with 18 additions and 20 deletions

View File

@ -34,9 +34,9 @@ import io.micrometer.core.instrument.ImmutableTag;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
import io.prometheus.client.exporter.MetricsServlet; import io.prometheus.client.exporter.MetricsServlet;
import io.prometheus.client.hotspot.DefaultExports; import io.prometheus.client.hotspot.DefaultExports;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact;
import springfox.documentation.service.Tag; import springfox.documentation.service.Tag;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
@ -106,16 +106,14 @@ public class LiteratureBrokerServiceConfiguration extends AbstractElasticsearchC
.build() .build()
.tags(new Tag(TAG_EVENTS, "Events management"), new Tag(TAG_SUBSCRIPTIONS, "Subscriptions management"), new Tag(TAG_NOTIFICATIONS, .tags(new Tag(TAG_EVENTS, "Events management"), new Tag(TAG_SUBSCRIPTIONS, "Subscriptions management"), new Tag(TAG_NOTIFICATIONS,
"Notifications management"), new Tag(TAG_TOPIC_TYPES, "Topic types management"), new Tag(TAG_OPENAIRE, "OpenAIRE use case")) "Notifications management"), new Tag(TAG_TOPIC_TYPES, "Topic types management"), new Tag(TAG_OPENAIRE, "OpenAIRE use case"))
.apiInfo(new ApiInfo( .apiInfo(new ApiInfoBuilder()
"Literature Broker Service", .title("Literature Broker Service")
"APIs documentation", .description("APIs documentation")
"1.1", .version("1.1")
"urn:tos", .contact(ApiInfo.DEFAULT_CONTACT)
.license("Apache 2.0")
new Contact(null, null, null), .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0")
"Apache 2.0", .build());
"http://www.apache.org/licenses/LICENSE-2.0", null));
} }
@Bean @Bean

View File

@ -34,9 +34,9 @@ import io.micrometer.core.instrument.ImmutableTag;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
import io.prometheus.client.exporter.MetricsServlet; import io.prometheus.client.exporter.MetricsServlet;
import io.prometheus.client.hotspot.DefaultExports; import io.prometheus.client.hotspot.DefaultExports;
import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Contact;
import springfox.documentation.service.Tag; import springfox.documentation.service.Tag;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
@ -100,14 +100,14 @@ public class BrokerConfiguration extends AbstractElasticsearchConfiguration {
.paths(p -> p.startsWith("/")) .paths(p -> p.startsWith("/"))
.build() .build()
.tags(new Tag(OA_PUBLIC_APIS, OA_PUBLIC_APIS)) .tags(new Tag(OA_PUBLIC_APIS, OA_PUBLIC_APIS))
.apiInfo(new ApiInfo( .apiInfo(new ApiInfoBuilder()
"Literature Broker Service", .title("OpenAIRE Public Broker API")
"APIs documentation", .description("APIs documentation")
"1.1", .version("1.1")
"urn:tos", .contact(ApiInfo.DEFAULT_CONTACT)
new Contact(null, null, null), .license("Apache 2.0")
"Apache 2.0", .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0")
"http://www.apache.org/licenses/LICENSE-2.0", null)); .build());
} }