Continued:

[city.git] / application / city / classes / city_daemon / class_BaseCityDaemon.php

diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php
index 5e743d1908d1e8ab133d593d9f2fe905b5c3f370..ded79a3a8656d3698bd635114b3bc1aae18ee656 100644 (file)
--- a/application/city/classes/city_daemon/class_BaseCityDaemon.php
+++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php
@@ -6,19 +6,21 @@ namespace Org\Mxchange\City\Daemon;
 use Org\Mxchange\City\Factory\Manager\ManagerFactory;
 use Org\Mxchange\City\Factory\State\CityStateFactory;
 use Org\Mxchange\City\Generic\BaseCitySystem;
-use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper;
+use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseFrontend;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria;
 use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
-use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
+use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend;
 use Org\Mxchange\CoreFramework\Database\Updateable;
-use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
+use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Traits\Crypto\CryptoTrait;
+use Org\Mxchange\CoreFramework\Traits\Database\Frontend\DatabaseFrontendTrait;
 
 /**
  * A general City class
@@ -43,6 +45,10 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriteria {
+       // Load traits
+       use CryptoTrait;
+       use DatabaseFrontendTrait;
+
        /**
         * City types
         */
@@ -60,15 +66,15 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda
         * @param       $className      Name of the class
         * @return      void
         */
-       protected function __construct ($className) {
+       protected function __construct (string $className) {
                // Call parent constructor
                parent::__construct($className);
 
-               // Get a wrapper instance
-               $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_info_db_wrapper_class');
+               // Get a frontend instance
+               $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('city_info_db_frontend_class');
 
                // Set it here
-               $this->setWrapperInstance($wrapperInstance);
+               $this->setFrontendInstance($frontendInstance);
 
                // Get a crypto instance
                $cryptoInstance = ObjectFactory::createObjectByConfiguredName('crypto_class');
@@ -126,11 +132,11 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda
                assert($requestInstance instanceof Requestable);
 
                // Add City number and type
-               $criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_ID  , 1);
-               $criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_MODE, $requestInstance->getRequestElement('mode'));
+               $criteriaInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_ID  , 1);
+               $criteriaInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_MODE, $requestInstance->getRequestElement('mode'));
 
                // Add the City id
-               $criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_ID, $this->getCityId());
+               $criteriaInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_ID, $this->getCityId());
        }
 
        /**
@@ -151,7 +157,7 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda
                $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
                // Add search criteria
-               $searchInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUserName());
+               $searchInstance->addCriteria(UserDatabaseFrontend::DB_COLUMN_USERNAME, $this->getUserName());
                $searchInstance->setLimit(1);
 
                // Now get another criteria
@@ -163,8 +169,8 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda
                // Add the search criteria for searching for the right entry
                $updateInstance->setSearchInstance($searchInstance);
 
-               // Set wrapper class name
-               $updateInstance->setWrapperConfigEntry('user_db_wrapper_class');
+               // Set frontend class name
+               $updateInstance->setFrontendConfigEntry('user_db_frontend_class');
 
                // Remember the update in database result
                $this->getResultInstance()->add2UpdateQueue($updateInstance);
@@ -234,7 +240,7 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda
         */
        public function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $cityData) {
                // Add all data the array provides
-               foreach (CityInformationDatabaseWrapper::getAllElements() as $element) {
+               foreach (CityInformationDatabaseFrontend::getAllElements() as $element) {
                        // Is the element there?
                        if (isset($cityData[$element])) {
                                // Add it