MAGETWO-54134: CE module depends on EE code

- Removed plugin

Author: Dmytro Yushkin

app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php

@@ -596,11 +596,12 @@ protected function _isUSCountry($countyId)
      * Check whether girth is allowed for the carrier
      *
      * @param null|string $countyDest
+     * @param null|string $carrierMethodCode
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @api
      */
-    public function isGirthAllowed($countyDest = null)
+    public function isGirthAllowed($countyDest = null, $carrierMethodCode = null)
     {
         return false;
     }

app/code/Magento/Usps/Model/Carrier.php

@@ -8,11 +8,13 @@
 
 namespace Magento\Usps\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Shipping\Helper\Carrier as CarrierHelper;
 use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
 use Magento\Shipping\Model\Rate\Result;
 use Magento\Framework\Xml\Security;
+use Magento\Usps\Helper\Data as DataHelper;
 
 /**
  * USPS shipping
@@ -128,6 +130,11 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
         'USERID'
     ];
 
+    /**
+     * @var DataHelper
+     */
+    private $dataHelper;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
@@ -1982,11 +1989,13 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
      * Check whether girth is allowed for the USPS
      *
      * @param null|string $countyDest
+     * @param null|string $carrierMethodCode
      * @return bool
      */
-    public function isGirthAllowed($countyDest = null)
+    public function isGirthAllowed($countyDest = null, $carrierMethodCode = null)
     {
-        return $this->_isUSCountry($countyDest) ? false : true;
+        return $this->_isUSCountry($countyDest)
+            && $this->getDataHelper()->displayGirthValue($carrierMethodCode) ? false : true;
     }
 
     /**
@@ -2091,4 +2100,19 @@ protected function filterDebugData($data)
 
         return $data;
     }
+
+    /**
+     * Gets Data helper object
+     *
+     * @return DataHelper
+     * @deprecated
+     */
+    private function getDataHelper()
+    {
+        if (!$this->dataHelper) {
+            $this->dataHelper = ObjectManager::getInstance()->get(DataHelper::class);
+        }
+
+        return $this->dataHelper;
+    }
 }