Maor Lipchuk has uploaded a new change for review. Change subject: core:StorageHelper Cleanup, method name standard(10). ......................................................................
core:StorageHelper Cleanup, method name standard(10). Change method name ValidateStoragePoolConnectionsInHost to be compatible with the java standards. Change-Id: I46f33f8bb4176ee4616fd8307215915d12eb7c23 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java 7 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/10135/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java index 3231f92..5462e64 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java @@ -82,7 +82,7 @@ if (returnValue) { IStorageHelper storageHelper = StorageHelperDirector.getInstance().getItem( paramConnection.getstorage_type()); - if (!storageHelper.ValidateStoragePoolConnectionsInHost( + if (!storageHelper.validateStoragePoolConnectionsInHost( getVds(), new java.util.ArrayList<storage_server_connections>(java.util.Arrays .asList(new storage_server_connections[] { paramConnection })), Guid.Empty)) diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java index ac12759..700ea8c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java @@ -40,7 +40,7 @@ } @Override - public boolean ValidateStoragePoolConnectionsInHost(VDS vds, List<storage_server_connections> connections, + public boolean validateStoragePoolConnectionsInHost(VDS vds, List<storage_server_connections> connections, Guid storagePoolId) { @SuppressWarnings("unchecked") HashMap<String, String> validateConnections = (HashMap<String, String>) Backend diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java index 2f648e3..7644f7b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.java @@ -95,7 +95,7 @@ protected boolean ValidConnection(StorageType type, List<storage_server_connections> connections) { return (connections != null && (connections.isEmpty() || StorageHelperDirector.getInstance().getItem(type) - .ValidateStoragePoolConnectionsInHost(getVds(), connections, getStoragePool().getId()))); + .validateStoragePoolConnectionsInHost(getVds(), connections, getStoragePool().getId()))); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java index adb35b8..f39c8d4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java @@ -33,7 +33,7 @@ } if (!StorageHelperDirector.getInstance() .getItem(getParameters().getStorageServerConnection().getstorage_type()) - .ValidateStoragePoolConnectionsInHost(getVds(), + .validateStoragePoolConnectionsInHost(getVds(), Arrays.asList(getConnection()), getParameters().getStoragePoolId())) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java index 02d548d..7c83e9b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java @@ -118,7 +118,7 @@ } @Override - public boolean ValidateStoragePoolConnectionsInHost(VDS vds, List<storage_server_connections> connections, + public boolean validateStoragePoolConnectionsInHost(VDS vds, List<storage_server_connections> connections, Guid storagePoolId) { if (connections.size() > 0) { @SuppressWarnings("unchecked") diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java index 712fbaa..75cc867 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java @@ -27,7 +27,7 @@ void removeLun(LUNs lun); - boolean ValidateStoragePoolConnectionsInHost(VDS vds, List<storage_server_connections> connections, + boolean validateStoragePoolConnectionsInHost(VDS vds, List<storage_server_connections> connections, Guid storagePoolId); List<storage_server_connections> GetStorageServerConnectionsByDomain( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java index f17c15e..0971876 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java @@ -95,7 +95,7 @@ } @Override - public boolean ValidateStoragePoolConnectionsInHost(VDS vds, List<storage_server_connections> connections, + public boolean validateStoragePoolConnectionsInHost(VDS vds, List<storage_server_connections> connections, Guid storagePoolId) { return true; } -- To view, visit http://gerrit.ovirt.org/10135 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46f33f8bb4176ee4616fd8307215915d12eb7c23 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches