Alissa Bonas has uploaded a new change for review. Change subject: core: rename method to lowercase in Ticketing class ......................................................................
core: rename method to lowercase in Ticketing class Rename GenerateOTP to start with lowercase. Solves a findbugs warning. Change-Id: I49ee7ee583d839d2b27383ff4a67b7b46366b5bf Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/TicketingTest.java 5 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/21898/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java index 212264f..918e084 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java @@ -130,7 +130,7 @@ // Generate the ticket if needed (in some situations the client will not send // a ticket): if (StringUtils.isEmpty(mTicket)) { - mTicket = Ticketing.GenerateOTP(); + mTicket = Ticketing.generateOTP(); } // Update the dynamic information of the virtual machine in memory (we need it diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index 8f16fa4..d400638 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -222,7 +222,7 @@ command.onPowerringUp(); if (command.getAutoStart() && command.getAutoStartVdsId() != null) { try { - String otp64 = Ticketing.GenerateOTP(); + String otp64 = Ticketing.generateOTP(); Backend.getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.SetVmTicket, diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java index c0219ef..a159936 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java @@ -1,7 +1,7 @@ package org.ovirt.engine.api.restapi.resource; import static org.ovirt.engine.api.restapi.resource.BackendVmsResource.SUB_COLLECTIONS; -import static org.ovirt.engine.core.utils.Ticketing.GenerateOTP; +import static org.ovirt.engine.core.utils.Ticketing.generateOTP; import java.util.List; import java.util.Set; @@ -334,7 +334,7 @@ protected String getTicketValue(Action action) { if (!ensureTicket(action).isSetValue()) { - action.getTicket().setValue(GenerateOTP()); + action.getTicket().setValue(generateOTP()); } return action.getTicket().getValue(); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java index 1e36b89..cd19562 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java @@ -5,7 +5,7 @@ import org.apache.commons.codec.binary.Base64; public final class Ticketing { - public static String GenerateOTP() { + public static String generateOTP() { SecureRandom secr = new SecureRandom(); byte[] arrRandom = new byte[9]; secr.nextBytes(arrRandom); diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/TicketingTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/TicketingTest.java index b669317..dea616f 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/TicketingTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/TicketingTest.java @@ -7,9 +7,9 @@ public class TicketingTest { @Test public void testNoRepeats() { - String sample = Ticketing.GenerateOTP(); + String sample = Ticketing.generateOTP(); for (int x = 0; x < 1000; x++) { - String other = Ticketing.GenerateOTP(); + String other = Ticketing.generateOTP(); assertNotSame(sample, other); } } -- To view, visit http://gerrit.ovirt.org/21898 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49ee7ee583d839d2b27383ff4a67b7b46366b5bf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
