Faces Spec #1824 - Create TypeLiteral Constants

apache · Sep 3, 2024 · 647fc2c · 647fc2c
1 parent 7efa1a3
commit 647fc2c
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 0 deletions.
diff --git a/api/src/main/java/jakarta/faces/annotation/ApplicationMap.java b/api/src/main/java/jakarta/faces/annotation/ApplicationMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface ApplicationMap
 {
+    public static final TypeLiteral<Map<String, Object>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<ApplicationMap> implements ApplicationMap
     {
         private static final long serialVersionUID = 1L;

diff --git a/api/src/main/java/jakarta/faces/annotation/FlowMap.java b/api/src/main/java/jakarta/faces/annotation/FlowMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface FlowMap
 {
+    public static final TypeLiteral<Map<Object, Object>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<FlowMap> implements FlowMap
     {
         private static final long serialVersionUID = 1L;

diff --git a/api/src/main/java/jakarta/faces/annotation/HeaderMap.java b/api/src/main/java/jakarta/faces/annotation/HeaderMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface HeaderMap
 {
+    public static final TypeLiteral<Map<String, String>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<HeaderMap> implements HeaderMap
     {
         private static final long serialVersionUID = 1L;

diff --git a/api/src/main/java/jakarta/faces/annotation/HeaderValuesMap.java b/api/src/main/java/jakarta/faces/annotation/HeaderValuesMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface HeaderValuesMap
 {
+    public static final TypeLiteral<Map<String, String[]>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<HeaderValuesMap> implements HeaderValuesMap
     {
         private static final long serialVersionUID = 1L;

diff --git a/api/src/main/java/jakarta/faces/annotation/InitParameterMap.java b/api/src/main/java/jakarta/faces/annotation/InitParameterMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface InitParameterMap
 {
+    public static final TypeLiteral<Map<String, String>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<InitParameterMap> implements InitParameterMap
     {
         private static final long serialVersionUID = 1L;

diff --git a/api/src/main/java/jakarta/faces/annotation/RequestCookieMap.java b/api/src/main/java/jakarta/faces/annotation/RequestCookieMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface RequestCookieMap
 {
+    public static final TypeLiteral<Map<String, Object>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<RequestCookieMap> implements RequestCookieMap
     {
         private static final long serialVersionUID = 1L;

diff --git a/api/src/main/java/jakarta/faces/annotation/RequestMap.java b/api/src/main/java/jakarta/faces/annotation/RequestMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface RequestMap
 {
+    public static final TypeLiteral<Map<String, Object>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<RequestMap> implements RequestMap
     {
         private static final long serialVersionUID = 1L;

diff --git a/api/src/main/java/jakarta/faces/annotation/RequestParameterMap.java b/api/src/main/java/jakarta/faces/annotation/RequestParameterMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface RequestParameterMap
 {
+    public static final TypeLiteral<Map<String, String>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<RequestParameterMap> implements RequestParameterMap
     {
         private static final long serialVersionUID = 1L;

diff --git a/api/src/main/java/jakarta/faces/annotation/RequestParameterValuesMap.java b/api/src/main/java/jakarta/faces/annotation/RequestParameterValuesMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface RequestParameterValuesMap
 {
+    public static final TypeLiteral<Map<String, String[]>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<RequestParameterValuesMap>
             implements RequestParameterValuesMap
     {

diff --git a/api/src/main/java/jakarta/faces/annotation/SessionMap.java b/api/src/main/java/jakarta/faces/annotation/SessionMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface SessionMap
 {
+    public static final TypeLiteral<Map<String, Object>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<SessionMap> implements SessionMap
     {
         private static final long serialVersionUID = 1L;

diff --git a/api/src/main/java/jakarta/faces/annotation/ViewMap.java b/api/src/main/java/jakarta/faces/annotation/ViewMap.java
@@ -23,6 +23,9 @@
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import java.util.Map;
+
+import jakarta.enterprise.util.TypeLiteral;
 import jakarta.inject.Qualifier;
 
 /**
@@ -33,6 +36,11 @@
 @Target(value={ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD})
 public @interface ViewMap
 {
+    public static final TypeLiteral<Map<String, Object>> TYPE = new TypeLiteral<>()
+    {
+        private static final long serialVersionUID = 1L;
+    };
+
     public static final class Literal extends AnnotationLiteral<ViewMap> implements ViewMap
     {
         private static final long serialVersionUID = 1L;