Shahar Havivi has uploaded a new change for review. Change subject: findbugs: use platform specific line separator for String.Format ......................................................................
findbugs: use platform specific line separator for String.Format findbugs code: FS: Format string should use %n rather than \n Change-Id: I38b80e67df8c1618cbca3f0de722aef412e50664 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageHelper.java 4 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/14781/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java index 0d2fd79..2b12a64 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java @@ -113,7 +113,7 @@ @Override public String toString() { - return String.format("%s, force=%s, checkConnectivity=%s, conectivityTimeout=%s,\n\tnetworks=%s,\n\tbonds=%s,\n\tinterfaces=%s,\n\tremovedNetworks=%s,\n\tremovedBonds=%s", + return String.format("%s, force=%s, checkConnectivity=%s, conectivityTimeout=%s,%n\tnetworks=%s,%n\tbonds=%s,%n\tinterfaces=%s,%n\tremovedNetworks=%s,%n\tremovedBonds=%s", super.toString(), isForce(), isCheckConnectivity(), diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java index aec01cd..51f682c 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java @@ -49,7 +49,7 @@ private final String WARNING_ABOUT_TO_DELETE_LAST_DOMAIN = "WARNING: Domain %1$s is the last domain in the configuration. After deleting it you will have to either add another domain, or to use the internal admin user in order to login."; private final String INFO_ABOUT_NOT_ADDING_PERMISSIONS = - "The domain %1$s has been added to the engine as an authentication source but no users from that domain have been granted permissions within the oVirt Manager.\n"+ + "The domain %1$s has been added to the engine as an authentication source but no users from that domain have been granted permissions within the oVirt Manager.%n"+ "Users from this domain can be granted permissions from the Web administration interface or by editing the domain using -action=edit and specifying -addPermissions."; private final String SERVICE_RESTART_MESSAGE = diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java index f44b642..8f8faa3 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventSenderMailImpl.java @@ -68,7 +68,7 @@ } if (log.isDebugEnabled()) { - log.debug(String.format("Send email to [%s]\n subject:\n [%s]\n body:\n [%s]", + log.debug(String.format("Send email to [%s]%n subject:%n [%s]%n body:%n [%s]", recipient, message.getMessageSubject(), message.getMessageBody())); diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageHelper.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageHelper.java index beca111..efb813e 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageHelper.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/MessageHelper.java @@ -6,12 +6,12 @@ * A helper class designed to construct message parts in static structure */ public class MessageHelper { - private static String USER_INFO = "User Name: %s\n"; - private static String VM_INFO = "VM Name: %s\n"; - private static String HOST_INFO = "Host Name: %s\n"; - private static String TEMPLATE_INFO = "Template Name: %s\n"; - private static String DATA_CENTER_INFO = "Data Center Name: %s\n"; - private static String STORAGE_DOMAIN_INFO = "Storage Domain Name: %s\n"; + private static String USER_INFO = "User Name: %s%n"; + private static String VM_INFO = "VM Name: %s%n"; + private static String HOST_INFO = "Host Name: %s%n"; + private static String TEMPLATE_INFO = "Template Name: %s%n"; + private static String DATA_CENTER_INFO = "Data Center Name: %s%n"; + private static String STORAGE_DOMAIN_INFO = "Storage Domain Name: %s%n"; private static String HTML_USER_INFO = "<b>User Name:</b> %s<br>"; private static String HTML_VM_INFO = "<b>VM Name:</b> %s<br>"; @@ -64,7 +64,7 @@ public static String prepareMessageBody(MessageBody messageBody) { StringBuilder sb = new StringBuilder(); - sb.append(String.format("Time:%s\nMessage:%s\nSeverity:%s\n", + sb.append(String.format("Time:%s%nMessage:%s%nSeverity:%s%n", messageBody.getLogTime(), messageBody.getMessage(), messageBody.getSeverity())); -- To view, visit http://gerrit.ovirt.org/14781 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38b80e67df8c1618cbca3f0de722aef412e50664 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
