From a2a387be90a57e5b707c844cba590ca47c5e6604 Mon Sep 17 00:00:00 2001 From: LSmyrnaios Date: Fri, 2 Jun 2023 14:23:54 +0300 Subject: [PATCH] - Fix a security config for Swagger. - Add the "displayRequestDuration" for "Try it out" requests in Swagger. - Code polishing. --- .../repo/manager/config/AaiSecurityConfiguration.java | 2 +- .../dnetlib/repo/manager/controllers/PiWikController.java | 6 +++--- .../repo/manager/controllers/SushiliteController.java | 1 - .../repo/manager/controllers/SushiliteR5Controller.java | 2 -- .../repo/manager/service/sushilite/SushiliteR5Service.java | 1 - src/main/resources/application.yml | 1 + src/main/resources/log4j2.xml | 3 --- 7 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/eu/dnetlib/repo/manager/config/AaiSecurityConfiguration.java b/src/main/java/eu/dnetlib/repo/manager/config/AaiSecurityConfiguration.java index 65934fe..563eb4b 100644 --- a/src/main/java/eu/dnetlib/repo/manager/config/AaiSecurityConfiguration.java +++ b/src/main/java/eu/dnetlib/repo/manager/config/AaiSecurityConfiguration.java @@ -64,7 +64,7 @@ public class AaiSecurityConfiguration extends WebSecurityConfigurerAdapter { .authorizeRequests() .regexMatchers("/actuator/.*").permitAll() .regexMatchers("/metrics").permitAll() - .antMatchers("/v3/api-docs/**","/swagger-ui/**").permitAll() + .antMatchers("/api-docs/**","/swagger-ui/**").permitAll() .anyRequest().authenticated() .and() .logout().logoutUrl("/openid_logout") diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java index a27ecc5..985c60e 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java @@ -61,9 +61,9 @@ public class PiWikController { @Parameter(name = "searchField", description = "string") }) public Paging getPiwikSitesForRepos( - @RequestParam(value = "from",required=false,defaultValue = "0") int from, - @RequestParam(value = "quantity",required=false,defaultValue = "100") int quantity, - @RequestParam(value = "order",required=false,defaultValue = "DSC") OrderByType orderType, + @RequestParam(value = "from", required=false, defaultValue = "0") int from, + @RequestParam(value = "quantity", required=false, defaultValue = "100") int quantity, + @RequestParam(value = "order", required=false, defaultValue = "DSC") OrderByType orderType, @RequestParam(value = "orderField", required = false, defaultValue = "REPOSITORY_NAME") OrderByField orderField, @RequestParam(value = "searchField", required = false, defaultValue = "") String searchField diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteController.java index 039c335..5d6d49d 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteController.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteController.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.*; @Tag(name="sushilite", description = "Sushi-Lite API") public class SushiliteController { - @Autowired private SushiliteServiceImpl sushiliteService; diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteR5Controller.java b/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteR5Controller.java index 4288a36..b1533f2 100644 --- a/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteR5Controller.java +++ b/src/main/java/eu/dnetlib/repo/manager/controllers/SushiliteR5Controller.java @@ -1,6 +1,5 @@ package eu.dnetlib.repo.manager.controllers; -import eu.dnetlib.repo.manager.service.sushilite.SushiliteR5Service; import eu.dnetlib.repo.manager.service.sushilite.SushiliteR5ServiceImpl; import io.swagger.v3.oas.annotations.tags.Tag; import org.json.JSONException; @@ -42,7 +41,6 @@ public class SushiliteR5Controller { @RequestParam(value = "dataType",required=false, defaultValue="") String dataType, @RequestParam(value = "Granularity", required = false, defaultValue ="Monthly") String granularity, @RequestParam(value = "Pretty",required=false, defaultValue="") String pretty) { - try { return sushiliteR5Service.getReportResults(report, release, requestorID, beginDate, endDate, repositoryIdentifier, datasetIdentifier, itemIdentifier, metricTypes, dataType, granularity, pretty); } catch (JSONException je) { diff --git a/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteR5Service.java b/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteR5Service.java index 44a4c80..662d123 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteR5Service.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/sushilite/SushiliteR5Service.java @@ -1,6 +1,5 @@ package eu.dnetlib.repo.manager.service.sushilite; -import eu.dnetlib.usagestats.sushilite.domain.ReportResponseWrapper; import org.json.JSONException; import org.springframework.http.ResponseEntity; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 84a7eb8..5b3a5d5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,6 +7,7 @@ springdoc: swagger-ui: disable-swagger-default-url: true path: /swagger-ui.html + displayRequestDuration: true api-docs: path: /api-docs diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 2e6c355..45fb4a8 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -15,8 +15,5 @@ - - -