Merge pull request #3051 from yurake/3049-fix-third-party-code-assess…

…ment fix third party code assessment #3049
yurake · Feb 15, 2023 · 9b9e440 · 9b9e440
2 parents 0e01648 + 0d30017
commit 9b9e440
Show file tree

Hide file tree

Showing 20 changed files with 101 additions and 76 deletions.
diff --git a/...n/jaxrs-activemq-quarkus/src/test/java/webapp/tier/service/socket/ActiveMqSocketTest.java b/...n/jaxrs-activemq-quarkus/src/test/java/webapp/tier/service/socket/ActiveMqSocketTest.java
@@ -1,8 +1,9 @@
 package webapp.tier.service.socket;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import javax.inject.Inject;
 import javax.websocket.RemoteEndpoint;
@@ -24,7 +25,7 @@ class ActiveMqSocketTest {
 
 	@Test
 	void testOnOpen() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
 			Mockito.when(session.getId()).thenReturn(id);
 			socket.onOpen(session);
@@ -36,7 +37,7 @@ void testOnOpen() {
 
 	@Test
 	void testOnClose() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
 			Mockito.when(session.getId()).thenReturn(id);
 			socket.onOpen(session);
@@ -49,7 +50,7 @@ void testOnClose() {
 
 	@Test
 	void testOnError() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
 			Mockito.when(session.getId()).thenReturn(id);
 			socket.onOpen(session);
@@ -62,9 +63,9 @@ void testOnError() {
 
 	@Test
 	void testOnMessage() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
-			RemoteEndpoint.Async async = Mockito.mock(RemoteEndpoint.Async.class);
+			RemoteEndpoint.Async async = mock(RemoteEndpoint.Async.class);
 			Mockito.when(session.getId()).thenReturn(id);
 			Mockito.when(session.getAsyncRemote()).thenReturn(async);
 			socket.onOpen(session);

diff --git a/...cast-quarkus/src/test/java/webapp/tier/healthcheck/ReadinessHealthCheckHazelcastTest.java b/...cast-quarkus/src/test/java/webapp/tier/healthcheck/ReadinessHealthCheckHazelcastTest.java
@@ -3,6 +3,7 @@
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
@@ -27,7 +28,7 @@ void testCallDown() {
 	void testCallUp() throws IOException, TimeoutException {
 		ReadinessHealthCheckHazelcast hc = new ReadinessHealthCheckHazelcast() {
 			protected HazelcastServiceStatus createHazelcastStatus() {
-				HazelcastServiceStatus mock = Mockito.mock(HazelcastServiceStatus.class);
+				HazelcastServiceStatus mock = mock(HazelcastServiceStatus.class);
 				Mockito.when(mock.isActive()).thenReturn(true);
 				return mock;
 			}

diff --git a/.../jaxrs-hazelcast-quarkus/src/test/java/webapp/tier/service/HazelcastCacheServiceTest.java b/.../jaxrs-hazelcast-quarkus/src/test/java/webapp/tier/service/HazelcastCacheServiceTest.java
@@ -1,11 +1,9 @@
 package webapp.tier.service;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.Mockito.when;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
@@ -20,7 +18,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
 
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
@@ -58,7 +55,7 @@ void testPutMsgHazelcast() throws NoSuchAlgorithmException {
 
 	@Test
 	void testPutMsgHazelcastError() {
-		HazelcastInstance mockInstanceError = Mockito.mock(HazelcastInstance.class);
+		HazelcastInstance mockInstanceError = mock(HazelcastInstance.class);
 		when(mockInstanceError.getMap(ArgumentMatchers.any()))
 				.thenThrow(new IllegalStateException());
 		try {
@@ -85,7 +82,7 @@ void testGetMsgHazelcast() {
 
 	@Test
 	void testGetMsgHazelcastError() {
-		HazelcastInstance mockInstanceError = Mockito.mock(HazelcastInstance.class);
+		HazelcastInstance mockInstanceError = mock(HazelcastInstance.class);
 		when(mockInstanceError.getMap(ArgumentMatchers.any()))
 				.thenThrow(new IllegalStateException());
 		try {

diff --git a/...ion/jaxrs-hazelcast-quarkus/src/test/java/webapp/tier/service/HazelcastMqServiceTest.java b/...ion/jaxrs-hazelcast-quarkus/src/test/java/webapp/tier/service/HazelcastMqServiceTest.java
@@ -1,11 +1,9 @@
 package webapp.tier.service;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.Mockito.when;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
@@ -18,7 +16,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
 
 import com.hazelcast.collection.IQueue;
 import com.hazelcast.core.Hazelcast;
@@ -63,7 +60,7 @@ void testPutQueueHazelcast() {
 
 	@Test
 	void testPutQueueHazelcastError() {
-		HazelcastInstance mockInstanceError = Mockito.mock(HazelcastInstance.class);
+		HazelcastInstance mockInstanceError = mock(HazelcastInstance.class);
 		when(mockInstanceError.getQueue(ArgumentMatchers.any()))
 				.thenThrow(new IllegalStateException());
 		assertThat(svc.putMsg(mockInstanceError).getFullmsg(), containsString(respbody));
@@ -96,7 +93,7 @@ void testGetQueueHazelcast() throws NoSuchAlgorithmException, InterruptedExcepti
 
 	@Test
 	void testGetQueueHazelcastError() {
-		HazelcastInstance mockInstanceError = Mockito.mock(HazelcastInstance.class);
+		HazelcastInstance mockInstanceError = mock(HazelcastInstance.class);
 		when(mockInstanceError.getQueue(ArgumentMatchers.any()))
 				.thenThrow(new IllegalStateException());
 		assertThat(svc.getMsg(mockInstanceError).getMessage(), is("Unexpected Error"));
@@ -105,8 +102,8 @@ void testGetQueueHazelcastError() {
 	@SuppressWarnings("unchecked")
 	@Test
 	void testGetQueueHazelcastObjectNullError() {
-		HazelcastInstance mocknull = Mockito.mock(HazelcastInstance.class);
-		IQueue<Object> mockqueue = Mockito.mock(IQueue.class);
+		HazelcastInstance mocknull = mock(HazelcastInstance.class);
+		IQueue<Object> mockqueue = mock(IQueue.class);
 		when(mocknull.getQueue(ArgumentMatchers.any())).thenReturn(mockqueue);
 		when(mockqueue.poll()).thenReturn(null);
 		assertThat(svc.getMsg(mocknull).getFullmsg(), containsString("No Data."));
@@ -115,8 +112,8 @@ void testGetQueueHazelcastObjectNullError() {
 	@SuppressWarnings("unchecked")
 	@Test
 	void testGetQueueHazelcastObjectEmptyError() {
-		HazelcastInstance mocknull = Mockito.mock(HazelcastInstance.class);
-		IQueue<Object> mockqueue = Mockito.mock(IQueue.class);
+		HazelcastInstance mocknull = mock(HazelcastInstance.class);
+		IQueue<Object> mockqueue = mock(IQueue.class);
 		when(mocknull.getQueue(ArgumentMatchers.any())).thenReturn(mockqueue);
 		when(mockqueue.poll()).thenReturn("");
 		assertThat(svc.getMsg(mocknull).getFullmsg(), containsString("No Data."));
@@ -142,7 +139,7 @@ void testPublishHazelcast() {
 
 	@Test
 	void testPublishHazelcastError() {
-		HazelcastInstance mockInstanceError = Mockito.mock(HazelcastInstance.class);
+		HazelcastInstance mockInstanceError = mock(HazelcastInstance.class);
 		when(mockInstanceError.getTopic(ArgumentMatchers.any()))
 				.thenThrow(new IllegalStateException());
 		assertThat(svc.publishMsg(mockInstanceError).getFullmsg(),

diff --git a/...jaxrs-hazelcast-quarkus/src/test/java/webapp/tier/service/socket/HazelcastSocketTest.java b/...jaxrs-hazelcast-quarkus/src/test/java/webapp/tier/service/socket/HazelcastSocketTest.java
@@ -1,8 +1,9 @@
 package webapp.tier.service.socket;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import javax.inject.Inject;
 import javax.websocket.RemoteEndpoint;
@@ -24,7 +25,7 @@ class HazelcastSocketTest {
 
 	@Test
 	void testOnOpen() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
 			Mockito.when(session.getId()).thenReturn(id);
 			socket.onOpen(session);
@@ -36,7 +37,7 @@ void testOnOpen() {
 
 	@Test
 	void testOnClose() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
 			Mockito.when(session.getId()).thenReturn(id);
 			socket.onOpen(session);
@@ -49,7 +50,7 @@ void testOnClose() {
 
 	@Test
 	void testOnError() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
 			Mockito.when(session.getId()).thenReturn(id);
 			socket.onOpen(session);
@@ -62,9 +63,9 @@ void testOnError() {
 
 	@Test
 	void testOnMessage() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
-			RemoteEndpoint.Async async = Mockito.mock(RemoteEndpoint.Async.class);
+			RemoteEndpoint.Async async = mock(RemoteEndpoint.Async.class);
 			Mockito.when(session.getId()).thenReturn(id);
 			Mockito.when(session.getAsyncRemote()).thenReturn(async);
 			socket.onOpen(session);

diff --git a/...ion/jaxrs-memcached-quarkus/src/test/java/webapp/tier/resource/MemcachedResourceTest.java b/...ion/jaxrs-memcached-quarkus/src/test/java/webapp/tier/resource/MemcachedResourceTest.java
@@ -1,13 +1,13 @@
 package webapp.tier.resource;
 
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.containsString;
+import static io.restassured.RestAssured.*;
+import static org.hamcrest.Matchers.*;
+import static org.mockito.Mockito.*;
 import static org.mockito.Mockito.when;
 
 import java.security.NoSuchAlgorithmException;
 
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import com.whalin.MemCached.MemCachedClient;
 
@@ -25,7 +25,7 @@ class MemcachedResourceTest {
 
 	@Test
 	void testSet() throws NoSuchAlgorithmException, RuntimeException {
-		MemCachedClient mcc = Mockito.mock(MemCachedClient.class);
+		MemCachedClient mcc = mock(MemCachedClient.class);
 		MsgBean msgbean = new MsgBean(CreateId.createid(), "test", "Test");
 		when(svc.createMemCachedClient()).thenReturn(mcc);
 		when(svc.setMsg(mcc)).thenReturn(msgbean);
@@ -40,7 +40,7 @@ void testSet() throws NoSuchAlgorithmException, RuntimeException {
 
 	@Test
 	void testGet() throws NoSuchAlgorithmException {
-		MemCachedClient mcc = Mockito.mock(MemCachedClient.class);
+		MemCachedClient mcc = mock(MemCachedClient.class);
 		MsgBean msgbean = new MsgBean(CreateId.createid(), "test", "Test");
 		when(svc.createMemCachedClient()).thenReturn(mcc);
 		when(svc.getMsg(mcc)).thenReturn(msgbean);

diff --git a/...ation/jaxrs-memcached-quarkus/src/test/java/webapp/tier/service/MemcachedServiceTest.java b/...ation/jaxrs-memcached-quarkus/src/test/java/webapp/tier/service/MemcachedServiceTest.java
@@ -3,6 +3,7 @@
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import javax.inject.Inject;
 
@@ -25,7 +26,7 @@ class MemcachedServiceTest {
 
 	@Test
 	void testSetMemcached() {
-		MemCachedClient mcc = Mockito.mock(MemCachedClient.class);
+		MemCachedClient mcc = mock(MemCachedClient.class);
 		Mockito.when(mcc.set(ArgumentMatchers.any(), ArgumentMatchers.any())).thenReturn(true);
 		try {
 			MsgBean msgbean = svcMock.setMsg(mcc);
@@ -51,7 +52,7 @@ void testSetMemcachedError() {
 	void testGetMemcached() {
 		Object obj = "11111111";
 		String msg = "Hello k8s-3tier-webapp with quarkus";
-		MemCachedClient mcc = Mockito.mock(MemCachedClient.class);
+		MemCachedClient mcc = mock(MemCachedClient.class);
 		Mockito.when(mcc.get("id")).thenReturn(obj.toString());
 		Mockito.when(mcc.get("msg")).thenReturn(msg);
 

diff --git a/application/jaxrs-mongodb-quarkus/src/test/java/webapp/tier/service/MongodbServiceTest.java b/application/jaxrs-mongodb-quarkus/src/test/java/webapp/tier/service/MongodbServiceTest.java
@@ -35,17 +35,17 @@ class MongodbServiceTest {
 	@Test
 	@SuppressWarnings("unchecked")
 	void testInsertMysql() throws NoSuchAlgorithmException {
-		MongoCollection<Document> col = Mockito.mock(MongoCollection.class);
+		MongoCollection<Document> col = mock(MongoCollection.class);
 		when(col.insertOne(ArgumentMatchers.any())).thenReturn(null);
 		assertThat(mongosvc.insertMsg(col).getFullmsg(), containsString(respbody));
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
 	void testSelectMsgIsEmpty() {
-		MongoCursor<Document> cursor = Mockito.mock(MongoCursor.class);
-		FindIterable<Document> ite = Mockito.mock(FindIterable.class);
-		MongoCollection<Document> col = Mockito.mock(MongoCollection.class);
+		MongoCursor<Document> cursor = mock(MongoCursor.class);
+		FindIterable<Document> ite = mock(FindIterable.class);
+		MongoCollection<Document> col = mock(MongoCollection.class);
 		when(col.find()).thenReturn(ite);
 		when(ite.iterator()).thenReturn(cursor);
 		mongosvc.selectMsg(col);
@@ -58,9 +58,9 @@ void testSelectMsgWithMessage() {
 		map.put("id", 1111);
 		map.put("msg", "Test");
 		Document document = new Document(map);
-		MongoCursor<Document> cursor = Mockito.mock(MongoCursor.class);
-		FindIterable<Document> ite = Mockito.mock(FindIterable.class);
-		MongoCollection<Document> col = Mockito.mock(MongoCollection.class);
+		MongoCursor<Document> cursor = mock(MongoCursor.class);
+		FindIterable<Document> ite = mock(FindIterable.class);
+		MongoCollection<Document> col = mock(MongoCollection.class);
 		when(cursor.hasNext()).thenReturn(true).thenReturn(false);
 		when(cursor.next()).thenReturn(document);
 		when(ite.iterator()).thenReturn(cursor);
@@ -75,7 +75,7 @@ void testSelectMsgWithMessage() {
 	@Test
 	@SuppressWarnings("unchecked")
 	void testDeleteMsg() {
-		MongoCollection<Document> col = Mockito.mock(MongoCollection.class);
+		MongoCollection<Document> col = mock(MongoCollection.class);
 		when(col.insertOne(ArgumentMatchers.any())).thenReturn(null);
 		assertThat(mongosvc.deleteMsg(col), is("Delete Msg Collection"));
 	}

diff --git a/...n/jaxrs-rabbitmq-quarkus/src/test/java/webapp/tier/service/socket/RabbitmqSocketTest.java b/...n/jaxrs-rabbitmq-quarkus/src/test/java/webapp/tier/service/socket/RabbitmqSocketTest.java
@@ -1,8 +1,9 @@
 package webapp.tier.service.socket;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import javax.inject.Inject;
 import javax.websocket.RemoteEndpoint;
@@ -24,7 +25,7 @@ class RabbitmqSocketTest {
 
 	@Test
 	void testOnOpen() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
 			Mockito.when(session.getId()).thenReturn(id);
 			socket.onOpen(session);
@@ -36,7 +37,7 @@ void testOnOpen() {
 
 	@Test
 	void testOnClose() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
 			Mockito.when(session.getId()).thenReturn(id);
 			socket.onOpen(session);
@@ -49,7 +50,7 @@ void testOnClose() {
 
 	@Test
 	void testOnError() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
 			Mockito.when(session.getId()).thenReturn(id);
 			socket.onOpen(session);
@@ -62,9 +63,9 @@ void testOnError() {
 
 	@Test
 	void testOnMessage() {
-		Session session = Mockito.mock(Session.class);
+		Session session = mock(Session.class);
 		try {
-			RemoteEndpoint.Async async = Mockito.mock(RemoteEndpoint.Async.class);
+			RemoteEndpoint.Async async = mock(RemoteEndpoint.Async.class);
 			Mockito.when(session.getId()).thenReturn(id);
 			Mockito.when(session.getAsyncRemote()).thenReturn(async);
 			socket.onOpen(session);