You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/01/30 18:51:02 UTC
[tomcat] branch master updated (d0a2420 -> 2becffb)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from d0a2420 Remove leftover debug
new 3217a7b Jakarta EL 4.0 will add missing generics
new 2becffb Use generics now they are used in the API
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/jakarta/el/ELContext.java | 7 ++-----
java/jakarta/el/StandardELContext.java | 6 ++----
java/org/apache/el/lang/EvaluationContext.java | 7 ++-----
java/org/apache/jasper/el/ELContextWrapper.java | 5 ++---
java/org/apache/jasper/runtime/JspContextWrapper.java | 4 ++--
5 files changed, 10 insertions(+), 19 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Use generics now they are used in the API
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2becffb3d2cc4b27630d16f0351cb1823b971e5b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 27 21:56:08 2020 +0000
Use generics now they are used in the API
---
java/org/apache/el/lang/EvaluationContext.java | 7 ++-----
java/org/apache/jasper/el/ELContextWrapper.java | 5 ++---
java/org/apache/jasper/runtime/JspContextWrapper.java | 4 ++--
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/el/lang/EvaluationContext.java b/java/org/apache/el/lang/EvaluationContext.java
index fad4c4f..6f39efc 100644
--- a/java/org/apache/el/lang/EvaluationContext.java
+++ b/java/org/apache/el/lang/EvaluationContext.java
@@ -58,8 +58,7 @@ public final class EvaluationContext extends ELContext {
}
@Override
- // Can't use Class<?> because API needs to match specification in superclass
- public Object getContext(@SuppressWarnings("rawtypes") Class key) {
+ public Object getContext(Class<?> key) {
return elContext.getContext(key);
}
@@ -74,9 +73,7 @@ public final class EvaluationContext extends ELContext {
}
@Override
- // Can't use Class<?> because API needs to match specification in superclass
- public void putContext(@SuppressWarnings("rawtypes") Class key,
- Object contextObject) {
+ public void putContext(Class<?> key, Object contextObject) {
elContext.putContext(key, contextObject);
}
diff --git a/java/org/apache/jasper/el/ELContextWrapper.java b/java/org/apache/jasper/el/ELContextWrapper.java
index 7c5abcb..d19dfe8 100644
--- a/java/org/apache/jasper/el/ELContextWrapper.java
+++ b/java/org/apache/jasper/el/ELContextWrapper.java
@@ -55,7 +55,7 @@ public final class ELContextWrapper extends ELContext {
}
@Override
- public Object getContext(@SuppressWarnings("rawtypes") Class key) {
+ public Object getContext(Class<?> key) {
return this.target.getContext(key);
}
@@ -70,8 +70,7 @@ public final class ELContextWrapper extends ELContext {
}
@Override
- public void putContext(@SuppressWarnings("rawtypes") Class key,
- Object contextObject) throws NullPointerException {
+ public void putContext(Class<?> key, Object contextObject) throws NullPointerException {
this.target.putContext(key, contextObject);
}
diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java b/java/org/apache/jasper/runtime/JspContextWrapper.java
index 0620d56..d7c0956 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -549,12 +549,12 @@ public class JspContextWrapper extends PageContext implements VariableResolver {
}
@Override
- public void putContext(@SuppressWarnings("rawtypes") Class key, Object contextObject) {
+ public void putContext(Class<?> key, Object contextObject) {
wrapped.putContext(key, contextObject);
}
@Override
- public Object getContext(@SuppressWarnings("rawtypes") Class key) {
+ public Object getContext(Class<?> key) {
if (key == JspContext.class) {
return pageContext;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Jakarta EL 4.0 will add missing generics
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3217a7b0a664193952a8b8311a125db0ee834310
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 27 21:51:44 2020 +0000
Jakarta EL 4.0 will add missing generics
---
java/jakarta/el/ELContext.java | 7 ++-----
java/jakarta/el/StandardELContext.java | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index aae67a4..8f622b1 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -64,7 +64,6 @@ public abstract class ELContext {
return this.resolved;
}
- // Can't use Class<?> because API needs to match specification
/**
* Add an object to this EL context under the given key.
*
@@ -74,8 +73,7 @@ public abstract class ELContext {
* @throws NullPointerException
* If the supplied key or context is <code>null</code>
*/
- public void putContext(@SuppressWarnings("rawtypes") Class key,
- Object contextObject) {
+ public void putContext(Class<?> key, Object contextObject) {
Objects.requireNonNull(key);
Objects.requireNonNull(contextObject);
@@ -86,7 +84,6 @@ public abstract class ELContext {
this.map.put(key, contextObject);
}
- // Can't use Class<?> because API needs to match specification
/**
* Obtain the context object for the given key.
*
@@ -97,7 +94,7 @@ public abstract class ELContext {
* @throws NullPointerException
* If the supplied key is <code>null</code>
*/
- public Object getContext(@SuppressWarnings("rawtypes") Class key) {
+ public Object getContext(Class<?> key) {
Objects.requireNonNull(key);
if (this.map == null) {
return null;
diff --git a/java/jakarta/el/StandardELContext.java b/java/jakarta/el/StandardELContext.java
index ae43a73..59bffbf 100644
--- a/java/jakarta/el/StandardELContext.java
+++ b/java/jakarta/el/StandardELContext.java
@@ -73,10 +73,8 @@ public class StandardELContext extends ELContext {
standardResolver.add(context.getELResolver());
}
- // Can't use Class<?> because API needs to match specification
@Override
- public void putContext(@SuppressWarnings("rawtypes") Class key,
- Object contextObject) {
+ public void putContext(Class<?> key, Object contextObject) {
if (wrappedContext == null) {
super.putContext(key, contextObject);
} else {
@@ -85,7 +83,7 @@ public class StandardELContext extends ELContext {
}
@Override
- public Object getContext(@SuppressWarnings("rawtypes") Class key) {
+ public Object getContext(Class<?> key) {
if (wrappedContext == null) {
return super.getContext(key);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org