From 069101e0dac6394d924c0c46ab047b8c45cdd7ab Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 19 May 2017 16:37:08 +0200
Subject: [PATCH] Next wave: - imported BaseDiscovery, Discoveryable,
 BaseNodeDiscovery - created namespaces - removed duplicate interface, now in
 core framework - BaseNodeDiscovery needs to be abstract now - added missing
 namespaces - no, no. BaseNodeDiscovery must implement the generic methods -
 tpzo fixed
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 application/hub/classes/discovery/class_      |  3 ++
 .../discovery/class_BaseNodeDiscovery.php     |  8 +++++
 .../class_UniversalNodeLocatorDiscovery.php   |  3 +-
 .../protocol/class_ProtocolDiscovery.php      |  3 ++
 .../class_BaseRecipientDiscovery.php          | 10 ++++--
 application/hub/config.php                    |  2 +-
 .../interfaces/discovery/class_Discoverable   |  6 ++++
 .../discovery/class_Discoverable.php          | 34 -------------------
 .../protocol/class_DiscoverableProtocol.php   |  6 ++++
 .../recipient/class_DiscoverableRecipient.php |  6 ++++
 ...class_DiscoverableUniversalNodeLocator.php |  3 ++
 11 files changed, 45 insertions(+), 39 deletions(-)
 delete mode 100644 application/hub/interfaces/discovery/class_Discoverable.php

diff --git a/application/hub/classes/discovery/class_ b/application/hub/classes/discovery/class_
index fc0d85a69..135847919 100644
--- a/application/hub/classes/discovery/class_
+++ b/application/hub/classes/discovery/class_
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace Hub\Discovery\;
+
 /**
  * A !!! discovery class
  *
diff --git a/application/hub/classes/discovery/class_BaseNodeDiscovery.php b/application/hub/classes/discovery/class_BaseNodeDiscovery.php
index 8da491940..57c8d96c3 100644
--- a/application/hub/classes/discovery/class_BaseNodeDiscovery.php
+++ b/application/hub/classes/discovery/class_BaseNodeDiscovery.php
@@ -1,4 +1,11 @@
 <?php
+// Own namespace
+namespace Hub\Discovery\Node;
+
+// Import framework stuff
+use CoreFramework\Discovery\BaseDiscovery;
+use CoreFramework\Discovery\Discoverable;
+
 /**
  * A general node discovery class
  *
@@ -32,4 +39,5 @@ class BaseNodeDiscovery extends BaseDiscovery implements Discoverable {
 		// Call parent constructor
 		parent::__construct($className);
 	}
+
 }
diff --git a/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php b/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php
index d11b0bfd4..73f162d6f 100644
--- a/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php
+++ b/application/hub/classes/discovery/node/class_UniversalNodeLocatorDiscovery.php
@@ -1,8 +1,9 @@
 <?php
 // Own namespace
-namespace Hub\Disovery\Locator;
+namespace Hub\Discovery\Locator;
 
 // Import application-specific stuff
+use Hub\Discovery\Node\BaseNodeDiscovery;
 use Hub\Helper\Node\NodeHelper;
 
 // Import framework stuff
diff --git a/application/hub/classes/discovery/protocol/class_ProtocolDiscovery.php b/application/hub/classes/discovery/protocol/class_ProtocolDiscovery.php
index 0537f902b..ca5a64852 100644
--- a/application/hub/classes/discovery/protocol/class_ProtocolDiscovery.php
+++ b/application/hub/classes/discovery/protocol/class_ProtocolDiscovery.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Hub\Discovery\Protocol;
 
+// Import application-specific stuff
+use Hub\Discovery\Node\BaseNodeDiscovery;
+
 // Import framework stuff
 use CoreFramework\Registry\Registerable;
 
diff --git a/application/hub/classes/discovery/recipient/class_BaseRecipientDiscovery.php b/application/hub/classes/discovery/recipient/class_BaseRecipientDiscovery.php
index 9ad0f612e..cc9ff9c0c 100644
--- a/application/hub/classes/discovery/recipient/class_BaseRecipientDiscovery.php
+++ b/application/hub/classes/discovery/recipient/class_BaseRecipientDiscovery.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Discovery\Recipient;
+
+// Import framework-specific stuff
+use Hub\Discovery\Node\BaseNodeDiscovery;
+
 /**
  * A PackageRecipient discovery class
  *
@@ -76,7 +82,5 @@ class BaseRecipientDiscovery extends BaseNodeDiscovery implements DiscoverableRe
 		// Return it
 		return $isEmpty;
 	}
-}
 
-// [EOF]
-?>
+}
diff --git a/application/hub/config.php b/application/hub/config.php
index bfeff2932..a45a14971 100644
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -724,7 +724,7 @@ $cfg->setConfigEntry('socket_discovery_class', 'PackageSocketDiscovery');
 $cfg->setConfigEntry('dht_recipient_discovery_class', 'DhtRecipientDiscovery');
 
 // CFG: UNL-DISCOVERY-CLASS
-$cfg->setConfigEntry('unl_discovery_class', 'UniversalNodeLocatorDiscovery');
+$cfg->setConfigEntry('unl_discovery_class', 'Hub\Discovery\Locator\UniversalNodeLocatorDiscovery');
 
 // CFG: TCP-PROTOCOL-HANDLER-CLASS
 $cfg->setConfigEntry('tcp_protocol_handler_class', 'TcpProtocolHandler');
diff --git a/application/hub/interfaces/discovery/class_Discoverable b/application/hub/interfaces/discovery/class_Discoverable
index ebe26957b..ec04796e5 100644
--- a/application/hub/interfaces/discovery/class_Discoverable
+++ b/application/hub/interfaces/discovery/class_Discoverable
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Discovery\;
+
+// Import framework stuff
+use CoreFramework\Discovery\Discoverable;
+
 /**
  * An interface for !!! discovery
  *
diff --git a/application/hub/interfaces/discovery/class_Discoverable.php b/application/hub/interfaces/discovery/class_Discoverable.php
deleted file mode 100644
index 478b8cba6..000000000
--- a/application/hub/interfaces/discovery/class_Discoverable.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-// Own namespace
-namespace Hub\Discovery;
-
-// Import framework stuff
-use CoreFramework\Generic\FrameworkInterface;
-
-/**
- * An interface for socket discovery
- *
- * @author		Roland Haeder <webmaster@shipsimu.org>
- * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
- * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.shipsimu.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-interface Discoverable extends FrameworkInterface {
-}
-
-// [EOF]
-?>
diff --git a/application/hub/interfaces/discovery/protocol/class_DiscoverableProtocol.php b/application/hub/interfaces/discovery/protocol/class_DiscoverableProtocol.php
index e60cac53c..e002399c8 100644
--- a/application/hub/interfaces/discovery/protocol/class_DiscoverableProtocol.php
+++ b/application/hub/interfaces/discovery/protocol/class_DiscoverableProtocol.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Discovery\Protocol;
+
+// Import framework stuff
+use CoreFramework\Discovery\Discoverable;
+
 /**
  * An interface for protocol discovery
  *
diff --git a/application/hub/interfaces/discovery/recipient/class_DiscoverableRecipient.php b/application/hub/interfaces/discovery/recipient/class_DiscoverableRecipient.php
index 66ccd1cf3..60fc50955 100644
--- a/application/hub/interfaces/discovery/recipient/class_DiscoverableRecipient.php
+++ b/application/hub/interfaces/discovery/recipient/class_DiscoverableRecipient.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Hub\Discovery\Recipient;
+
+// Import framework stuff
+use CoreFramework\Discovery\Discoverable;
+
 /**
  * An interface for recipient discovery
  *
diff --git a/application/hub/interfaces/discovery/unl/class_DiscoverableUniversalNodeLocator.php b/application/hub/interfaces/discovery/unl/class_DiscoverableUniversalNodeLocator.php
index 4843ba25a..4b83d41f7 100644
--- a/application/hub/interfaces/discovery/unl/class_DiscoverableUniversalNodeLocator.php
+++ b/application/hub/interfaces/discovery/unl/class_DiscoverableUniversalNodeLocator.php
@@ -5,6 +5,9 @@ namespace Hub\Discovery\Locator;
 // Import application-specific stuff
 use Hub\Helper\Node\NodeHelper;
 
+// Import framework stuff
+use CoreFramework\Discovery\Discoverable;
+
 /**
  * An interface for UNL discovery
  *
-- 
2.39.5