Fix eclipse/sonar warnings in models

Addressed the following eclipse/sonar warnings:
- unused imports
- unchanged type
- unreachable "catch" block
- reinterrupt

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

2 files changed, 3 insertions, 2 deletions

diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/ModifyNssiTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/ModifyNssiTest.java
index 21d7229a3..ff5f87c4e 100644
--- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/ModifyNssiTest.java
+++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/ModifyNssiTest.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2020 Wipro Limited.
+ * Modifications Copyright (C) 2020 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.
@@ -104,6 +105,7 @@ public class ModifyNssiTest extends BasicSoOperation {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     protected Map<String, Object> makePayload() {
         String payloadString = ResourceUtils
                 .getResourceAsString("src/test/resources/ModifyNSSI.json");
diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/CdsSimulator.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/CdsSimulator.java
index f1785c8ee..3418780bc 100644
--- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/CdsSimulator.java
+++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/CdsSimulator.java
@@ -91,9 +91,8 @@ public class CdsSimulator {
                             responseObserver.onNext(builder.build());
                         } catch (InvalidProtocolBufferException e) {
                             throw new SimulatorRuntimeException("Cannot convert ExecutionServiceOutput output", e);
-                        } catch (IOException e) {
-                            throw new SimulatorRuntimeException("Cannot read ExecutionServiceOutput from file", e);
                         } catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
                             throw new SimulatorRuntimeException("Execution Interrupted", e);
                         }
                     }