From dc3a01de6601d45aa675db4e2a167c2de81edaf3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 19 May 2017 01:51:58 +0200 Subject: [PATCH] Next wave: - imported [Node|Dht]ObjectFactory - created namespaces MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../commands/console/class_HubConsoleMainCommand.php | 3 +++ .../hub/classes/cruncher/class_BaseHubCruncher.php | 1 + ...class_NodeDistributedHashTableDatabaseWrapper.php | 6 ++++++ application/hub/classes/dht/class_BaseDht.php | 3 +++ .../recipient/dht/class_DhtRecipientDiscovery.php | 6 ++++++ .../socket/class_PackageSocketDiscovery.php | 1 + application/hub/classes/factories/class_ | 6 ++++++ .../classes/factories/dht/class_DhtObjectFactory.php | 6 ++++++ .../factories/states/node/class_NodeStateFactory.php | 6 ++++++ .../filter/activation/node/class_NodeActivation | 3 +++ .../filter/bootstrap/node/class_NodeBootstrap | 3 +++ .../class_NodeBootstrapExtraBootstrappingFilter.php | 3 +++ .../node/class_NodeBootstrapGenerateNodeIdFilter.php | 3 +++ .../class_NodeBootstrapGeneratePrivateKeyFilter.php | 3 +++ .../class_NodeBootstrapGenerateSessionIdFilter.php | 3 +++ .../node/class_NodeBootstrapListenerPoolFilter.php | 3 +++ application/hub/classes/filter/class_ | 3 +++ .../filter/node/class_NodeInitializationFilter.php | 3 +++ .../filter/node/class_NodeWelcomeTeaserFilter.php | 3 +++ .../classes/filter/shutdown/node/class_NodeShutdown | 3 +++ .../node/class_NodeShutdownFlushNodeListFilter.php | 3 +++ .../shutdown/node/class_NodeShutdownNodeFilter.php | 3 +++ .../node/class_NodeTaskHandlerInitializerFilter.php | 3 +++ ...p => class_NodeAnnouncementAnswerOkayHandler.php} | 12 +++++++++--- .../class_NodeMessageAnnouncementHandler.php | 3 ++- .../class_NodeMessageAnnouncementAnswerHandler.php | 6 ++++++ .../class_NodeMessageDhtBootstrapAnswerHandler.php | 6 ++++++ ...class_NodeMessageRequestNodeListAnswerHandler.php | 6 ++++++ .../dht/class_NodeMessageDhtBootstrapHandler.php | 7 +++++++ .../class_NodeMessageRequestNodeListHandler.php | 6 ++++++ .../class_NodeMessageSelfConnectHandler.php | 6 ++++++ application/hub/classes/miner/class_BaseHubMiner.php | 1 + application/hub/classes/nodes/class_BaseHubNode.php | 1 + .../hub/classes/package/class_NetworkPackage.php | 7 ++++++- application/hub/classes/pools/class_BasePool.php | 3 +++ .../hub/classes/producer/class_BaseProducer.php | 1 + .../states/dht/booting/class_DhtBootingState.php | 6 ++++++ .../states/node/active/class_NodeActiveState.php | 6 ++++++ .../node/announcement/class_NodeAnnouncementTask.php | 6 ++++++ .../tasks/node/dht/class_NodeDhtBootstrapTask.php | 6 ++++++ .../node/dht/class_NodeDhtInitializationTask.php | 6 ++++++ .../node/dht/class_NodeDhtLateBootstrapTask.php | 6 ++++++ .../node/dht/class_NodeDhtPublicationCheckTask.php | 6 ++++++ .../tasks/node/dht/class_NodeDhtPublicationTask.php | 6 ++++++ .../tasks/node/dht/class_NodeDhtQueryTask.php | 6 ++++++ .../node/listener/class_NodeSocketListenerTask.php | 6 ++++++ .../node/self_connect/class_NodeSelfConnectTask.php | 6 ++++++ .../classes/template/class_BaseXmlTemplateEngine.php | 6 ++++++ application/hub/classes/tools/class_HubTools.php | 5 ++++- application/hub/config.php | 2 +- .../dht/class_DhtBootstrapNotAcceptedException.php | 6 ++++++ .../class_FactoryRequiredParameterException.php | 6 ++++++ 52 files changed, 229 insertions(+), 7 deletions(-) rename application/hub/classes/handler/answer-status/announcement/{class_AnnouncementAnswerOkayHandler.php => class_NodeAnnouncementAnswerOkayHandler.php} (91%) diff --git a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php index ccebfc281..db9deed0e 100644 --- a/application/hub/classes/commands/console/class_HubConsoleMainCommand.php +++ b/application/hub/classes/commands/console/class_HubConsoleMainCommand.php @@ -2,6 +2,9 @@ // Own namespace namespace Hub\Command; +// Import application-specific stuff +use Hub\Factory\Node\NodeObjectFactory; + // Import framework stuff use CoreFramework\Command\BaseCommand; use CoreFramework\Command\Commandable; diff --git a/application/hub/classes/cruncher/class_BaseHubCruncher.php b/application/hub/classes/cruncher/class_BaseHubCruncher.php index db94a79bc..ea6e6c100 100644 --- a/application/hub/classes/cruncher/class_BaseHubCruncher.php +++ b/application/hub/classes/cruncher/class_BaseHubCruncher.php @@ -6,6 +6,7 @@ namespace Hub\Cruncher; use Hub\Generic\BaseHubSystem; // Import framework stuff +use CoreFramework\Factory\ObjectFactory; use CoreFramework\Object\BaseFrameworkSystem; /** diff --git a/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php b/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php index 71862c67a..7e074d925 100644 --- a/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php +++ b/application/hub/classes/database/frontend/node/class_NodeDistributedHashTableDatabaseWrapper.php @@ -1,4 +1,10 @@ . */ -class AnnouncementAnswerOkayHandler extends BaseAnserStatusHandler implements HandleableAnswerStatus, Registerable { +class NodeAnnouncementAnswerOkayHandler extends BaseAnserStatusHandler implements HandleableAnswerStatus, Registerable { /** * Protected constructor * @@ -46,9 +52,9 @@ class AnnouncementAnswerOkayHandler extends BaseAnserStatusHandler implements Ha * * @return $handlerInstance An instance of a HandleableMessage class */ - public final static function createAnnouncementAnswerOkayHandler () { + public final static function createNodeAnnouncementAnswerOkayHandler () { // Get new instance - $handlerInstance = new AnnouncementAnswerOkayHandler(); + $handlerInstance = new NodeAnnouncementAnswerOkayHandler(); // Return the prepared instance return $handlerInstance; diff --git a/application/hub/classes/handler/message-types/announcement/class_NodeMessageAnnouncementHandler.php b/application/hub/classes/handler/message-types/announcement/class_NodeMessageAnnouncementHandler.php index 5f14fc1e0..8dba472f9 100644 --- a/application/hub/classes/handler/message-types/announcement/class_NodeMessageAnnouncementHandler.php +++ b/application/hub/classes/handler/message-types/announcement/class_NodeMessageAnnouncementHandler.php @@ -2,7 +2,8 @@ // Own namespace namespace Hub\Handler\Node\Message\Announcement; -// Import hub-specific stuff +// Import application-specific stuff +use Hub\Factory\Node\NodeObjectFactory; use Hub\Generic\BaseHubSystem; /** diff --git a/application/hub/classes/handler/message-types/answer/class_NodeMessageAnnouncementAnswerHandler.php b/application/hub/classes/handler/message-types/answer/class_NodeMessageAnnouncementAnswerHandler.php index 6ccd1619b..0b5a64b61 100644 --- a/application/hub/classes/handler/message-types/answer/class_NodeMessageAnnouncementAnswerHandler.php +++ b/application/hub/classes/handler/message-types/answer/class_NodeMessageAnnouncementAnswerHandler.php @@ -1,4 +1,10 @@ setConfigEntry('dht_active_state_class', 'DhtActiveState'); /////////////////////////////////////////////////////////////////////////////// // CFG: ANNOUNCEMENT-ANSWER-STATUS-OKAY-HANDLER-CLASS -$cfg->setConfigEntry('announcement_answer_status_okay_handler_class', 'AnnouncementAnswerOkayHandler'); +$cfg->setConfigEntry('announcement_answer_status_okay_handler_class', 'Hub\Handler\Node\Announcement\Answer\NodeAnnouncementAnswerOkayHandler'); // CFG: REQUEST-NODE-LIST-ANSWER-STATUS-OKAY-HANDLER-CLASS $cfg->setConfigEntry('request_node_list_answer_status_okay_handler_class', 'RequestNodeListAnswerOkayHandler'); diff --git a/application/hub/exceptions/dht/class_DhtBootstrapNotAcceptedException.php b/application/hub/exceptions/dht/class_DhtBootstrapNotAcceptedException.php index 474d86e2b..7f44a8fb9 100644 --- a/application/hub/exceptions/dht/class_DhtBootstrapNotAcceptedException.php +++ b/application/hub/exceptions/dht/class_DhtBootstrapNotAcceptedException.php @@ -1,4 +1,10 @@