From 84ca76444c3cc19221f5a4414b10b48e5bb14b76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 7 Nov 2020 16:58:33 +0100 Subject: [PATCH] Continued: - removed $databaseInstance, $compressorInstance from BaseFrameworkSystem as this was no longer used - moved $compressorChannel to proper class MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../classes/class_BaseFrameworkSystem.php | 75 ------------------- .../class_CachedLocalFileDatabase.php | 33 +++++++- .../database/class_BaseDatabaseWrapper.php | 2 +- 3 files changed, 30 insertions(+), 80 deletions(-) diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index 34076636..2fe41474 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -4,8 +4,6 @@ namespace Org\Mxchange\CoreFramework\Object; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; -use Org\Mxchange\CoreFramework\Compressor\Compressor; -use Org\Mxchange\CoreFramework\Connection\Database\DatabaseConnection; use Org\Mxchange\CoreFramework\Criteria\Criteria; use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria; use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria; @@ -30,7 +28,6 @@ use Org\Mxchange\CoreFramework\Loader\ClassLoader; use Org\Mxchange\CoreFramework\Localization\ManageableLanguage; use Org\Mxchange\CoreFramework\Manager\ManageableApplication; use Org\Mxchange\CoreFramework\Menu\RenderableMenu; -use Org\Mxchange\CoreFramework\Middleware\Compressor\CompressorChannel; use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Parser\Parseable; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; @@ -152,21 +149,11 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac */ private $stackInstance = NULL; - /** - * A Compressor instance - */ - private $compressorInstance = NULL; - /** * A Parseable instance */ private $parserInstance = NULL; - /** - * A database wrapper instance - */ - private $databaseInstance = NULL; - /** * A helper instance for the form */ @@ -717,49 +704,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac return $webOutputInstance; } - /** - * Setter for database instance - * - * @param $databaseInstance The instance for the database connection (forced DatabaseConnection) - * @return void - */ - public final function setDatabaseInstance (DatabaseConnection $databaseInstance) { - GenericRegistry::getRegistry()->addInstance('db_instance', $databaseInstance); - } - - /** - * Getter for database layer - * - * @return $databaseInstance The database layer instance - */ - public final function getDatabaseInstance () { - // Get instance - $databaseInstance = GenericRegistry::getRegistry()->getInstance('db_instance'); - - // Return instance - return $databaseInstance; - } - - /** - * Setter for compressor channel - * - * @param $compressorInstance An instance of CompressorChannel - * @return void - */ - public final function setCompressorChannel (CompressorChannel $compressorInstance) { - GenericRegistry::getRegistry()->addInstance('compressor', $compressorInstance); - } - - /** - * Getter for compressor channel - * - * @return $compressorInstance The compressor channel - */ - public final function getCompressorChannel () { - $compressorInstance = GenericRegistry::getRegistry()->getInstance('compressor'); - return $compressorInstance; - } - /** * Private getter for language instance * @@ -914,25 +858,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac return $this->stackInstance; } - /** - * Setter for compressor instance - * - * @param $compressorInstance An instance of an compressor - * @return void - */ - public final function setCompressorInstance (Compressor $compressorInstance) { - $this->compressorInstance = $compressorInstance; - } - - /** - * Getter for compressor instance - * - * @return $compressorInstance An instance of an compressor - */ - public final function getCompressorInstance () { - return $this->compressorInstance; - } - /** * Setter for Parseable instance * diff --git a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php index 91aa9ac5..7ba7a968 100644 --- a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php +++ b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php @@ -13,6 +13,7 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Filesystem\FileNotFoundException; use Org\Mxchange\CoreFramework\Generic\FrameworkException; use Org\Mxchange\CoreFramework\Handler\Stream\IoHandler; +use Org\Mxchange\CoreFramework\Middleware\Compressor\CompressorChannel; // Import SPL stuff use \SplFileInfo; @@ -81,6 +82,11 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac */ private $fileIoInstance = NULL; + /** + * A Compressor instance + */ + private $compressorChannelInstance = NULL; + /** * The protected constructor. Do never instance from outside! You need to * set a local file path. The class will then validate it. @@ -103,10 +109,10 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac $databaseInstance = new CachedLocalFileDatabase(); // Get a new compressor channel instance - $compressorInstance = ObjectFactory::createObjectByConfiguredName('compressor_channel_class'); + $compressorChannelInstance = ObjectFactory::createObjectByConfiguredName('compressor_channel_class'); // Set the compressor channel - $databaseInstance->setCompressorChannel($compressorInstance); + $databaseInstance->setCompressorChannelInstance($compressorChannelInstance); // Get a file IO handler $fileIoInstance = ObjectFactory::createObjectByConfiguredName('file_io_class'); @@ -197,6 +203,25 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac $this->fileIoInstance = $fileIoInstance; } + /** + * Setter for compressor channel + * + * @param $compressorChannelInstance An instance of a CompressorChannel class + * @return void + */ + protected final function setCompressorChannelInstance (CompressorChannel $compressorChannelInstance) { + $this->compressorChannelInstance = $compressorChannelInstance; + } + + /** + * Getter for compressor channel + * + * @return $compressorChannelInstance An instance of a CompressorChannel class + */ + protected final function getCompressorChannelInstance () { + return $this->compressorChannelInstance; + } + /** * Reads a local data file and returns it's contents in an array * @@ -210,7 +235,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac $compressedData = $compressedData['data']; // Decompress it - $serializedData = $this->getCompressorChannel()->getCompressor()->decompressStream($compressedData); + $serializedData = $this->getCompressorChannelInstance()->getCompressor()->decompressStream($compressedData); // Unserialize it $dataArray = json_decode($serializedData, true); @@ -232,7 +257,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac // Serialize and compress it //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CACHED-LFDB: Flushing ' . count($dataArray) . ' elements to database file ' . $infoInstance . ' ...'); //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CACHED-LFDB: dataArray=' . print_r($dataArray, true)); - $compressedData = $this->getCompressorChannel()->getCompressor()->compressStream(json_encode($dataArray)); + $compressedData = $this->getCompressorChannelInstance()->getCompressor()->compressStream(json_encode($dataArray)); // Write this data BASE64 encoded to the file //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CACHED-LFDB: Writing ' . strlen($compressedData) . ' bytes ...'); diff --git a/framework/main/classes/database/class_BaseDatabaseWrapper.php b/framework/main/classes/database/class_BaseDatabaseWrapper.php index f9414067..31f79142 100644 --- a/framework/main/classes/database/class_BaseDatabaseWrapper.php +++ b/framework/main/classes/database/class_BaseDatabaseWrapper.php @@ -287,7 +287,7 @@ abstract class BaseDatabaseWrapper extends BaseFrameworkSystem { * @return $data A cleaned up array with only public data. */ public function removeNonPublicDataFromArray (array $data) { - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('WRAPPER[' . $this->__toString() . ']: Calling this->getDatabaseInstance()->removeNonPublicDataFromArray(data) ...'); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('WRAPPER[' . $this->__toString() . ']: Calling FrameworkBootstrap::getDatabaseInstance()->removeNonPublicDataFromArray(data) ...'); $data = FrameworkBootstrap::getDatabaseInstance()->removeNonPublicDataFromArray($data); //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('WRAPPER[' . $this->__toString() . ']: data[]=' . gettype($data)); -- 2.39.2