diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java index 2efd036cc97f..656c14c10483 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java @@ -34,7 +34,7 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.lb.CertService; +import org.apache.cloudstack.network.tls.CertService; import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "deleteSslCert", description = "Delete a certificate to CloudStack", responseObject = SuccessResponse.class, diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java index d1dbdcb28236..cfa567548500 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java @@ -33,7 +33,7 @@ import org.apache.cloudstack.api.response.SslCertResponse; import org.apache.cloudstack.context.CallContext; -import com.cloud.network.lb.CertService; +import org.apache.cloudstack.network.tls.CertService; import com.cloud.utils.exception.CloudRuntimeException; @APICommand(name = "listSslCerts", description = "Lists SSL certificates", responseObject = SslCertResponse.class, diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java index 4bd2de9017f4..a6d71c761752 100644 --- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java @@ -36,7 +36,7 @@ import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.lb.CertService; +import org.apache.cloudstack.network.tls.CertService; @APICommand(name = "uploadSslCert", description = "Upload a certificate to CloudStack", responseObject = SslCertResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) diff --git a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java index 8b3db465bfa2..d722e9845dee 100644 --- a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; -import com.cloud.network.lb.SslCert; +import org.apache.cloudstack.network.tls.SslCert; import com.cloud.serializer.Param; //import org.apache.cloudstack.api.EntityReference; diff --git a/api/src/com/cloud/network/lb/CertService.java b/api/src/org/apache/cloudstack/network/tls/CertService.java similarity index 90% rename from api/src/com/cloud/network/lb/CertService.java rename to api/src/org/apache/cloudstack/network/tls/CertService.java index e9219e078785..6f4feff9fab5 100644 --- a/api/src/com/cloud/network/lb/CertService.java +++ b/api/src/org/apache/cloudstack/network/tls/CertService.java @@ -14,8 +14,9 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.network.lb; +package org.apache.cloudstack.network.tls; +import java.security.cert.Certificate; import java.util.List; import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd; @@ -30,4 +31,6 @@ public interface CertService { public void deleteSslCert(DeleteSslCertCmd deleteSslCertCmd); public List listSslCerts(ListSslCertsCmd listSslCertCmd); + + public Certificate parseCertificate(final String cert); } \ No newline at end of file diff --git a/api/src/com/cloud/network/lb/SslCert.java b/api/src/org/apache/cloudstack/network/tls/SslCert.java similarity index 96% rename from api/src/com/cloud/network/lb/SslCert.java rename to api/src/org/apache/cloudstack/network/tls/SslCert.java index 98f96ce4020e..fb1590c539ae 100644 --- a/api/src/com/cloud/network/lb/SslCert.java +++ b/api/src/org/apache/cloudstack/network/tls/SslCert.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.network.lb; +package org.apache.cloudstack.network.tls; import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.api.Identity; diff --git a/engine/schema/src/com/cloud/network/dao/SslCertVO.java b/engine/schema/src/com/cloud/network/dao/SslCertVO.java index 2676d611bd7d..1d72180a1078 100644 --- a/engine/schema/src/com/cloud/network/dao/SslCertVO.java +++ b/engine/schema/src/com/cloud/network/dao/SslCertVO.java @@ -23,7 +23,7 @@ import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.network.lb.SslCert; +import org.apache.cloudstack.network.tls.SslCert; import com.cloud.utils.db.Encrypt; @Entity diff --git a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml index 17e07eceea69..87097a4e0480 100644 --- a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml +++ b/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml @@ -271,6 +271,6 @@ class="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" > - + diff --git a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java b/server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java similarity index 99% rename from server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java rename to server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java index 327d1b06b408..9da9bddd5b8b 100644 --- a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java +++ b/server/src/org/apache/cloudstack/network/ssl/CertServiceImpl.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.network.lb; +package org.apache.cloudstack.network.ssl; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; @@ -26,7 +26,7 @@ import com.cloud.network.dao.LoadBalancerVO; import com.cloud.network.dao.SslCertDao; import com.cloud.network.dao.SslCertVO; -import com.cloud.network.lb.CertService; +import org.apache.cloudstack.network.tls.CertService; import com.cloud.network.rules.LoadBalancer; import com.cloud.projects.Project; import com.cloud.projects.ProjectService; diff --git a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java b/server/test/org/apache/cloudstack/network/ssl/CertServiceTest.java similarity index 80% rename from server/test/org/apache/cloudstack/network/lb/CertServiceTest.java rename to server/test/org/apache/cloudstack/network/ssl/CertServiceTest.java index b71b8a0131da..88b0b691d579 100644 --- a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java +++ b/server/test/org/apache/cloudstack/network/ssl/CertServiceTest.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.network.lb; +package org.apache.cloudstack.network.ssl; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; @@ -35,9 +35,11 @@ import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd; import org.apache.cloudstack.context.CallContext; import org.junit.After; +import org.junit.Assert; import org.junit.Assume; import org.junit.Before; import org.junit.Test; +import org.mockito.Matchers; import org.mockito.Mockito; import java.io.File; @@ -50,11 +52,6 @@ import java.util.UUID; import static org.apache.commons.io.FileUtils.readFileToString; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; public class CertServiceTest { @@ -111,17 +108,17 @@ public void runUploadSslCertWithCAChain() throws Exception { //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); certService._accountDao = Mockito.mock(AccountDao.class); - when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account); + when(certService._accountDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn((AccountVO)account); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -162,17 +159,17 @@ public void runUploadSslCertSelfSignedWithPassword() throws Exception { //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); certService._accountDao = Mockito.mock(AccountDao.class); - when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account); + when(certService._accountDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn((AccountVO)account); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -212,17 +209,17 @@ public void runUploadSslCertSelfSignedNoPassword() throws Exception { //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); certService._accountDao = Mockito.mock(AccountDao.class); - when(certService._accountDao.findByIdIncludingRemoved(anyLong())).thenReturn((AccountVO)account); + when(certService._accountDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn((AccountVO)account); //creating the command UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -259,14 +256,14 @@ public void runUploadSslCertBadChain() throws IOException, IllegalAccessExceptio //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -286,9 +283,9 @@ public void runUploadSslCertBadChain() throws IOException, IllegalAccessExceptio try { certService.uploadSslCert(uploadCmd); - fail("The chain given is not the correct chain for the certificate"); + Assert.fail("The chain given is not the correct chain for the certificate"); } catch (final Exception e) { - assertTrue(e.getMessage().contains("Invalid certificate chain")); + Assert.assertTrue(e.getMessage().contains("Invalid certificate chain")); } } @@ -311,14 +308,14 @@ public void runUploadSslCertNoRootCert() throws IOException, IllegalAccessExcept //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -338,9 +335,9 @@ public void runUploadSslCertNoRootCert() throws IOException, IllegalAccessExcept try { certService.uploadSslCert(uploadCmd); - fail("Chain is given but does not link to the certificate"); + Assert.fail("Chain is given but does not link to the certificate"); } catch (final Exception e) { - assertTrue(e.getMessage().contains("Invalid certificate chain")); + Assert.assertTrue(e.getMessage().contains("Invalid certificate chain")); } } @@ -361,14 +358,14 @@ public void runUploadSslCertBadPassword() throws IOException, IllegalAccessExcep //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -388,9 +385,9 @@ public void runUploadSslCertBadPassword() throws IOException, IllegalAccessExcep try { certService.uploadSslCert(uploadCmd); - fail("Given an encrypted private key with a bad password. Upload should fail."); + Assert.fail("Given an encrypted private key with a bad password. Upload should fail."); } catch (final Exception e) { - assertTrue("Did not expect message: " + e.getMessage(), + Assert.assertTrue("Did not expect message: " + e.getMessage(), e.getMessage().contains("Parsing certificate/key failed: Invalid Key format.")); } @@ -410,14 +407,14 @@ public void runUploadSslCertBadkeyPair() throws IOException, IllegalAccessExcept //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -434,7 +431,7 @@ public void runUploadSslCertBadkeyPair() throws IOException, IllegalAccessExcept try { certService.uploadSslCert(uploadCmd); } catch (final Exception e) { - assertTrue(e.getMessage().contains("Bad public-private key")); + Assert.assertTrue(e.getMessage().contains("Bad public-private key")); } } @@ -453,14 +450,14 @@ public void runUploadSslCertBadkeyAlgo() throws IOException, IllegalAccessExcept //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -476,9 +473,9 @@ public void runUploadSslCertBadkeyAlgo() throws IOException, IllegalAccessExcept try { certService.uploadSslCert(uploadCmd); - fail("Given a private key which has a different algorithm than the certificate, upload should fail"); + Assert.fail("Given a private key which has a different algorithm than the certificate, upload should fail"); } catch (final Exception e) { - assertTrue("Did not expect message: " + e.getMessage(), + Assert.assertTrue("Did not expect message: " + e.getMessage(), e.getMessage().contains("Parsing certificate/key failed: Invalid Key format.")); } } @@ -498,14 +495,14 @@ public void runUploadSslCertExpiredCert() throws IOException, IllegalAccessExcep //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -521,10 +518,10 @@ public void runUploadSslCertExpiredCert() throws IOException, IllegalAccessExcep try { certService.uploadSslCert(uploadCmd); - fail("Given an expired certificate, upload should fail"); + Assert.fail("Given an expired certificate, upload should fail"); } catch (final Exception e) { System.out.println(e.getMessage()); - assertTrue(e.getMessage().contains("Parsing certificate/key failed: NotAfter:")); + Assert.assertTrue(e.getMessage().contains("Parsing certificate/key failed: NotAfter:")); } } @@ -542,14 +539,14 @@ public void runUploadSslCertNotX509() throws IOException, IllegalAccessException //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -565,9 +562,9 @@ public void runUploadSslCertNotX509() throws IOException, IllegalAccessException try { certService.uploadSslCert(uploadCmd); - fail("Given a Certificate which is not X509, upload should fail"); + Assert.fail("Given a Certificate which is not X509, upload should fail"); } catch (final Exception e) { - assertTrue(e.getMessage().contains("Expected X509 certificate")); + Assert.assertTrue(e.getMessage().contains("Expected X509 certificate")); } } @@ -586,14 +583,14 @@ public void runUploadSslCertBadFormat() throws IOException, IllegalAccessExcepti //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.persist(any(SslCertVO.class))).thenReturn(new SslCertVO()); + when(certService._sslCertDao.persist(Matchers.any(SslCertVO.class))).thenReturn(new SslCertVO()); //creating the command final UploadSslCertCmd uploadCmd = new UploadSslCertCmdExtn(); @@ -608,7 +605,7 @@ public void runUploadSslCertBadFormat() throws IOException, IllegalAccessExcepti keyField.set(uploadCmd, key); certService.uploadSslCert(uploadCmd); - fail("Given a Certificate in bad format (Not PEM), upload should fail"); + Assert.fail("Given a Certificate in bad format (Not PEM), upload should fail"); } @Test @@ -625,20 +622,20 @@ public void runDeleteSslCertValid() throws Exception { //setting mock objects certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.remove(anyLong())).thenReturn(true); - when(certService._sslCertDao.findById(anyLong())).thenReturn(new SslCertVO()); + when(certService._sslCertDao.remove(Matchers.anyLong())).thenReturn(true); + when(certService._sslCertDao.findById(Matchers.anyLong())).thenReturn(new SslCertVO()); // a rule holding the cert certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class); - when(certService._lbCertDao.listByCertId(anyLong())).thenReturn(null); + when(certService._lbCertDao.listByCertId(Matchers.anyLong())).thenReturn(null); //creating the command final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn(); @@ -663,27 +660,27 @@ public void runDeleteSslCertBoundCert() throws NoSuchFieldException, IllegalAcce certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.remove(anyLong())).thenReturn(true); - when(certService._sslCertDao.findById(anyLong())).thenReturn(new SslCertVO()); + when(certService._sslCertDao.remove(Matchers.anyLong())).thenReturn(true); + when(certService._sslCertDao.findById(Matchers.anyLong())).thenReturn(new SslCertVO()); // rule holding the cert certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class); - final List lbMapList = new ArrayList(); + final List lbMapList = new ArrayList<>(); lbMapList.add(new LoadBalancerCertMapVO()); certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class); - when(certService._lbCertDao.listByCertId(anyLong())).thenReturn(lbMapList); + when(certService._lbCertDao.listByCertId(Matchers.anyLong())).thenReturn(lbMapList); certService._entityMgr = Mockito.mock(EntityManager.class); - when(certService._entityMgr.findById(eq(LoadBalancerVO.class), anyLong())).thenReturn(new LoadBalancerVO()); + when(certService._entityMgr.findById(Matchers.eq(LoadBalancerVO.class), Matchers.anyLong())).thenReturn(new LoadBalancerVO()); //creating the command final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn(); @@ -695,9 +692,9 @@ public void runDeleteSslCertBoundCert() throws NoSuchFieldException, IllegalAcce try { certService.deleteSslCert(deleteCmd); - fail("Delete with a cert id bound to a lb should fail"); + Assert.fail("Delete with a cert id bound to a lb should fail"); } catch (final Exception e) { - assertTrue(e.getMessage().contains("Certificate in use by a loadbalancer")); + Assert.assertTrue(e.getMessage().contains("Certificate in use by a loadbalancer")); } } @@ -711,19 +708,19 @@ public void runDeleteSslCertInvalidId() throws NoSuchFieldException, IllegalAcce certService._accountMgr = Mockito.mock(AccountManager.class); final Account account = new AccountVO("testaccount", 1, "networkdomain", (short)0, UUID.randomUUID().toString()); - when(certService._accountMgr.getAccount(anyLong())).thenReturn(account); + when(certService._accountMgr.getAccount(Matchers.anyLong())).thenReturn(account); certService._domainDao = Mockito.mock(DomainDao.class); final DomainVO domain = new DomainVO("networkdomain", 1L, 1L, "networkdomain"); - when(certService._domainDao.findByIdIncludingRemoved(anyLong())).thenReturn(domain); + when(certService._domainDao.findByIdIncludingRemoved(Matchers.anyLong())).thenReturn(domain); certService._sslCertDao = Mockito.mock(SslCertDao.class); - when(certService._sslCertDao.remove(anyLong())).thenReturn(true); - when(certService._sslCertDao.findById(anyLong())).thenReturn(null); + when(certService._sslCertDao.remove(Matchers.anyLong())).thenReturn(true); + when(certService._sslCertDao.findById(Matchers.anyLong())).thenReturn(null); // no rule holding the cert certService._lbCertDao = Mockito.mock(LoadBalancerCertMapDao.class); - when(certService._lbCertDao.listByCertId(anyLong())).thenReturn(null); + when(certService._lbCertDao.listByCertId(Matchers.anyLong())).thenReturn(null); //creating the command final DeleteSslCertCmd deleteCmd = new DeleteSslCertCmdExtn(); @@ -735,9 +732,9 @@ public void runDeleteSslCertInvalidId() throws NoSuchFieldException, IllegalAcce try { certService.deleteSslCert(deleteCmd); - fail("Delete with an invalid ID should fail"); + Assert.fail("Delete with an invalid ID should fail"); } catch (final Exception e) { - assertTrue(e.getMessage().contains("Invalid certificate id")); + Assert.assertTrue(e.getMessage().contains("Invalid certificate id")); } }