Allon Mureinik has uploaded a new change for review.
Change subject: engine: Remove empty String() constructors
......................................................................
engine: Remove empty String() constructors
Removed calls to new String() and replaced them with the "" literal.
Strings are immutable anyway, so there's no point in wasting memory on
new instance creations.
This patch fixes all occurrences of the DM_STRING_VOID_CTOR FindBugs
warning in the code.
Change-Id: I449ea291a152dff968afa4862b22043da655cdcf
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
6 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/18652/1
diff --git
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java
index e6c897b..34ac5ef 100644
---
a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java
+++
b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandlerTest.java
@@ -27,7 +27,7 @@
@Test
public void replace_emptyBuilder() {
- runAndCheck(new String(), "a", "b", "");
+ runAndCheck("", "a", "b", "");
}
@Test
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.java
index 33d794e..428e979 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.java
@@ -35,7 +35,7 @@
this.label = label;
this.contentWidget = contentWidget;
- infoIcon = new InfoIcon(SafeHtmlUtils.fromString(new String()),
resources);
+ infoIcon = new InfoIcon(SafeHtmlUtils.EMPTY_SAFE_HTML, resources);
//$NON-NLS-1$
initWidget(WidgetUiBinder.uiBinder.createAndBindUi(this));
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java
index bdca43e..005ba80 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronAgentModel.java
@@ -109,7 +109,7 @@
});
getPluginType().setItems(NeutronPluginTranslator.getPresetDisplayStrings());
- getPluginType().setSelectedItem(new String());
+ getPluginType().setSelectedItem(""); //$NON-NLS-1$
getInterfaceMappingsLabel().setEntity(ConstantsManager.getInstance().getConstants().interfaceMappings());
getInterfaceMappingsExplanation().setEntity(ConstantsManager.getInstance()
.getConstants()
@@ -132,7 +132,7 @@
public void init(Provider<OpenstackNetworkProviderProperties> provider) {
OpenstackNetworkProviderProperties properties =
provider.getAdditionalProperties();
- String pluginName = (properties == null) ? new String() :
properties.getPluginType();
+ String pluginName = (properties == null) ? "" :
properties.getPluginType(); //$NON-NLS-1$
getPluginType().setSelectedItem(NeutronPluginTranslator.getDisplayStringForPluginName(pluginName));
if (properties != null) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java
index 11f39ac..1baa30d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NeutronPluginTranslator.java
@@ -43,7 +43,7 @@
return
EnumTranslator.createAndTranslate(OpenstackNetworkPluginType.valueOf(pluginName));
}
catch (Exception e) {
- return pluginName == null ? new String() : pluginName;
+ return pluginName == null ? "" : pluginName; //$NON-NLS-1$
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
index 3852d97..23a72de 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
@@ -145,7 +145,7 @@
private String getDefaultUrl(ProviderType type) {
if (type == null) {
- return new String();
+ return ""; //$NON-NLS-1$
}
switch (type) {
case OPENSTACK_NETWORK:
@@ -178,7 +178,7 @@
super.onSelectedItemChanging(newValue, oldValue);
String url = (String) getUrl().getEntity();
if (url == null) {
- url = new String();
+ url = ""; //$NON-NLS-1$
}
url = url.trim();
if (url.equals("") ||
url.equalsIgnoreCase(getDefaultUrl((ProviderType) oldValue))) { //$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
index fc5b1e1..772b453 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
@@ -145,7 +145,7 @@
providerColumn = new LinkColumnWithTooltip<NetworkView>() {
@Override
public String getValue(NetworkView object) {
- return object.getProvidedBy() == null ? new String() :
object.getProviderName();
+ return object.getProvidedBy() == null ? "" :
object.getProviderName(); //$NON-NLS-1$
}
};
getTable().addColumn(providerColumn, constants.providerNetwork(),
"200px"); //$NON-NLS-1$
--
To view, visit http://gerrit.ovirt.org/18652
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I449ea291a152dff968afa4862b22043da655cdcf
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
