Alon Bar-Lev has uploaded a new change for review. Change subject: pki: cleanup: the method name SignCertificateRequest doesn't start with a lower case letter ......................................................................
pki: cleanup: the method name SignCertificateRequest doesn't start with a lower case letter Change-Id: I6a5677d644f000254be5c8d5bdae4ba6478b8f25 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstallStages.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java 4 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/13187/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index 2a0d284..fcdfab8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -755,7 +755,7 @@ InstallerMessages.Severity.INFO, "Enrolling certificate" ); - _certificate = OpenSslCAWrapper.SignCertificateRequest( + _certificate = OpenSslCAWrapper.signCertificateRequest( StringUtils.join(event.value, "\n"), _vds.getHostName(), _vds.getHostName() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstallStages.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstallStages.java index 3e0df36..ebc6210 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstallStages.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsInstallStages.java @@ -8,7 +8,7 @@ UploadScript, RunScript, DownloadCertificateRequest, - SignCertificateRequest, + signCertificateRequest, UploadSignedCertificate, UploadCA, FinishCommand, diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java index 210a102..10262c9 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java @@ -54,7 +54,7 @@ } } - public static String SignCertificateRequest( + public static String signCertificateRequest( String request, String label, String hostname @@ -86,7 +86,7 @@ } if ( - !new OpenSslCAWrapper().SignCertificateRequest( + !new OpenSslCAWrapper().signCertificateRequest( reqFileName, hostname, Config.<Integer> GetValue(ConfigValues.VdsCertificateValidityInYears) * 365, @@ -99,13 +99,13 @@ return FileUtil.readAllText(new File(pkicertdir, certFileName).getPath()); } - public final boolean SignCertificateRequest( + public final boolean signCertificateRequest( String requestFileName, String hostname, int days, String signedCertificateFileName ) { - log.debug("Entered SignCertificateRequest"); + log.debug("Entered signCertificateRequest"); boolean returnValue = true; String signRequestBatch = Config.resolveSignScriptPath(); if (new File(signRequestBatch).exists()) { @@ -120,7 +120,7 @@ log.error(String.format("Sign certificate request file '%s' not found", signRequestBatch)); returnValue = false; } - log.debug("End of SignCertificateRequest"); + log.debug("End of signCertificateRequest"); return returnValue; } diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java index 12efd40..a6f48b6 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapperTest.java @@ -70,13 +70,13 @@ // @Test // public void signCertificateRequestValidTest() { // processSucceeds(); -// assertTrue(execSignCertificateRequest()); +// assertTrue(execsignCertificateRequest()); // } // // @Test // public void signCertificateRequestBadExitValueTest() { // processFails(); -// assertFalse(execSignCertificateRequest()); +// assertFalse(execsignCertificateRequest()); // } // // @Test @@ -84,7 +84,7 @@ // processSucceeds(); // // In order to cause a timeout, timeout is set to zero // when(Config.GetValue(ConfigValues.SignCertTimeoutInSeconds)).thenReturn(0); -// assertFalse(execSignCertificateRequest()); +// assertFalse(execsignCertificateRequest()); // } // // private void processSucceeds() { @@ -99,7 +99,7 @@ // when(processMock.exitValue()).thenReturn(returnValue); // } // -// private boolean execSignCertificateRequest() { -// return openSslWrapper.SignCertificateRequest(null, 0, null); +// private boolean execsignCertificateRequest() { +// return openSslWrapper.signCertificateRequest(null, 0, null); // } //} -- To view, visit http://gerrit.ovirt.org/13187 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a5677d644f000254be5c8d5bdae4ba6478b8f25 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
