Updated to Java 11

Change-Id: I890cabaecf65588739d4e6281ec9b32087e334ea
Issue-ID: HOLMES-302
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

4 files changed, 23 insertions, 43 deletions

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/RuleActiveAppTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/RuleActiveAppTest.java
index 287d5a3..e34643a 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/RuleActiveAppTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/RuleActiveAppTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2020 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,19 +16,8 @@
 
 package org.onap.holmes.rulemgt;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
-
-import org.junit.Test;
-
 public class RuleActiveAppTest {
 
-    @Test
-    public void getName() throws Exception {
-        RuleActiveApp app = new RuleActiveApp();
-        assertThat(app.getName(), equalTo("Holmes Rule Management ActiveApp APP "));
-    }
-
     public static void main(String[] args) throws Exception {
         String filePath = "E:\\Codes\\ONAP\\holmes\\rule-management\\rulemgt-standalone\\src\\main\\assembly\\conf\\rulemgt.yml";
         new RuleActiveApp().run(new String[]{"server", filePath});
diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
index e028a2c..0e97e3a 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/db/CorrelationRuleQueryDaoTest.java
@@ -1,5 +1,5 @@
 /**

- * Copyright 2017 ZTE Corporation.

+ * Copyright 2017-2020 ZTE Corporation.

  *

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -16,38 +16,35 @@
 

 package org.onap.holmes.rulemgt.db;

 

-import static org.hamcrest.MatcherAssert.assertThat;

-import static org.hamcrest.Matchers.is;

-

-import java.util.ArrayList;

-import java.util.Date;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import java.util.Properties;

 import org.easymock.EasyMock;

 import org.junit.Before;

 import org.junit.Rule;

 import org.junit.Test;

 import org.junit.rules.ExpectedException;

+import org.junit.runner.RunWith;

 import org.onap.holmes.common.api.entity.CorrelationRule;

 import org.onap.holmes.common.exception.CorrelationException;

 import org.onap.holmes.common.utils.DbDaoUtil;

 import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;

 import org.powermock.api.easymock.PowerMock;

-import org.powermock.modules.junit4.rule.PowerMockRule;

+import org.powermock.core.classloader.annotations.PrepareForTest;

+import org.powermock.modules.junit4.PowerMockRunner;

 import org.powermock.reflect.Whitebox;

 import org.skife.jdbi.v2.Handle;

 import org.skife.jdbi.v2.Query;

 

+import java.util.*;

 

+import static org.hamcrest.MatcherAssert.assertThat;

+import static org.hamcrest.Matchers.is;

+

+@RunWith(PowerMockRunner.class)

+@PrepareForTest({DbDaoUtil.class, Handle.class, Query.class})

 public class CorrelationRuleQueryDaoTest {

 

     @Rule

     public ExpectedException thrown = ExpectedException.none();

 

-    @Rule

-    public PowerMockRule powerMockRule = new PowerMockRule();

     private DbDaoUtil dbDaoUtil;

 

     private Handle handle;

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/send/RuleAllocatorTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/send/RuleAllocatorTest.java
index 5dc8281..09fcf93 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/send/RuleAllocatorTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/send/RuleAllocatorTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2020 ZTE Corporation.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,6 @@ import org.onap.holmes.rulemgt.wrapper.RuleQueryWrapper;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.modules.junit4.rule.PowerMockRule;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -46,6 +45,7 @@ import java.util.stream.Collectors;
 
 import static org.onap.holmes.rulemgt.send.RuleAllocator.ENABLE;
 
+@RunWith(PowerMockRunner.class)
 @PrepareForTest({ServiceLocator.class, RuleMgtWrapper.class, RuleQueryWrapper.class, EngineWrapper.class,
         EngineInsQueryTool.class, DbDaoUtil.class, ServiceLocatorHolder.class})
 public class RuleAllocatorTest {
@@ -53,9 +53,6 @@ public class RuleAllocatorTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-    @Rule
-    public PowerMockRule rule = new PowerMockRule();
-
     private RuleMgtWrapper ruleMgtWrapperMock;
     private RuleQueryWrapper ruleQueryWrapperMock;
     private EngineWrapper engineWrapperMock;
diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
index 4b3e60f..90384ce 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
@@ -16,37 +16,34 @@
 

 package org.onap.holmes.rulemgt.wrapper;

 

-import static org.hamcrest.MatcherAssert.assertThat;

-import static org.hamcrest.Matchers.equalTo;

-import static org.hamcrest.Matchers.is;

 

-import java.util.ArrayList;

-import java.util.Date;

-import java.util.List;

 import org.easymock.EasyMock;

 import org.junit.Before;

 import org.junit.Rule;

 import org.junit.Test;

 import org.junit.rules.ExpectedException;

-import org.onap.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;

-import org.onap.holmes.rulemgt.db.CorrelationRuleDao;

 import org.onap.holmes.common.api.entity.CorrelationRule;

 import org.onap.holmes.common.exception.CorrelationException;

 import org.onap.holmes.common.utils.DbDaoUtil;

-import org.onap.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;

-import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest;

-import org.onap.holmes.rulemgt.bean.request.RuleDeleteRequest;

-import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;

-import org.onap.holmes.rulemgt.bean.request.RuleUpdateRequest;

+import org.onap.holmes.rulemgt.bean.request.*;

 import org.onap.holmes.rulemgt.bean.response.RuleAddAndUpdateResponse;

 import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse;

 import org.onap.holmes.rulemgt.bolt.enginebolt.EngineWrapper;

+import org.onap.holmes.rulemgt.db.CorrelationRuleDao;

 import org.onap.holmes.rulemgt.db.CorrelationRuleQueryDao;

 import org.onap.holmes.rulemgt.send.Ip4AddingRule;

 import org.powermock.api.easymock.PowerMock;

 import org.powermock.modules.junit4.rule.PowerMockRule;

 import org.powermock.reflect.Whitebox;

 

+import java.util.ArrayList;

+import java.util.Date;

+import java.util.List;

+

+import static org.hamcrest.MatcherAssert.assertThat;

+import static org.hamcrest.Matchers.equalTo;

+import static org.hamcrest.Matchers.is;

+

 public class RuleMgtWrapperTest {

 

     @Rule