MAGETWO-91961: architecture resolve feedback

- Renamed GoogleMapsApiValidator to form/field/GoogleMapsApiKey
- Renamed MapContainer to GoogleMapsApiKeyValidationContainer
- Renamed google_maps_api_validator to google_maps_api_key
- Fixed test names
- Fixed docblock and camelcased members

Author: Michael Yu

app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/GoogleMapsApiValidator.php renamed to app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/Form/Field/GoogleMapsApiKey.php

@@ -5,17 +5,17 @@
  */
 declare(strict_types=1);
 
-namespace Magento\PageBuilder\Block\Adminhtml\System\Config;
+namespace Magento\PageBuilder\Block\Adminhtml\System\Config\Form\Field;
 
-class GoogleMapsApiValidator extends \Magento\Config\Block\System\Config\Form\Field
+class GoogleMapsApiKey extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
      * @inheritdoc
      */
     protected function _prepareLayout()
     {
         parent::_prepareLayout();
-        $this->setTemplate('Magento_PageBuilder::system/config/google_maps_api_validator.phtml');
+        $this->setTemplate('Magento_PageBuilder::system/config/google_maps_api_key.phtml');
         return $this;
     }
 

app/code/Magento/PageBuilder/Component/MapContainer.php renamed to app/code/Magento/PageBuilder/Component/GoogleMapsApiKeyValidationContainer.php

@@ -13,40 +13,40 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\PageBuilder\Model\GoogleMaps\ApiKeyValidator;
 
-class MapContainer extends \Magento\Ui\Component\Container
+class GoogleMapsApiKeyValidationContainer extends \Magento\Ui\Component\Container
 {
     const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
 
     /**
-     * @var UrlInterface $url
+     * @var UrlInterface
      */
     private $url;
 
     /**
-     * @var ScopeConfigInterface $scopeConfig
+     * @var ScopeConfigInterface
      */
     private $scopeConfig;
 
     /**
-     * @var ApiKeyValidator $ApiKeyValidator
+     * @var ApiKeyValidator
      */
-    private $ApiKeyValidator;
+    private $apiKeyValidator;
 
     /**
      * Constructor
      *
      * @param ContextInterface $context
      * @param UrlInterface $url
      * @param ScopeConfigInterface $scopeConfig
-     * @param ApiKeyValidator $ApiKeyValidator
+     * @param ApiKeyValidator $apiKeyValidator
      * @param array $components
      * @param array $data
      */
     public function __construct(
         ContextInterface $context,
         UrlInterface $url,
         ScopeConfigInterface $scopeConfig,
-        ApiKeyValidator $ApiKeyValidator,
+        ApiKeyValidator $apiKeyValidator,
         array $components = [],
         array $data = []
     ) {
@@ -57,7 +57,7 @@ public function __construct(
         );
         $this->url = $url;
         $this->scopeConfig = $scopeConfig;
-        $this->ApiKeyValidator = $ApiKeyValidator;
+        $this->ApiKeyValidator = $apiKeyValidator;
     }
 
     /**

app/code/Magento/PageBuilder/Controller/Adminhtml/GoogleMaps/ValidateApi.php

@@ -16,20 +16,20 @@ class ValidateApi extends \Magento\Backend\App\Action
     /**
      * @var \Magento\PageBuilder\Model\GoogleMaps\ApiKeyValidator
      */
-    private $ApiKeyValidator;
+    private $apiKeyValidator;
 
     /**
      * Constructor
      *
      * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\PageBuilder\Model\GoogleMaps\ApiKeyValidator $ApiKeyValidator
+     * @param \Magento\PageBuilder\Model\GoogleMaps\ApiKeyValidator $apiKeyValidator
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\PageBuilder\Model\GoogleMaps\ApiKeyValidator $ApiKeyValidator
+        \Magento\PageBuilder\Model\GoogleMaps\ApiKeyValidator $apiKeyValidator
     ) {
         parent::__construct($context);
-        $this->ApiKeyValidator = $ApiKeyValidator;
+        $this->ApiKeyValidator = $apiKeyValidator;
     }
 
     /**

app/code/Magento/PageBuilder/etc/adminhtml/system.xml

@@ -29,7 +29,7 @@
                     <attribute type="valid_label">Key is valid</attribute>
                     <attribute type="invalid_label">Key is invalid. Try different key.</attribute>
                     <attribute type="source_field">cms_pagebuilder_google_maps_api_key</attribute>
-                    <frontend_model>Magento\PageBuilder\Block\Adminhtml\System\Config\GoogleMapsApiValidator</frontend_model>
+                    <frontend_model>Magento\PageBuilder\Block\Adminhtml\System\Config\Form\Field\GoogleMapsApiKey</frontend_model>
                 </field>
             </group>
         </section>

app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/google_maps_api_validator.phtml renamed to app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/google_maps_api_key.phtml

@@ -5,7 +5,7 @@
  */
 
 /**
- * @var \Magento\PageBuilder\Block\Adminhtml\System\Config\GoogleMapsApiValidator $block
+ * @var \Magento\PageBuilder\Block\Adminhtml\System\Config\Form\Field\GoogleMapsApiKey $block
  */
 ?>
 <button class="scalable"

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_map_form.xml

@@ -62,7 +62,7 @@
             </formElements>
         </field>
     </fieldset>
-    <container sortOrder="20" name="google_map_api_key_check" component="Magento_Ui/js/form/components/html" class="Magento\PageBuilder\Component\MapContainer">
+    <container sortOrder="20" name="google_map_api_key_check" component="Magento_Ui/js/form/components/html" class="Magento\PageBuilder\Component\GoogleMapsApiKeyValidationContainer">
         <argument name="data" xsi:type="array">
             <item name="config" xsi:type="array">
                 <item name="additionalClasses" xsi:type="string">message message-warning</item>
@@ -189,7 +189,7 @@
             </settings>
         </field>
     </fieldset>
-    <fieldset name="map_settings" sortOrder="30">
+    <fieldset name="map_settings" sortOrder="40">
         <settings>
             <label translate="true">Map Settings</label>
             <collapsible>true</collapsible>