Continued:

- REFACTURING: imported new traits, will have more in the future
- updated core framework

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php b/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php
index 7b463b2d7e72beb22ebe68c05b15d3f7f9cda49d..702a228e31e7cec01ebbd703da561575d4e5501d 100644 (file)
--- a/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php
+++ b/application/hub/classes/database/frontend/node/class_NodeInformationDatabaseWrapper.php
@@ -96,12 +96,9 @@ class NodeInformationDatabaseWrapper extends BaseHubDatabaseWrapper implements N
                        // Get a result back
                        $resultInstance = $this->doSelectByCriteria($searchInstance);
 
-                       // Set result instance in node instance
-                       $nodeInstance->setResultInstance($resultInstance);
-
                        // Is it valid?
                        $GLOBALS[__METHOD__] = $resultInstance->next();
-               } // END - if
+               }
 
                // Return it
                return $GLOBALS[__METHOD__];

diff --git a/application/hub/classes/handler/chunks/class_ChunkHandler.php b/application/hub/classes/handler/chunks/class_ChunkHandler.php
index 05eed6ee3fe011a587372e017c89f58ad51f53ee..223a616b3922bcc7b54e96a2aa5e6e5ff89d05f7 100644 (file)
--- a/application/hub/classes/handler/chunks/class_ChunkHandler.php
+++ b/application/hub/classes/handler/chunks/class_ChunkHandler.php
@@ -11,6 +11,7 @@ use Org\Shipsimu\Hub\Network\Package\Delivery\Fragment\PackageFragmenter;
 use Org\Mxchange\CoreFramework\Assertion\AssertionException;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Traits\Crypto\CryptoTrait;
 
 /**
  * A Chunk handler
@@ -35,6 +36,9 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 class ChunkHandler extends BaseHubHandler implements HandleableChunks, Registerable {
+       // Load traits
+       use CryptoTrait;
+
        /**
         * Stacker for chunks with final EOP
         */

diff --git a/application/hub/classes/handler/package/class_NetworkPackageHandler.php b/application/hub/classes/handler/package/class_NetworkPackageHandler.php
index 779dfad0ea847e0ae97565d8905be8f4e5db2656..be6c3ad6c7a36526e20ec201a6265cf5e1901d30 100644 (file)
--- a/application/hub/classes/handler/package/class_NetworkPackageHandler.php
+++ b/application/hub/classes/handler/package/class_NetworkPackageHandler.php
@@ -39,6 +39,7 @@ use Org\Mxchange\CoreFramework\Feature\FrameworkFeature;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Socket\InvalidSocketException;
+use Org\Mxchange\CoreFramework\Traits\Crypto\CryptoTrait;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;
 use Org\Mxchange\CoreFramework\Visitor\Visitor;
 
@@ -85,6 +86,9 @@ use \UnexpectedValueException;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Receivable, Registerable, Visitable {
+       // Load traits
+       use CryptoTrait;
+
        /**
         * Package mask for compressing package data:
         * 0: Compressor extension

diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index b1d9e0541c47a517793926ee1deb76c0f08b58ed..79024c1de34dd20f74180b867f61e0fd9c466ca7 100644 (file)
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -30,6 +30,7 @@ use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 use Org\Mxchange\CoreFramework\Task\Taskable;
+use Org\Mxchange\CoreFramework\Traits\Crypto\CryptoTrait;
 
 /**
  * A general hub node class
@@ -54,6 +55,9 @@ use Org\Mxchange\CoreFramework\Task\Taskable;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableCriteria {
+       // Load traits
+       use CryptoTrait;
+
        /**
         * Node types
         */

diff --git a/application/hub/classes/package/fragmenter/class_PackageFragmenter.php b/application/hub/classes/package/fragmenter/class_PackageFragmenter.php
index 8f3696bf11aa99db261797ffb4ce32cc39664730..acdf7946bc05eed905fe5f3fadf1f7b4aa1f4e3e 100644 (file)
--- a/application/hub/classes/package/fragmenter/class_PackageFragmenter.php
+++ b/application/hub/classes/package/fragmenter/class_PackageFragmenter.php
@@ -13,6 +13,7 @@ use Org\Mxchange\CoreFramework\Assertion\AssertionException;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Traits\Crypto\CryptoTrait;
 use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
 
 /**
@@ -47,6 +48,9 @@ use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 class PackageFragmenter extends BaseHubSystem implements Fragmentable, Registerable {
+       // Load traits
+       use CryptoTrait;
+
        /**
         * Cached chunk size in bits
         */

diff --git a/application/hub/classes/source/class_BaseSource.php b/application/hub/classes/source/class_BaseSource.php
index c8d61f115ce63cf47581f2e8dd1ab6f81a2fea00..a635d5ff922922961abc16dbda18631826f1dca5 100644 (file)
--- a/application/hub/classes/source/class_BaseSource.php
+++ b/application/hub/classes/source/class_BaseSource.php
@@ -5,6 +5,9 @@ namespace Org\Shipsimu\Hub\Crawler\Source;
 // Import application-specific stuff
 use Org\Shipsimu\Hub\Generic\BaseHubSystem;
 
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Traits\Crypto\CryptoTrait;
+
 /**
  * A general source class
  *
@@ -28,6 +31,9 @@ use Org\Shipsimu\Hub\Generic\BaseHubSystem;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 abstract class BaseSource extends BaseHubSystem {
+       // Load traits
+       use CryptoTrait;
+
        /**
         * Protected constructor
         *

diff --git a/core b/core
index 2b0e7f20e7d554a5675c3268db6de3dd3ab3421d..977b9bbb804eda74ad2d819d1de082933dd0bb08 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 2b0e7f20e7d554a5675c3268db6de3dd3ab3421d
+Subproject commit 977b9bbb804eda74ad2d819d1de082933dd0bb08