Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish contribution

Browse Source 
See gh-28014
This commit is contained in:
Sam Brannen
2022-02-19 14:32:57 +01:00
parent c5c926726d
commit 8c6d59aaaf
37 changed files with 132 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -173,19 +173,16 @@ public class MockPageContext extends PageContext {
@Nullable
public Object getAttribute(String name, int scope) {
Assert.notNull(name, "Attribute name must not be null");
switch (scope) {
case PAGE_SCOPE:
return getAttribute(name);
case REQUEST_SCOPE:
return this.request.getAttribute(name);
case SESSION_SCOPE:
return switch (scope) {
case PAGE_SCOPE -> getAttribute(name);
case REQUEST_SCOPE -> this.request.getAttribute(name);
case SESSION_SCOPE -> {
HttpSession session = this.request.getSession(false);
return (session != null ? session.getAttribute(name) : null);
case APPLICATION_SCOPE:
return this.servletContext.getAttribute(name);
default:
throw new IllegalArgumentException("Invalid scope: " + scope);
}
yield (session != null ? session.getAttribute(name) : null);
}
case APPLICATION_SCOPE -> this.servletContext.getAttribute(name);
default -> throw new IllegalArgumentException("Invalid scope: " + scope);
};
}
@Override
@@ -250,19 +247,16 @@ public class MockPageContext extends PageContext {
@Override
public Enumeration<String> getAttributeNamesInScope(int scope) {
switch (scope) {
case PAGE_SCOPE:
return getAttributeNames();
case REQUEST_SCOPE:
return this.request.getAttributeNames();
case SESSION_SCOPE:
return switch (scope) {
case PAGE_SCOPE -> getAttributeNames();
case REQUEST_SCOPE -> this.request.getAttributeNames();
case SESSION_SCOPE -> {
HttpSession session = this.request.getSession(false);
return (session != null ? session.getAttributeNames() : Collections.emptyEnumeration());
case APPLICATION_SCOPE:
return this.servletContext.getAttributeNames();
default:
throw new IllegalArgumentException("Invalid scope: " + scope);
}
yield (session != null ? session.getAttributeNames() : Collections.emptyEnumeration());
}
case APPLICATION_SCOPE -> this.servletContext.getAttributeNames();
default -> throw new IllegalArgumentException("Invalid scope: " + scope);
};
}
@Override