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/07/16 22:47:23 UTC
[db-jdo] 07/07: JDO-817 removing compiler warnings: static variable should be qualified by type name
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 3992bd4367c74f56ebd0c720fbf124810330ff7c
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 17 00:30:00 2022 +0200
JDO-817 removing compiler warnings: static variable should be qualified by type name
---
.../api/instancecallbacks/InstanceLifecycleListenerAttach.java | 9 +++++----
.../api/instancecallbacks/InstanceLifecycleListenerClear.java | 9 +++++----
.../api/instancecallbacks/InstanceLifecycleListenerDelete.java | 9 +++++----
.../api/instancecallbacks/InstanceLifecycleListenerDetach.java | 9 +++++----
.../api/instancecallbacks/InstanceLifecycleListenerDirty.java | 5 +++--
.../tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java | 7 ++++---
.../api/instancecallbacks/InstanceLifecycleListenerStore.java | 9 +++++----
7 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java
index 2f09a703..b5f080b6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java
@@ -61,6 +61,7 @@ public class InstanceLifecycleListenerAttach
/**
* The persistent classes used for this test.
*/
+ @SuppressWarnings("rawtypes")
private static final Class<?>[] persistentClasses = new Class[] {PC.class};
/** Return the persistent classes.
@@ -102,9 +103,9 @@ public class InstanceLifecycleListenerAttach
// now check the callback and listener were called
listener.verifyCallbacks(ASSERTION13_FAILED, new int[] {
- listener.PRE_ATTACH_LISTENER,
- listener.PRE_ATTACH_CALLBACK,
- listener.POST_ATTACH_LISTENER});
+ InstanceLifecycleListenerImpl.PRE_ATTACH_LISTENER,
+ InstanceLifecycleListenerImpl.PRE_ATTACH_CALLBACK,
+ InstanceLifecycleListenerImpl.POST_ATTACH_LISTENER});
}
/**
@@ -164,7 +165,7 @@ public class InstanceLifecycleListenerAttach
public void jdoPreAttach() {
if (listener != null) {
- listener.notifyEvent(listener.PRE_ATTACH_CALLBACK);
+ listener.notifyEvent(InstanceLifecycleListenerImpl.PRE_ATTACH_CALLBACK);
}
}
public void jdoPostAttach(Object obj) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java
index eff2afc8..3b090010 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java
@@ -64,6 +64,7 @@ public class InstanceLifecycleListenerClear
/**
* The persistent classes used for this test.
*/
+ @SuppressWarnings("rawtypes")
private final static Class<?>[] persistentClasses = new Class[] {PC.class};
/** Return the persistent classes.
@@ -102,9 +103,9 @@ public class InstanceLifecycleListenerClear
// now check the callback and listeners were called
listener.verifyCallbacks(ASSERTION5_FAILED, new int[] {
- listener.PRE_CLEAR_LISTENER,
- listener.PRE_CLEAR_CALLBACK,
- listener.POST_CLEAR_LISTENER});
+ InstanceLifecycleListenerImpl.PRE_CLEAR_LISTENER,
+ InstanceLifecycleListenerImpl.PRE_CLEAR_CALLBACK,
+ InstanceLifecycleListenerImpl.POST_CLEAR_LISTENER});
}
/**
@@ -151,7 +152,7 @@ public class InstanceLifecycleListenerClear
public void jdoPreClear() {
if (listener != null) {
- listener.notifyEvent(listener.PRE_CLEAR_CALLBACK);
+ listener.notifyEvent(InstanceLifecycleListenerImpl.PRE_CLEAR_CALLBACK);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java
index 6a5b9d42..a1662b93 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java
@@ -64,6 +64,7 @@ public class InstanceLifecycleListenerDelete
/**
* The persistent classes used for this test.
*/
+ @SuppressWarnings("rawtypes")
private final static Class<?>[] persistentClasses = new Class[] {PC.class};
/** Return the persistent classes.
@@ -101,9 +102,9 @@ public class InstanceLifecycleListenerDelete
// now check the callback and listeners were called
listener.verifyCallbacks(ASSERTION7_FAILED, (new int[] {
- listener.PRE_DELETE_LISTENER,
- listener.PRE_DELETE_CALLBACK,
- listener.POST_DELETE_LISTENER}));
+ InstanceLifecycleListenerImpl.PRE_DELETE_LISTENER,
+ InstanceLifecycleListenerImpl.PRE_DELETE_CALLBACK,
+ InstanceLifecycleListenerImpl.POST_DELETE_LISTENER}));
}
/**
@@ -153,7 +154,7 @@ public class InstanceLifecycleListenerDelete
public void jdoPreDelete() {
if (listener != null) {
- listener.notifyEvent(listener.PRE_DELETE_CALLBACK);
+ listener.notifyEvent(InstanceLifecycleListenerImpl.PRE_DELETE_CALLBACK);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java
index a9eb250a..86555f3f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java
@@ -62,6 +62,7 @@ public class InstanceLifecycleListenerDetach
/**
* The persistent classes used for this test.
*/
+ @SuppressWarnings("rawtypes")
private final static Class<?>[] persistentClasses = new Class[] {PC.class};
/** Return the persistent classes.
@@ -100,9 +101,9 @@ public class InstanceLifecycleListenerDetach
// now check the callback and listener were called
listener.verifyCallbacks(ASSERTION11_FAILED, new int[] {
- listener.PRE_DETACH_LISTENER,
- listener.PRE_DETACH_CALLBACK,
- listener.POST_DETACH_LISTENER});
+ InstanceLifecycleListenerImpl.PRE_DETACH_LISTENER,
+ InstanceLifecycleListenerImpl.PRE_DETACH_CALLBACK,
+ InstanceLifecycleListenerImpl.POST_DETACH_LISTENER});
}
/**
@@ -165,7 +166,7 @@ public class InstanceLifecycleListenerDetach
public void jdoPreDetach() {
if (listener != null) {
- listener.notifyEvent(listener.PRE_DETACH_CALLBACK);
+ listener.notifyEvent(InstanceLifecycleListenerImpl.PRE_DETACH_CALLBACK);
}
}
public void jdoPostDetach(Object obj) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java
index 7ee0efaa..4da6ae78 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java
@@ -63,6 +63,7 @@ public class InstanceLifecycleListenerDirty
/**
* The persistent classes used for this test.
*/
+ @SuppressWarnings("rawtypes")
private final static Class<?>[] persistentClasses = new Class[] {PCPoint.class};
/** Return the persistent classes.
@@ -102,8 +103,8 @@ public class InstanceLifecycleListenerDirty
// now check the callback and listener were called
listener.verifyCallbacks(ASSERTION10_FAILED, new int[] {
- listener.PRE_DIRTY_LISTENER,
- listener.POST_DIRTY_LISTENER});
+ InstanceLifecycleListenerImpl.PRE_DIRTY_LISTENER,
+ InstanceLifecycleListenerImpl.POST_DIRTY_LISTENER});
}
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java
index 093f0f34..885790b5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java
@@ -58,6 +58,7 @@ public class InstanceLifecycleListenerLoad
/**
* The persistent classes used for this test.
*/
+ @SuppressWarnings("rawtypes")
private final static Class<?>[] persistentClasses = new Class[] {PC.class};
/** Return the persistent classes.
@@ -98,8 +99,8 @@ public class InstanceLifecycleListenerLoad
// now check the callback and listener were called
listener.verifyCallbacks(ASSERTION2_FAILED, new int[] {
- listener.POST_LOAD_CALLBACK,
- listener.POST_LOAD_LISTENER});
+ InstanceLifecycleListenerImpl.POST_LOAD_CALLBACK,
+ InstanceLifecycleListenerImpl.POST_LOAD_LISTENER});
}
/**
@@ -142,7 +143,7 @@ public class InstanceLifecycleListenerLoad
public void jdoPostLoad() {
if (listener != null) {
- listener.notifyEvent(listener.POST_LOAD_CALLBACK);
+ listener.notifyEvent(InstanceLifecycleListenerImpl.POST_LOAD_CALLBACK);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java
index d551867b..32b4bd11 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java
@@ -66,6 +66,7 @@ public class InstanceLifecycleListenerStore
/**
* The persistent classes used for this test.
*/
+ @SuppressWarnings("rawtypes")
private final static Class<?>[] persistentClasses = new Class[] {PC.class};
/** Return the persistent classes.
@@ -101,9 +102,9 @@ public class InstanceLifecycleListenerStore
// now check the callback and listener were called
listener.verifyCallbacks(ASSERTION2_FAILED, new int[] {
- listener.PRE_STORE_LISTENER,
- listener.PRE_STORE_CALLBACK,
- listener.POST_STORE_LISTENER});
+ InstanceLifecycleListenerImpl.PRE_STORE_LISTENER,
+ InstanceLifecycleListenerImpl.PRE_STORE_CALLBACK,
+ InstanceLifecycleListenerImpl.POST_STORE_LISTENER});
}
/**
@@ -148,7 +149,7 @@ public class InstanceLifecycleListenerStore
public void jdoPreStore() {
if (listener != null) {
- listener.notifyEvent(listener.PRE_STORE_CALLBACK);
+ listener.notifyEvent(InstanceLifecycleListenerImpl.PRE_STORE_CALLBACK);
}
}
}