[Engine-patches] Change in ovirt-engine[master]: core: Use static memeber to get ISO regex pattern.

[mlipchuk]

Maor Lipchuk has uploaded a new change for review.

Change subject: core: Use static memeber to get ISO regex pattern.
......................................................................

core: Use static memeber to get ISO regex pattern.

Use final static member instead recalculating the string over and over
again in a method.

Change-Id: Iffbdd09373916206d997132bc01fc02179d01973
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
2 files changed, 6 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/14027/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
index 04e6150..af11463 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IsoDomainListSyncronizer.java
@@ -59,19 +59,15 @@
     RepoFileMetaDataDAO repoStorageDom;
     public static final String TOOL_CLUSTER_LEVEL = "clusterLevel";
     public static final String TOOL_VERSION = "toolVersion";
+    public static final String REGEX_TOOL_PATTERN =
+            
String.format("%1$s(?<%2$s>[0-9]{1,}.[0-9])_{1}(?<%3$s>[0-9]{1,}).[i|I][s|S][o|O]$",
+                    getGuestToolsSetupIsoPrefix(),
+                    TOOL_CLUSTER_LEVEL,
+                    TOOL_VERSION);
 
     // Not kept as static member to enable reloading the config value
     public static String getGuestToolsSetupIsoPrefix() {
         return Config.<String> GetValue(ConfigValues.GuestToolsSetupIsoPrefix);
-    }
-
-    public static String getRegexToolPattern() {
-        String regexPattern =
-                
String.format("%1$s(?<%2$s>[0-9]{1,}.[0-9])_{1}(?<%3$s>[0-9]{1,}).[i|I][s|S][o|O]$",
-                        getGuestToolsSetupIsoPrefix(),
-                        TOOL_CLUSTER_LEVEL,
-                        TOOL_VERSION);
-        return regexPattern;
     }
 
     /**
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
index 703f1e4..860ab92 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
@@ -609,7 +609,7 @@
             for (RepoFileMetaData map : repoFilesMap) {
                 String fileName = map.getRepoFileName() != null ? 
map.getRepoFileName() : "";
                 Matcher matchToolPattern =
-                        
Pattern.compile(IsoDomainListSyncronizer.getRegexToolPattern()).matcher(fileName);
+                        
Pattern.compile(IsoDomainListSyncronizer.REGEX_TOOL_PATTERN).matcher(fileName);
                 if (matchToolPattern.find()) {
                     // Get cluster version and tool version of Iso tool.
                     Version clusterVer = new 
Version(matchToolPattern.group(IsoDomainListSyncronizer.TOOL_CLUSTER_LEVEL));


--
To view, visit http://gerrit.ovirt.org/14027
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffbdd09373916206d997132bc01fc02179d01973
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