Skip to content

Commit

Permalink
Fix #1683: Provide default lang.json for external resources (#1684)
Browse files Browse the repository at this point in the history
  • Loading branch information
romanstrobl authored Aug 6, 2024
1 parent a36adc5 commit bbaddc7
Showing 1 changed file with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@
import io.getlime.security.powerauth.rest.api.spring.annotation.support.PowerAuthEncryptionArgumentResolver;
import io.getlime.security.powerauth.rest.api.spring.annotation.support.PowerAuthWebArgumentResolver;
import io.getlime.security.powerauth.rest.api.spring.filter.PowerAuthRequestFilter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.UrlResource;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
Expand All @@ -52,6 +54,7 @@
* @author Petr Dvorak, [email protected]
*/
@Configuration
@Slf4j
public class WebMvcConfiguration implements WebMvcConfigurer {

@Autowired
Expand Down Expand Up @@ -140,7 +143,12 @@ public ReloadableResourceBundleMessageSourceWithListing messageSource() {

@Bean
public Resource languageSettingSource() throws MalformedURLException {
return resourceLoader.getResource(configuration.getResourcesLocation() + "lang.json");
Resource resource = resourceLoader.getResource(configuration.getResourcesLocation() + "lang.json");
if (!resource.exists()) {
logger.info("The lang.json file was not found in {}, using default location", configuration.getResourcesLocation());
resource = new UrlResource("classpath:/static/resources/lang.json");
}
return resource;
}

@Override
Expand Down

0 comments on commit bbaddc7

Please sign in to comment.