Fix build
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java
index 6fbf417..cd1d481 100644
--- a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java
+++ b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java
@@ -388,7 +388,7 @@
String service = privatePort.contains("-") ? nsxApiClient.getServicePath(ruleName, privatePort, cmd.getProtocol(), null, null) :
nsxApiClient.getNsxInfraServices(ruleName, privatePort, cmd.getProtocol(), null, null);
if (nsxApiClient.doesPfRuleExist(ruleName, tier1GatewayName)) {
- LOGGER.debug(String.format("Port forward rule for port: %s exits on NSX, not adding it again", privatePort));
+ logger.debug(String.format("Port forward rule for port: %s exits on NSX, not adding it again", privatePort));
return new NsxAnswer(cmd, true, null);
}
nsxApiClient.createPortForwardingRule(ruleName, tier1GatewayName, cmd.getNetworkResourceName(), cmd.getPublicIp(),
diff --git a/server/src/test/java/com/cloud/network/NetworkModelImplTest.java b/server/src/test/java/com/cloud/network/NetworkModelImplTest.java
index 41adb65..6eb3e5d 100644
--- a/server/src/test/java/com/cloud/network/NetworkModelImplTest.java
+++ b/server/src/test/java/com/cloud/network/NetworkModelImplTest.java
@@ -39,7 +39,6 @@
import org.mockito.ArgumentMatchers;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
-import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.springframework.test.util.ReflectionTestUtils;
@@ -102,7 +101,7 @@
DataCenter zone = Mockito.mock(DataCenter.class);
VpcVO vpc = Mockito.mock(VpcVO.class);
Mockito.when(network.getVpcId()).thenReturn(1L);
- Mockito.doReturn(vpc).when(vpcDao).findById(Matchers.anyLong());
+ Mockito.doReturn(vpc).when(vpcDao).findById(ArgumentMatchers.anyLong());
// network, vpc and zone have valid dns
prepareMocks(isIp6, network, zone, vpc, dns1[0], dns1[1], dns2[0], dns2[1], dns1[2], dns2[2]);
Pair<String, String> result = isIp6 ? networkModel.getNetworkIp6Dns(network, zone) :
