Merge pull request #494 from njr-11/Attribute-is-missing-type

Attribute is missing type
jakartaee · Feb 27, 2024 · 0beb855 · 0beb855
2 parents e84d825 + 09d8aed
commit 0beb855
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/api/src/main/java/jakarta/data/metamodel/Attribute.java b/api/src/main/java/jakarta/data/metamodel/Attribute.java
@@ -21,8 +21,10 @@
 
 /**
  * Represents an entity attribute in the {@link StaticMetamodel}.
+ *
+ * @param <T> entity class of the static metamodel.
  */
-public interface Attribute {
+public interface Attribute<T> {
     /**
      * Obtain the entity attribute name, suitable for use wherever the specification requires
      * an entity attribute name. For example, as the parameter to {@link Sort#asc(String)}.

diff --git a/api/src/main/java/jakarta/data/metamodel/SortableAttribute.java b/api/src/main/java/jakarta/data/metamodel/SortableAttribute.java
@@ -33,7 +33,7 @@
  *
  * @param <T> entity class of the static metamodel.
  */
-public interface SortableAttribute<T> extends Attribute {
+public interface SortableAttribute<T> extends Attribute<T> {
 
     /**
      * Obtain a request for an ascending {@link Sort} based on the entity attribute.

diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/read/only/_AsciiChar.java b/tck/src/main/java/ee/jakarta/tck/data/framework/read/only/_AsciiChar.java
@@ -32,7 +32,7 @@ public class _AsciiChar {
 
     public static volatile SortableAttribute<AsciiCharacter> id;
     public static volatile TextAttribute<AsciiCharacter> hexadecimal;
-    public static volatile Attribute isControl; // user decided it didn't care about sorting for this one
+    public static volatile Attribute<AsciiCharacter> isControl; // user decided it didn't care about sorting for this one
     public static volatile SortableAttribute<AsciiCharacter> numericValue;
     public static volatile TextAttribute<AsciiCharacter> thisCharacter;