Merge remote-tracking branch 'origin/log4j2' into beta
This commit is contained in:
commit
07dd7d4ca7
|
@ -44,7 +44,40 @@ public class SwaggerConfig extends WebMvcConfigurerAdapter {
|
||||||
// .globalOperationParameters(globalParameterList())
|
// .globalOperationParameters(globalParameterList())
|
||||||
.apiInfo(apiInfo())
|
.apiInfo(apiInfo())
|
||||||
.select()
|
.select()
|
||||||
.apis(RequestHandlerSelectors.any())
|
.apis(RequestHandlerSelectors.basePackage("eu.dnetlib.uoamonitorservice.controllers"))
|
||||||
|
.paths(PathSelectors.any())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public Docket createRestApiLibrary() {
|
||||||
|
return new Docket(DocumentationType.SWAGGER_2)
|
||||||
|
.apiInfo(apiInfo())
|
||||||
|
.groupName("Library")
|
||||||
|
.select()
|
||||||
|
.apis(RequestHandlerSelectors.basePackage("eu.dnetlib.uoaadmintoolslibrary.controllers"))
|
||||||
|
.paths(PathSelectors.any())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public Docket createRestApiAuthorizationLibrary() {
|
||||||
|
return new Docket(DocumentationType.SWAGGER_2)
|
||||||
|
.apiInfo(apiInfo())
|
||||||
|
.groupName("Authorization Library")
|
||||||
|
.select()
|
||||||
|
.apis(RequestHandlerSelectors.basePackage("eu.dnetlib.uoaauthorizationlibrary.controllers"))
|
||||||
|
.paths(PathSelectors.any())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public Docket createRestApiNotificationLibrary() {
|
||||||
|
return new Docket(DocumentationType.SWAGGER_2)
|
||||||
|
.apiInfo(apiInfo())
|
||||||
|
.groupName("Notification Service")
|
||||||
|
.select()
|
||||||
|
.apis(RequestHandlerSelectors.basePackage("eu.dnetlib.uoanotificationservice.controllers"))
|
||||||
.paths(PathSelectors.any())
|
.paths(PathSelectors.any())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue