Yaniv Bronhaim has uploaded a new change for review.
Change subject: Use empty string instead null for empty foreman parameters
......................................................................
Use empty string instead null for empty foreman parameters
Change-Id: I5c95db55a56b7a81ae81876e57426fd167bc0545
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
4 files changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/35444/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
index c52cdfc..e43881e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalComputeResource.java
@@ -9,7 +9,7 @@
private String user;
public String getProvider() {
- return provider;
+ return provider != null ? provider : ""; //$NON-NLS-1$
}
public void setProvider(String provider) {
@@ -17,7 +17,7 @@
}
public String getUser() {
- return user;
+ return user != null ? user : ""; //$NON-NLS-1$
}
public void setUser(String user) {
@@ -25,7 +25,7 @@
}
public String getUrl() {
- return url;
+ return url != null ? url : ""; //$NON-NLS-1$
}
public void setUrl(String url) {
@@ -51,8 +51,8 @@
@Override
public String getDescription() {
- return "URL: " + url +
- " | Provider: " + provider + "\n" +
- " | User: " + user;
+ return "URL: " + getUrl() +
+ " | Provider: " + getProvider() + "\n" +
+ " | User: " + getUser();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
index 8a94a03..ed38af6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
@@ -9,7 +9,7 @@
private String subnetName;
public String getSubnetName() {
- return subnetName;
+ return subnetName != null ? subnetName : ""; //$NON-NLS-1$
}
public void setSubnetName(String subnetName) {
@@ -17,7 +17,7 @@
}
public String getLastReport() {
- return lastReport;
+ return lastReport != null ? lastReport : ""; //$NON-NLS-1$
}
public void setLastReport(String lastReport) {
@@ -25,7 +25,7 @@
}
public String getMac() {
- return mac;
+ return mac != null ? mac : ""; //$NON-NLS-1$
}
public void setMac(String mac) {
@@ -33,7 +33,7 @@
}
public String getIp() {
- return ip;
+ return ip != null ? ip : ""; //$NON-NLS-1$
}
public void setIp(String ip) {
@@ -51,9 +51,9 @@
@Override
public String getDescription() {
- return "MAC: " + mac + "\n" +
- " | DiscoverTime : " + lastReport + "\n" +
- " | Subnet: " + subnetName + "\n" +
- " | IP: " + ip;
+ return "MAC: " + getMac() + "\n" +
+ " | DiscoverTime : " + getLastReport() + "\n" +
+ " | Subnet: " + getSubnetName() + "\n" +
+ " | IP: " + getIp();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
index 524b7ae..8474f0a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalHostGroup.java
@@ -22,7 +22,7 @@
private String architectureName;
public String getArchitectureName() {
- return architectureName;
+ return architectureName != null ? architectureName : ""; //$NON-NLS-1$
}
public void setArchitectureName(String architectureName) {
@@ -30,7 +30,7 @@
}
public String getDomainName() {
- return domainName;
+ return domainName != null ? domainName : ""; //$NON-NLS-1$
}
public void setDomainName(String domainName) {
@@ -38,7 +38,7 @@
}
public String getOperatingsystemName() {
- return operatingsystemName;
+ return operatingsystemName != null ? operatingsystemName : "";
//$NON-NLS-1$
}
public void setOperatingsystemName(String operatingsystemName) {
@@ -46,7 +46,7 @@
}
public String getSubnetName() {
- return subnetName;
+ return subnetName != null ? subnetName : ""; //$NON-NLS-1$
}
public void setSubnetName(String subnetName) {
@@ -127,10 +127,10 @@
@Override
public String getDescription() {
- return "OS: " + operatingsystemName + "\n" +
- " | Subnet: " + subnetName + "\n" +
- " | Domain: " + domainName + "\n" +
- " | Arch: " + architectureName;
+ return "OS: " + getOperatingsystemName() + "\n" +
+ " | Subnet: " + getSubnetName() + "\n" +
+ " | Domain: " + getDomainName() + "\n" +
+ " | Arch: " + getArchitectureName();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
index 42ce370..ee94a23 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalOperatingSystem.java
@@ -25,7 +25,7 @@
}
public String getName() {
- return name;
+ return name != null ? name : ""; //$NON-NLS-1$
}
public void setName(String name) {
--
To view, visit http://gerrit.ovirt.org/35444
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c95db55a56b7a81ae81876e57426fd167bc0545
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
