You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2022/08/13 19:35:42 UTC
[db-jdo] 03/07: JDO-817 removing compiler warnings: "raw use of parameterized class" in api submodule
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 38048f5dc28a332ec00a59c3970eb84a2a38389a
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sat Aug 13 20:50:55 2022 +0200
JDO-817 removing compiler warnings: "raw use of parameterized class" in api submodule
---
api/src/main/java/javax/jdo/annotations/Element.java | 2 +-
api/src/main/java/javax/jdo/annotations/Key.java | 2 +-
api/src/main/java/javax/jdo/annotations/Persistent.java | 2 +-
api/src/main/java/javax/jdo/annotations/Value.java | 2 +-
api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java | 4 ++--
api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java | 6 +++---
api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java | 8 ++++----
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/api/src/main/java/javax/jdo/annotations/Element.java b/api/src/main/java/javax/jdo/annotations/Element.java
index 1c9d2a30..3072e756 100644
--- a/api/src/main/java/javax/jdo/annotations/Element.java
+++ b/api/src/main/java/javax/jdo/annotations/Element.java
@@ -41,7 +41,7 @@ public @interface Element
* implementation supports multiple types.
* @return the types of elements
*/
- Class[] types() default {};
+ Class<?>[] types() default {};
/**
* Whether the element is to be stored serialized (into a join table)
diff --git a/api/src/main/java/javax/jdo/annotations/Key.java b/api/src/main/java/javax/jdo/annotations/Key.java
index 2af27b87..8bb2ad7d 100644
--- a/api/src/main/java/javax/jdo/annotations/Key.java
+++ b/api/src/main/java/javax/jdo/annotations/Key.java
@@ -41,7 +41,7 @@ public @interface Key
* implementation supports multiple types.
* @return the types of keys
*/
- Class[] types() default {};
+ Class<?>[] types() default {};
/**
* Whether the key is to be stored serialized (into a single column of a
diff --git a/api/src/main/java/javax/jdo/annotations/Persistent.java b/api/src/main/java/javax/jdo/annotations/Persistent.java
index 70b975b2..acdcb46b 100644
--- a/api/src/main/java/javax/jdo/annotations/Persistent.java
+++ b/api/src/main/java/javax/jdo/annotations/Persistent.java
@@ -163,7 +163,7 @@ public @interface Persistent
* for persistence.
* @return the types
*/
- Class[] types() default {};
+ Class<?>[] types() default {};
/** Name of the related member in the other class
* where this value is mapped (bidirectional relationship).
diff --git a/api/src/main/java/javax/jdo/annotations/Value.java b/api/src/main/java/javax/jdo/annotations/Value.java
index c56da16d..e2348cf2 100644
--- a/api/src/main/java/javax/jdo/annotations/Value.java
+++ b/api/src/main/java/javax/jdo/annotations/Value.java
@@ -41,7 +41,7 @@ public @interface Value
* implementation supports multiple types.
* @return the types of values
*/
- Class[] types() default {};
+ Class<?>[] types() default {};
/**
* Whether the value is to be stored serialized (into a single column of a
diff --git a/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java b/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
index 7d23172b..981bc71d 100644
--- a/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
@@ -151,7 +151,7 @@ public abstract class SingleFieldIdentity<SUBCLASS extends SingleFieldIdentity<S
} else if (obj == null || this.getClass() != obj.getClass()) {
return false;
} else {
- SingleFieldIdentity other = (SingleFieldIdentity) obj;
+ SingleFieldIdentity<?> other = (SingleFieldIdentity<?>) obj;
if (targetClass != null && targetClass == other.targetClass)
return true;
return targetClassName.equals (other.targetClassName);
@@ -197,7 +197,7 @@ public abstract class SingleFieldIdentity<SUBCLASS extends SingleFieldIdentity<S
* @return The relative ordering between the objects
* @since 2.2
*/
- protected int compare(SingleFieldIdentity o) {
+ protected int compare(SingleFieldIdentity<?> o) {
return targetClassName.compareTo(o.targetClassName);
}
diff --git a/api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java b/api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java
index abbb72c2..52e5e0f6 100644
--- a/api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java
+++ b/api/src/test/java/javax/jdo/identity/ConcreteTestIdentity.java
@@ -30,7 +30,7 @@ import java.io.ObjectOutput;
*
* @author clr
*/
- public class ConcreteTestIdentity extends SingleFieldIdentity {
+ public class ConcreteTestIdentity extends SingleFieldIdentity<ConcreteTestIdentity> {
private static final long serialVersionUID = 1L;
@@ -49,8 +49,8 @@ import java.io.ObjectOutput;
* @return The relative ordering between the objects
* @since 2.2
*/
- public int compareTo(Object o) {
- throw new ClassCastException("Not implemented");
+ public int compareTo(ConcreteTestIdentity o) {
+ throw new UnsupportedOperationException("Not implemented");
}
public void writeExternal(ObjectOutput out) throws IOException {
diff --git a/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java b/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java
index ed07797a..63d311f4 100644
--- a/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java
@@ -268,25 +268,25 @@ public class ObjectIdentityTest extends SingleFieldIdentityTest {
public void testStringLocaleConstructorLanguage() {
if (!isClassLoadable("java.util.Currency")) return;
- SingleFieldIdentity c1 = new ObjectIdentity(Object.class,
+ SingleFieldIdentity<ObjectIdentity> c1 = new ObjectIdentity(Object.class,
"java.util.Locale:en");
assertEquals(new Locale("en"), c1.getKeyAsObject());
}
public void testStringLocaleConstructorCountry() {
- SingleFieldIdentity c1 = new ObjectIdentity(Object.class,
+ SingleFieldIdentity<ObjectIdentity> c1 = new ObjectIdentity(Object.class,
"java.util.Locale:_US");
assertEquals(new Locale("","US"), c1.getKeyAsObject());
}
public void testStringLocaleConstructorLanguageCountry() {
- SingleFieldIdentity c1 = new ObjectIdentity(Object.class,
+ SingleFieldIdentity<ObjectIdentity> c1 = new ObjectIdentity(Object.class,
"java.util.Locale:en_US");
assertEquals(new Locale("en","US"), c1.getKeyAsObject());
}
public void testStringLocaleConstructorLanguageCountryVariant() {
- SingleFieldIdentity c1 = new ObjectIdentity(Object.class,
+ SingleFieldIdentity<ObjectIdentity> c1 = new ObjectIdentity(Object.class,
"java.util.Locale:en_US_MAC");
assertEquals(new Locale("en","US","MAC"), c1.getKeyAsObject());
}