MaDgIK
/
uoa-monitor-service
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/log4j2' into beta

This commit is contained in:
Konstantinos Triantafyllou 2022-10-20 10:57:20 +03:00
parent ea7f71f0ab 5d46d84a96
commit 07dd7d4ca7
2 changed files with 131 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
src/main/java/eu/dnetlib/uoamonitorservice/configuration/SwaggerConfig.java
View File

@ -1,86 +1,119 @@
package eu.dnetlib.uoamonitorservice.configuration; package eu.dnetlib.uoamonitorservice.configuration;
import eu.dnetlib.uoamonitorservice.configuration.properties.APIProperties; import eu.dnetlib.uoamonitorservice.configuration.properties.APIProperties;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.ParameterBuilder; import springfox.documentation.builders.ParameterBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.schema.ModelRef; import springfox.documentation.schema.ModelRef;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.Parameter; import springfox.documentation.service.Parameter;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
* Swagger configuration class * Swagger configuration class
*/ */
@Configuration @Configuration
@Profile({"swagger"}) @Profile({"swagger"})
@EnableSwagger2 @EnableSwagger2
public class SwaggerConfig extends WebMvcConfigurerAdapter { public class SwaggerConfig extends WebMvcConfigurerAdapter {
private final APIProperties apiProperties; private final APIProperties apiProperties;
@Autowired @Autowired
public SwaggerConfig(APIProperties apiProperties) { public SwaggerConfig(APIProperties apiProperties) {
this.apiProperties = apiProperties; this.apiProperties = apiProperties;
} }
@Bean @Bean
public Docket createRestApi() { public Docket createRestApi() {
return new Docket(DocumentationType.SWAGGER_2) return new Docket(DocumentationType.SWAGGER_2)
// .globalOperationParameters(globalParameterList()) // .globalOperationParameters(globalParameterList())
.apiInfo(apiInfo()) .apiInfo(apiInfo())
.select() .select()
.apis(RequestHandlerSelectors.any()) .apis(RequestHandlerSelectors.basePackage("eu.dnetlib.uoamonitorservice.controllers"))
.paths(PathSelectors.any()) .paths(PathSelectors.any())
.build(); .build();
} }
private ApiInfo apiInfo() { @Bean
return new ApiInfoBuilder() public Docket createRestApiLibrary() {
.title(this.apiProperties.getTitle()) return new Docket(DocumentationType.SWAGGER_2)
.description(this.apiProperties.getDescription()) .apiInfo(apiInfo())
.version(this.apiProperties.getVersion()) .groupName("Library")
.build(); .select()
} .apis(RequestHandlerSelectors.basePackage("eu.dnetlib.uoaadmintoolslibrary.controllers"))
.paths(PathSelectors.any())
private List<Parameter> globalParameterList() { .build();
Parameter authTokenHeader = new ParameterBuilder() }
.name("Session") // name of the header
.modelRef(new ModelRef("string")) // data-type of the header @Bean
.required(false) public Docket createRestApiAuthorizationLibrary() {
.parameterType("header") return new Docket(DocumentationType.SWAGGER_2)
.description("Session ID") .apiInfo(apiInfo())
.build(); .groupName("Authorization Library")
return Collections.singletonList(authTokenHeader); .select()
} .apis(RequestHandlerSelectors.basePackage("eu.dnetlib.uoaauthorizationlibrary.controllers"))
.paths(PathSelectors.any())
@Override .build();
public void addViewControllers(ViewControllerRegistry registry) { }
registry.addRedirectViewController("/v2/api-docs", "/v2/api-docs");
registry.addRedirectViewController("/swagger-resources/configuration/ui", "/swagger-resources/configuration/ui"); @Bean
registry.addRedirectViewController("/swagger-resources/configuration/security", "/swagger-resources/configuration/security"); public Docket createRestApiNotificationLibrary() {
registry.addRedirectViewController("/swagger-resources", "/swagger-resources"); return new Docket(DocumentationType.SWAGGER_2)
} .apiInfo(apiInfo())
.groupName("Notification Service")
@Override .select()
public void addResourceHandlers(ResourceHandlerRegistry registry) { .apis(RequestHandlerSelectors.basePackage("eu.dnetlib.uoanotificationservice.controllers"))
registry.addResourceHandler("/swagger-ui.html**").addResourceLocations("classpath:/META-INF/resources/swagger-ui.html"); .paths(PathSelectors.any())
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); .build();
} }
} private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title(this.apiProperties.getTitle())
.description(this.apiProperties.getDescription())
.version(this.apiProperties.getVersion())
.build();
}
private List<Parameter> globalParameterList() {
Parameter authTokenHeader = new ParameterBuilder()
.name("Session") // name of the header
.modelRef(new ModelRef("string")) // data-type of the header
.required(false)
.parameterType("header")
.description("Session ID")
.build();
return Collections.singletonList(authTokenHeader);
}
@Override
public void addViewControllers(ViewControllerRegistry registry) {
registry.addRedirectViewController("/v2/api-docs", "/v2/api-docs");
registry.addRedirectViewController("/swagger-resources/configuration/ui", "/swagger-resources/configuration/ui");
registry.addRedirectViewController("/swagger-resources/configuration/security", "/swagger-resources/configuration/security");
registry.addRedirectViewController("/swagger-resources", "/swagger-resources");
}
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/swagger-ui.html**").addResourceLocations("classpath:/META-INF/resources/swagger-ui.html");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
}
}

17
src/main/java/eu/dnetlib/uoamonitorservice/controllers/StakeholderController.java
View File

@ -689,7 +689,7 @@ public class StakeholderController {
@PreAuthorize("isAuthenticated()") @PreAuthorize("isAuthenticated()")
@RequestMapping(value = "/{stakeholderId}/change-visibility", method = RequestMethod.POST) @RequestMapping(value = "/{stakeholderId}/change-visibility", method = RequestMethod.POST)
public Visibility changeStakeholderVisibility(@PathVariable("stakeholderId") String stakeholderId, public Stakeholder changeStakeholderVisibility(@PathVariable("stakeholderId") String stakeholderId,
@RequestParam("visibility") Visibility visibility, @RequestParam(required = false) Boolean propagate) { @RequestParam("visibility") Visibility visibility, @RequestParam(required = false) Boolean propagate) {
log.debug("change stakeholder visibility: "+visibility + " - toggle propagate: "+((propagate != null && propagate) ? "true" : "false")); log.debug("change stakeholder visibility: "+visibility + " - toggle propagate: "+((propagate != null && propagate) ? "true" : "false"));
log.debug("Stakeholder: "+stakeholderId); log.debug("Stakeholder: "+stakeholderId);
@ -714,17 +714,24 @@ public class StakeholderController {
return changeStakeholderVisibilityTree(stakeholder, visibility, propagate); return changeStakeholderVisibilityTree(stakeholder, visibility, propagate);
} }
private Visibility changeStakeholderVisibilityTree(Stakeholder<String> stakeholder, Visibility visibility, Boolean propagate) { private Stakeholder changeStakeholderVisibilityTree(Stakeholder<String> stakeholder, Visibility visibility, Boolean propagate) {
Stakeholder<Topic> stakeholderFull = new Stakeholder<>(stakeholder);
List<Topic> topicsFull = new ArrayList<>();
if(propagate != null && propagate) { if(propagate != null && propagate) {
for (String topicId : stakeholder.getTopics()) { for (String topicId : stakeholder.getTopics()) {
topicController.changeVisibilityTree(topicId, visibility, propagate); topicsFull.add(topicController.changeVisibilityTree(topicId, visibility, propagate));
} }
} }
stakeholder.setVisibility(visibility);
stakeholder.setVisibility(visibility);
stakeholderDAO.save(stakeholder); stakeholderDAO.save(stakeholder);
log.debug("Stakeholder toggled!"); log.debug("Stakeholder toggled!");
return stakeholder.getVisibility();
stakeholderFull.setVisibility(visibility);
stakeholderFull.setTopics(topicsFull);
return stakeholder;
} }
// The following are not supposed to be used // The following are not supposed to be used