From 85742f3936eb67a025da325c44d5f80568e56557 Mon Sep 17 00:00:00 2001
From: Benjamin Culkin <scorpress@gmail.com>
Date: Mon, 1 Jul 2024 17:34:09 -0400
Subject: Cleanup

---
 .../foundation/valuemodel/ValueHolderTest.java     | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'israfil-foundation-valuemodel/src/test/java')

diff --git a/israfil-foundation-valuemodel/src/test/java/net/israfil/foundation/valuemodel/ValueHolderTest.java b/israfil-foundation-valuemodel/src/test/java/net/israfil/foundation/valuemodel/ValueHolderTest.java
index 271c4a0..57d4d4e 100644
--- a/israfil-foundation-valuemodel/src/test/java/net/israfil/foundation/valuemodel/ValueHolderTest.java
+++ b/israfil-foundation-valuemodel/src/test/java/net/israfil/foundation/valuemodel/ValueHolderTest.java
@@ -33,9 +33,9 @@ public class ValueHolderTest {
 	@BeforeMethod
 	protected void setUp() throws Exception {
         stringValue = "String Value";
-        integerValue = new Integer(5);
-        stringValueHolder = new ValueHolder<String>(stringValue);
-        integerValueHolder = new ValueHolder<Integer>(integerValue);
+        integerValue = Integer.valueOf(5);
+        stringValueHolder = new ValueHolder<>(stringValue);
+        integerValueHolder = new ValueHolder<>(integerValue);
 	}
 
 	@AfterMethod
@@ -51,7 +51,7 @@ public class ValueHolderTest {
 	 */
 	public void testValueHolderObject() {
         String valueString = "Value";
-        ValueHolder<String>valueHolder = new ValueHolder<String>(valueString);
+        ValueHolder<String>valueHolder = new ValueHolder<>(valueString);
         Assert.assertEquals(valueString,valueHolder.get());
 	}
 
@@ -68,14 +68,14 @@ public class ValueHolderTest {
     
     public void testAddObserverObjectString() {
         String stringValue2 = "String Value 2";
-        CallbackObject<String> callback = new CallbackObject<String>(stringValueHolder);
+        CallbackObject<String> callback = new CallbackObject<>(stringValueHolder);
         stringValueHolder.addObservers("notifyMe:java.lang.Object:java.lang.Object:java.lang.Object",callback);
         stringValueHolder.set(stringValue2);
         Assert.assertTrue(callback.notified);
     }
     public void testRemoveObserverObjectString() {
         String stringValue2 = "String Value 2";
-        CallbackObject<String> callback = new CallbackObject<String>(stringValueHolder);
+        CallbackObject<String> callback = new CallbackObject<>(stringValueHolder);
         stringValueHolder.addObservers("notifyMe:java.lang.Object:java.lang.Object:java.lang.Object",callback);
         stringValueHolder.removeObservers(callback);
         stringValueHolder.set(stringValue2);
@@ -83,12 +83,12 @@ public class ValueHolderTest {
     } 
     public void testAddApproverObjectString() {
         String stringValue2 = "String Value 2";
-        CallbackObject<String> callback = new CallbackObject<String>(stringValueHolder);
+        CallbackObject<String> callback = new CallbackObject<>(stringValueHolder);
         stringValueHolder.addVetoers("approve:java.lang.Object:java.lang.Object:java.lang.Object",callback);
         stringValueHolder.set(stringValue2);
         Assert.assertEquals(stringValue2,stringValueHolder.get());
         
-        callback = new CallbackObject<String>(stringValueHolder);
+        callback = new CallbackObject<>(stringValueHolder);
         stringValueHolder.addVetoers("approve:java.lang.Object:java.lang.Object:java.lang.Object",callback);
         stringValueHolder.set(stringValue2);
         stringValueHolder.set(stringValue);
@@ -97,7 +97,7 @@ public class ValueHolderTest {
     }
     public void testRemoveApproverObjectString() {
         String stringValue2 = "String Value 2";
-        CallbackObject<String> callback = new CallbackObject<String>(stringValueHolder);
+        CallbackObject<String> callback = new CallbackObject<>(stringValueHolder);
         stringValueHolder.addVetoers("approve:java.lang.Object:java.lang.Object:java.lang.Object",callback);
         stringValueHolder.removeVetoers(callback);
         stringValueHolder.set(stringValue2);
@@ -105,7 +105,9 @@ public class ValueHolderTest {
         Assert.assertEquals(stringValue,stringValueHolder.get());
         Assert.assertFalse(stringValue2.equals(stringValueHolder.get()));   
     }
-    public void finalize() throws Throwable {
+    @SuppressWarnings("deprecation")
+	@Override
+	public void finalize() throws Throwable {
         stringValue = null;
         integerValue = null;
         stringValueHolder = null;
@@ -134,7 +136,9 @@ public class ValueHolderTest {
             if (!newValue.equals(stringValue)) return true;
             return false;
         }
-        public void finalize() throws Throwable {
+        @SuppressWarnings("deprecation")
+		@Override
+		public void finalize() throws Throwable {
             this.oldValue = null;
             this.newValue = null;
             super.finalize();
-- 
cgit v1.2.3