TimeInfo is a record

We have Java 17, hence we can improve brevity by using a record.

Change-Id: Ic1e098f1410d80c1bea4e33755a94cb88f2cde23
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/TestBundleDiag.java b/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/TestBundleDiag.java
index 15757bbb0b600800ae88807dc869076e97252300..766c89a8154f27f1d3981f7aca22c789a3426d84 100644 (file)
--- a/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/TestBundleDiag.java
+++ b/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/TestBundleDiag.java
@@ -59,7 +59,7 @@ public class TestBundleDiag {
     public void checkBundleDiagInfos(long timeout, TimeUnit timeoutUnit) throws SystemStateFailureException {
         checkBundleDiagInfos(timeout, timeoutUnit, (timeInfo, bundleDiagInfos) ->
             LOG.info("checkBundleDiagInfos: Elapsed time {}s, remaining time {}s, {}",
-                    timeInfo.getElapsedTimeInMS() / 1000, timeInfo.getRemainingTimeInMS() / 1000,
+                    timeInfo.elapsedTimeInMS() / 1000, timeInfo.remainingTimeInMS() / 1000,
                     bundleDiagInfos.getFullDiagnosticText()));
     }
 

diff --git a/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/TimeInfo.java b/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/TimeInfo.java
index 82ad2f9930d5b4f4c01af7bcbe275eca8f54fb02..ee6c56276b2e092d6c6a15a2940ff723b144381f 100644 (file)
--- a/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/TimeInfo.java
+++ b/bundles-test-lib/src/main/java/org/opendaylight/odlparent/bundlestest/lib/TimeInfo.java
@@ -12,50 +12,19 @@ package org.opendaylight.odlparent.bundlestest.lib;
  *
  * @author Michael Vorburger.ch
  */
-public final class TimeInfo {
-
-    private final long elapsedTimeInMS;
-    private final long remainingTimeInMS;
-
-    public TimeInfo(long elapsedTimeInMS, long remainingTimeInMS) {
-        this.elapsedTimeInMS = elapsedTimeInMS;
-        this.remainingTimeInMS = remainingTimeInMS;
-    }
-
+public record TimeInfo(long elapsedTimeInMS, long remainingTimeInMS) {
+    @Deprecated(since = "13.0.5", forRemoval = true)
     public long getElapsedTimeInMS() {
         return elapsedTimeInMS;
     }
 
+    @Deprecated(since = "13.0.5", forRemoval = true)
     public long getRemainingTimeInMS() {
         return remainingTimeInMS;
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (int) (elapsedTimeInMS ^ elapsedTimeInMS >>> 32);
-        result = prime * result + (int) (remainingTimeInMS ^ remainingTimeInMS >>> 32);
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-
-        TimeInfo timeInfo = (TimeInfo) obj;
-
-        return elapsedTimeInMS == timeInfo.elapsedTimeInMS && remainingTimeInMS == timeInfo.remainingTimeInMS;
-    }
-
     @Override
     public String toString() {
         return "TimeInfo [elapsedTimeInMS=" + elapsedTimeInMS + ", remainingTimeInMS=" + remainingTimeInMS + "]";
     }
-
 }