From d8a3fb68bdad568867c0b6243f372bb8359670bc Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 9 Mar 2016 20:53:57 +0100
Subject: [PATCH] IcingaObjectGroup: unify group object logic

---
 library/Director/Objects/IcingaHostGroup.php    | 12 +-----------
 library/Director/Objects/IcingaObjectGroup.php  | 16 ++++++++++++++++
 library/Director/Objects/IcingaServiceGroup.php | 12 +-----------
 library/Director/Objects/IcingaUserGroup.php    | 13 +------------
 4 files changed, 19 insertions(+), 34 deletions(-)
 create mode 100644 library/Director/Objects/IcingaObjectGroup.php

diff --git a/library/Director/Objects/IcingaHostGroup.php b/library/Director/Objects/IcingaHostGroup.php
index afcb0b33..51adae22 100644
--- a/library/Director/Objects/IcingaHostGroup.php
+++ b/library/Director/Objects/IcingaHostGroup.php
@@ -2,17 +2,7 @@
 
 namespace Icinga\Module\Director\Objects;
 
-class IcingaHostGroup extends IcingaObject
+class IcingaHostGroup extends IcingaObjectGroup
 {
     protected $table = 'icinga_hostgroup';
-
-    protected $supportsImports = true;
-
-    protected $defaultProperties = array(
-        'id'                    => null,
-        'object_name'           => null,
-        'object_type'           => null,
-        'disabled'              => 'n',
-        'display_name'          => null,
-    );
 }
diff --git a/library/Director/Objects/IcingaObjectGroup.php b/library/Director/Objects/IcingaObjectGroup.php
new file mode 100644
index 00000000..cb667b51
--- /dev/null
+++ b/library/Director/Objects/IcingaObjectGroup.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Icinga\Module\Director\Objects;
+
+abstract class IcingaObjectGroup extends IcingaObject
+{
+    protected $supportsImports = true;
+
+    protected $defaultProperties = array(
+        'id'                    => null,
+        'object_name'           => null,
+        'object_type'           => null,
+        'disabled'              => 'n',
+        'display_name'          => null,
+    );
+}
diff --git a/library/Director/Objects/IcingaServiceGroup.php b/library/Director/Objects/IcingaServiceGroup.php
index c2aa3530..b29f51b6 100644
--- a/library/Director/Objects/IcingaServiceGroup.php
+++ b/library/Director/Objects/IcingaServiceGroup.php
@@ -2,17 +2,7 @@
 
 namespace Icinga\Module\Director\Objects;
 
-class IcingaServiceGroup extends IcingaObject
+class IcingaServiceGroup extends IcingaObjectGroup
 {
     protected $table = 'icinga_servicegroup';
-
-    protected $supportsImports = true;
-
-    protected $defaultProperties = array(
-        'id'                    => null,
-        'object_name'           => null,
-        'object_type'           => null,
-        'disabled'              => 'n',
-        'display_name'          => null,
-    );
 }
diff --git a/library/Director/Objects/IcingaUserGroup.php b/library/Director/Objects/IcingaUserGroup.php
index a64fb5e6..b5386149 100644
--- a/library/Director/Objects/IcingaUserGroup.php
+++ b/library/Director/Objects/IcingaUserGroup.php
@@ -2,18 +2,7 @@
 
 namespace Icinga\Module\Director\Objects;
 
-class IcingaUserGroup extends IcingaObject
+class IcingaUserGroup extends IcingaObjectGroup
 {
     protected $table = 'icinga_usergroup';
-
-    protected $supportsImports = true;
-
-    protected $defaultProperties = array(
-        'id'                    => null,
-        'object_name'           => null,
-        'object_type'           => null,
-        'disabled'              => 'n',
-        'display_name'          => null,
-        'zone_id'               => null,
-    );
 }