root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Log resource path resolution failure at debug level (instead of warn) 

Closes gh-26828
This commit is contained in:
Juergen Hoeller 2021-05-11 15:46:21 +02:00
parent 46b7cd54a1
commit 5f5cd8a7c4
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -315,8 +315,8 @@ public class MockServletContext implements ServletContext {
return resourcePaths; return resourcePaths;
} }
catch (InvalidPathException | IOException ex ) { catch (InvalidPathException | IOException ex ) {
if (logger.isWarnEnabled()) { if (logger.isDebugEnabled()) {
logger.warn("Could not get resource paths for " + logger.debug("Could not get resource paths for " +
(resource != null ? resource : resourceLocation), ex); (resource != null ? resource : resourceLocation), ex);
} }
return null; return null;
@ -339,8 +339,8 @@ public class MockServletContext implements ServletContext {
throw ex; throw ex;
} }
catch (InvalidPathException | IOException ex) { catch (InvalidPathException | IOException ex) {
if (logger.isWarnEnabled()) { if (logger.isDebugEnabled()) {
logger.warn("Could not get URL for resource " + logger.debug("Could not get URL for resource " +
(resource != null ? resource : resourceLocation), ex); (resource != null ? resource : resourceLocation), ex);
} }
return null; return null;
@ -360,8 +360,8 @@ public class MockServletContext implements ServletContext {
return resource.getInputStream(); return resource.getInputStream();
} }
catch (InvalidPathException | IOException ex) { catch (InvalidPathException | IOException ex) {
if (logger.isWarnEnabled()) { if (logger.isDebugEnabled()) {
logger.warn("Could not open InputStream for resource " + logger.debug("Could not open InputStream for resource " +
(resource != null ? resource : resourceLocation), ex); (resource != null ? resource : resourceLocation), ex);
} }
return null; return null;
@ -476,8 +476,8 @@ public class MockServletContext implements ServletContext {
return resource.getFile().getAbsolutePath(); return resource.getFile().getAbsolutePath();
} }
catch (InvalidPathException | IOException ex) { catch (InvalidPathException | IOException ex) {
if (logger.isWarnEnabled()) { if (logger.isDebugEnabled()) {
logger.warn("Could not determine real path of resource " + logger.debug("Could not determine real path of resource " +
(resource != null ? resource : resourceLocation), ex); (resource != null ? resource : resourceLocation), ex);
} }
return null; return null;

18
spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockServletContext.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -315,8 +315,8 @@ public class MockServletContext implements ServletContext {
return resourcePaths; return resourcePaths;
} }
catch (InvalidPathException | IOException ex ) { catch (InvalidPathException | IOException ex ) {
if (logger.isWarnEnabled()) { if (logger.isDebugEnabled()) {
logger.warn("Could not get resource paths for " + logger.debug("Could not get resource paths for " +
(resource != null ? resource : resourceLocation), ex); (resource != null ? resource : resourceLocation), ex);
} }
return null; return null;
@ -339,8 +339,8 @@ public class MockServletContext implements ServletContext {
throw ex; throw ex;
} }
catch (InvalidPathException | IOException ex) { catch (InvalidPathException | IOException ex) {
if (logger.isWarnEnabled()) { if (logger.isDebugEnabled()) {
logger.warn("Could not get URL for resource " + logger.debug("Could not get URL for resource " +
(resource != null ? resource : resourceLocation), ex); (resource != null ? resource : resourceLocation), ex);
} }
return null; return null;
@ -360,8 +360,8 @@ public class MockServletContext implements ServletContext {
return resource.getInputStream(); return resource.getInputStream();
} }
catch (InvalidPathException | IOException ex) { catch (InvalidPathException | IOException ex) {
if (logger.isWarnEnabled()) { if (logger.isDebugEnabled()) {
logger.warn("Could not open InputStream for resource " + logger.debug("Could not open InputStream for resource " +
(resource != null ? resource : resourceLocation), ex); (resource != null ? resource : resourceLocation), ex);
} }
return null; return null;
@ -476,8 +476,8 @@ public class MockServletContext implements ServletContext {
return resource.getFile().getAbsolutePath(); return resource.getFile().getAbsolutePath();
} }
catch (InvalidPathException | IOException ex) { catch (InvalidPathException | IOException ex) {
if (logger.isWarnEnabled()) { if (logger.isDebugEnabled()) {
logger.warn("Could not determine real path of resource " + logger.debug("Could not determine real path of resource " +
(resource != null ? resource : resourceLocation), ex); (resource != null ? resource : resourceLocation), ex);
} }
return null; return null;