Use lombok annotations in IM and ONAP logging

Issue-ID: POLICY-3394
Change-Id: I25db6b4b13bad8754889eaedb93197cae7d27c4d
Signed-off-by: Jim Hahn <jrh3@att.com>

1 files changed, 8 insertions, 19 deletions

diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/MonitorTime.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/MonitorTime.java
index e489a8c1..61afb682 100644
--- a/integrity-monitor/src/main/java/org/onap/policy/common/im/MonitorTime.java
+++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/MonitorTime.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * Integrity Monitor
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018, 2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,31 +20,20 @@
 
 package org.onap.policy.common.im;
 
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.onap.policy.common.utils.time.CurrentTime;
 
 /**
  * "Current" time used by IntegrityMonitor classes.
  */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class MonitorTime {
 
     /**
      * Instance to be used. This is overridden by junit tests.
      */
+    @Getter
     private static CurrentTime instance = new CurrentTime();
-
-    /**
-     * Constructor.
-     */
-    private MonitorTime() {
-        super();
-    }
-
-    /**
-     * Get instance.
-     * 
-     * @return the CurrentTime singleton
-     */
-    public static CurrentTime getInstance() {
-        return instance;
-    }
 }