This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-7803-nullability in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit a54fa5a81c3bd234846f7c0d72de82eac3a76ad1 Merge: 51c35a3 27d24e0 Author: sseifert <[email protected]> AuthorDate: Fri Aug 3 16:19:40 2018 +0200 Merge branch 'master' into feature/SLING-7803-nullability .../testing/mock/sling/servlet/MockRequestPathInfo.java | 14 +++++++++++++- .../mock/sling/servlet/MockSlingHttpServletRequest.java | 2 +- .../sling/testing/mock/sling/servlet/package-info.java | 2 +- .../sling/servlet/MockSlingHttpServletRequestTest.java | 13 +++++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --cc src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java index 326cdba,c54fef6..5589d4a --- a/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequest.java @@@ -52,11 -51,11 +52,11 @@@ public class MockSlingHttpServletReques this.bundleContext = bundleContext; } - protected MockRequestPathInfo newMockRequestPathInfo() { + protected @NotNull MockRequestPathInfo newMockRequestPathInfo() { - return new MockRequestPathInfo(); + return new MockRequestPathInfo(getResourceResolver()); } - protected MockHttpSession newMockHttpSession() { + protected @NotNull MockHttpSession newMockHttpSession() { return new MockHttpSession(); }
