Merge branch 'develop' of https://github.com/europeana/translation-api/

into develop
europeana · Nov 30, 2023 · 50ddd75 · 50ddd75
2 parents 3509926 + 812b3eb
commit 50ddd75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...ation-web/src/main/java/eu/europeana/api/translation/config/TranslationApiAutoconfig.java b/...ation-web/src/main/java/eu/europeana/api/translation/config/TranslationApiAutoconfig.java
@@ -168,14 +168,15 @@ public TranslationServiceProvider getTranslationServiceProvider() {
    * bean creation. Otherwise all these methods would need to be called manually which is not the
    * best solution.
    */
-  @SuppressWarnings(["external_findsecbugs:PATH_TRAVERSAL_IN", "findsecbugs:PATH_TRAVERSAL_IN"]) // the trustore path is not user input but application config
+  @SuppressWarnings({"external_findsecbugs:PATH_TRAVERSAL_IN", "findsecbugs:PATH_TRAVERSAL_IN"}) // the trustore path is not user input but application config
   private LettuceConnectionFactory getRedisConnectionFactory() {
     // in case of integration tests, we do not need the SSL certificate
     LettuceClientConfiguration.LettuceClientConfigurationBuilder lettuceClientConfigurationBuilder =
         LettuceClientConfiguration.builder();
     // if redis secure protocol is used (rediss vs. redis)
     boolean sslEnabled = translationConfig.getRedisConnectionUrl().startsWith("rediss");
     if (sslEnabled) {
+      @SuppressWarnings("external_findsecbugs:PATH_TRAVERSAL_IN") // the trustore path is not user input but application config
       final File truststore = new File(FilenameUtils.normalize(translationConfig.getTruststorePath()));
       SslOptions sslOptions = SslOptions.builder().jdkSslProvider()
           .truststore(truststore,

diff --git a/translation-web/src/main/java/eu/europeana/api/translation/config/WebMvcConfig.java b/translation-web/src/main/java/eu/europeana/api/translation/config/WebMvcConfig.java
@@ -19,7 +19,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
   /** Setup CORS for all GET, HEAD and OPTIONS, requests. */
   @Override
-  @SuppressWarnings(["external_findsecbugs:PERMISSIVE_CORS", "findsecbugs:PERMISSIVE_CORS", "java:S5122"]) //the API is public
+  @SuppressWarnings({"external_findsecbugs:PERMISSIVE_CORS", "findsecbugs:PERMISSIVE_CORS", "java:S5122"}) //the API is public
   public void addCorsMappings(CorsRegistry registry) {
     registry
         .addMapping("/**")