From 70af1a35458d31888f2d1d1a0ce54bb7bd61593b Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Mon, 4 Dec 2017 16:52:52 +0100
Subject: [PATCH] Move CompatUtility::GetHostAlias into DB IDO host object
 method

This is the only place where this mapping is used.
---
 lib/db_ido/hostdbobject.cpp  | 12 ++++++++++--
 lib/icinga/compatutility.cpp |  8 --------
 lib/icinga/compatutility.hpp |  1 -
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
index 0dc0abc3f..28343d48c 100644
--- a/lib/db_ido/hostdbobject.cpp
+++ b/lib/db_ido/hostdbobject.cpp
@@ -47,8 +47,16 @@ Dictionary::Ptr HostDbObject::GetConfigFields() const
 	Dictionary::Ptr fields = new Dictionary();
 	Host::Ptr host = static_pointer_cast<Host>(GetObject());
 
-	fields->Set("alias", CompatUtility::GetHostAlias(host));
-	fields->Set("display_name", host->GetDisplayName());
+	/* Compatibility fallback. */
+	String displayName = host->GetDisplayName();
+
+	if (!displayName.IsEmpty()) {
+		fields->Set("alias", displayName);
+	} else {
+		fields->Set("alias", host->GetName());
+	}
+
+	fields->Set("display_name", displayName);
 	fields->Set("address", host->GetAddress());
 	fields->Set("address6", host->GetAddress6());
 
diff --git a/lib/icinga/compatutility.cpp b/lib/icinga/compatutility.cpp
index 29eef3dd5..f4b0e6fce 100644
--- a/lib/icinga/compatutility.cpp
+++ b/lib/icinga/compatutility.cpp
@@ -96,14 +96,6 @@ String CompatUtility::GetHostStateString(const Host::Ptr& host)
 	return Host::StateToString(host->GetState());
 }
 
-String CompatUtility::GetHostAlias(const Host::Ptr& host)
-{
-	if (!host->GetDisplayName().IsEmpty())
-		return host->GetName();
-	else
-		return host->GetDisplayName();
-}
-
 int CompatUtility::GetHostNotifyOnDown(const Host::Ptr& host)
 {
 	unsigned long notification_state_filter = GetCheckableNotificationStateFilter(host);
diff --git a/lib/icinga/compatutility.hpp b/lib/icinga/compatutility.hpp
index 5cfcbe7e3..62c437c19 100644
--- a/lib/icinga/compatutility.hpp
+++ b/lib/icinga/compatutility.hpp
@@ -46,7 +46,6 @@ public:
 	/* host */
 	static int GetHostCurrentState(const Host::Ptr& host);
 	static String GetHostStateString(const Host::Ptr& host);
-	static String GetHostAlias(const Host::Ptr& host);
 	static int GetHostNotifyOnDown(const Host::Ptr& host);
 	static int GetHostNotifyOnUnreachable(const Host::Ptr& host);