Change in ovirt-engine[master]: webadmin: removed pointless template method, broken overgrow...

tjelinek at redhat.com tjelinek at redhat.com
Thu Oct 13 10:37:13 UTC 2016


Tomas Jelinek has submitted this change and it was merged.

Change subject: webadmin: removed pointless template method, broken overgrown method
......................................................................


webadmin: removed pointless template method, broken overgrown method

• removed template method: protected abstract String composeMessage();
which can be easily replaced with constructor parameter, relieving
from having to do subclasses only to change produced message

• fixed all locations creating unnecessary subclases, using simplest
code possible (ie. lost of duplicates were removed in process as
well).

• method BaseI18NValidation.allUtfLetters was overgrown. Despite of
it's rather small body - composing two string literals - it's still
too much, since subclasses requires method, which returns only latter
literal. This was solved inadequately, by overriding method producing
first literal, instead of simply having method to produce latter
string literal. This was fixed, so now we do not need to override
method asciiLetters to produce "", to get String B (utf letters
minus ascii letters).

Change-Id: I2dd36bc5111473ce66e289aabdfa4394506032b0
Signed-off-by: Martin Mucha <mmucha at redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AsciiNameValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/AsciiOrNoneValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/BaseI18NValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/BrickMountPointValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/HostAddressValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/I18NExtraNameOrNoneValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/I18NNameValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/LinuxMountPointValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/LocalfsLinuxMountPointValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/NameAndOptionalDomainValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/NonUtfValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SpecialAsciiI18NOrNoneValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/UriHostAddressValidation.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/VmInitNetworkNameValidation.java
M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/HostAddressValidationTest.java
M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/HostWithProtocolAndPortAddressValidationTest.java
M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/PoolNameValidationTest.java
M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/UriHostAddressValidationTest.java
M frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/UrlValidationTest.java
22 files changed, 134 insertions(+), 183 deletions(-)

Approvals:
  Tomas Jelinek: Looks good to me, approved
  Jakub Niedermertl: Looks good to me, but someone else must approve
  Martin Mucha: Verified
  Jenkins CI: Passed CI tests



-- 
To view, visit https://gerrit.ovirt.org/65312
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2dd36bc5111473ce66e289aabdfa4394506032b0
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Mucha <mmucha at redhat.com>
Gerrit-Reviewer: Jakub Niedermertl <jniederm at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Betak <mbetak at redhat.com>
Gerrit-Reviewer: Martin Mucha <mmucha at redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>



More information about the Engine-commits mailing list