From b5a6280c8dca7daf05a7059f5045d67cd17fd323 Mon Sep 17 00:00:00 2001 From: inosh-perera Date: Thu, 3 Dec 2015 11:28:12 +0530 Subject: [PATCH] refactoring comments --- .../mgt/core/config/CertificateManagementConfig.java | 1 - .../core/config/CertificateManagementRepository.java | 1 - .../mgt/core/config/datasource/DataSourceConfig.java | 6 ------ .../certificate/mgt/core/dao/CertificateDAO.java | 10 ++++++---- .../mgt/core/dao/CertificateManagementDAOUtil.java | 1 - .../mgt/core/service/CertificateManagementService.java | 2 +- .../core/service/CertificateManagementServiceImpl.java | 7 ++++--- 7 files changed, 11 insertions(+), 17 deletions(-) diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementConfig.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementConfig.java index 79f67b148ad..e778b1757c1 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementConfig.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementConfig.java @@ -16,7 +16,6 @@ * under the License. */ - package org.wso2.carbon.certificate.mgt.core.config; import javax.xml.bind.annotation.XmlElement; diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementRepository.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementRepository.java index 47ce800468f..86cb11e29e3 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementRepository.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/CertificateManagementRepository.java @@ -16,7 +16,6 @@ * under the License. */ - package org.wso2.carbon.certificate.mgt.core.config; import org.wso2.carbon.certificate.mgt.core.config.datasource.DataSourceConfig; diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/DataSourceConfig.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/DataSourceConfig.java index e9c72bb649a..2c2871599f9 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/DataSourceConfig.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/config/datasource/DataSourceConfig.java @@ -38,9 +38,3 @@ public class DataSourceConfig { this.jndiLookupDefinition = jndiLookupDefinition; } } -// CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE ( -// ID INTEGER auto_increment NOT NULL, -// SERIAL_NUMBER VARCHAR(500) DEFAULT NULL, -// CERTIFICATE BLOB DEFAULT NULL, -// PRIMARY KEY (ID) -// ); diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateDAO.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateDAO.java index bffe744fb9d..e6ce3ef65a0 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateDAO.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateDAO.java @@ -29,8 +29,9 @@ public interface CertificateDAO { /** * This can be used to store a certificate in the database, where it will be stored against the serial number * of the certificate. - * @param byteArrayInputStream Holds the certificate. - * @param serialNumber Serial number of the certificate. + * + * @param byteArrayInputStream Holds the certificate. + * @param serialNumber Serial number of the certificate. * @throws CertificateManagementDAOException */ void addCertificate(ByteArrayInputStream byteArrayInputStream, String serialNumber @@ -38,8 +39,9 @@ public interface CertificateDAO { /** * Usage is to obtain a certificate stored in the database by providing the serial number. - * @param serialNumber Serial number of the certificate. - * @return representation of the certificate. + * + * @param serialNumber Serial number of the certificate. + * @return representation of the certificate. * @throws CertificateManagementDAOException */ byte[] retrieveCertificate(String serialNumber diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOUtil.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOUtil.java index cbb5b1089a8..4405ff8c6ba 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOUtil.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/dao/CertificateManagementDAOUtil.java @@ -16,7 +16,6 @@ * under the License. */ - package org.wso2.carbon.certificate.mgt.core.dao; import org.apache.commons.logging.Log; diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementService.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementService.java index f89ab4f986f..24d805c8f18 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementService.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementService.java @@ -44,7 +44,7 @@ public interface CertificateManagementService { byte[] getPKIMessageSCEP(InputStream inputStream) throws KeystoreException; X509Certificate generateCertificateFromCSR(PrivateKey privateKey, PKCS10CertificationRequest request, - String issueSubject) throws KeystoreException; + String issueSubject) throws KeystoreException; Certificate getCertificateByAlias(String alias) throws KeystoreException; diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java index 77dfe1686cc..f3c355c6f19 100644 --- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java +++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java @@ -39,7 +39,8 @@ public class CertificateManagementServiceImpl implements CertificateManagementSe private static KeyStoreReader keyStoreReader; private static CertificateGenerator certificateGenerator; - private CertificateManagementServiceImpl() {} + private CertificateManagementServiceImpl() { + } public static CertificateManagementServiceImpl getInstance() { @@ -80,8 +81,8 @@ public class CertificateManagementServiceImpl implements CertificateManagementSe } public X509Certificate generateCertificateFromCSR(PrivateKey privateKey, - PKCS10CertificationRequest request, - String issueSubject) throws KeystoreException { + PKCS10CertificationRequest request, + String issueSubject) throws KeystoreException { return certificateGenerator.generateCertificateFromCSR(privateKey, request, issueSubject); }