Merge pull request #5267 from mhsdesign/task/migrate-to-json-node-add…

…ress

TASK: Remove legacy `NodeAddress` and `NodeAddressFactory`

Neos.Neos/Classes/Controller/Backend/ContentController.php

@@ -16,6 +16,7 @@
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\Controller\ActionController;
@@ -38,8 +39,6 @@
 use Neos\Media\TypeConverter\AssetInterfaceConverter;
 use Neos\Media\TypeConverter\ImageInterfaceArrayPresenter;
 use Neos\Neos\Controller\BackendUserTranslationTrait;
-use Neos\Neos\FrontendRouting\NodeAddressFactory;
-use Neos\Neos\FrontendRouting\SiteDetection\SiteDetectionResult;
 use Neos\Neos\TypeConverter\EntityToIdentityConverter;
 use Neos\Neos\Utility\NodeTypeWithFallbackProvider;
 
@@ -146,13 +145,9 @@ public function initializeUploadAssetAction(): void
      */
     public function uploadAssetAction(Asset $asset, string $metadata, string $node, string $propertyName)
     {
-        $nodeAddressString = $node;
-        $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())
-            ->contentRepositoryId;
-        $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);
-        // todo legacy uri node address notation used. Should be refactored to use json encoded NodeAddress
-        $nodeAddress = NodeAddressFactory::create($contentRepository)->createCoreNodeAddressFromLegacyUriString($nodeAddressString);
+        $nodeAddress = NodeAddress::fromJsonString($node);
 
+        $contentRepository = $this->contentRepositoryRegistry->get($nodeAddress->contentRepositoryId);
         $node = $contentRepository->getContentGraph($nodeAddress->workspaceName)
             ->getSubgraph(
                 $nodeAddress->dimensionSpacePoint,

Neos.Neos/Classes/Controller/Service/NodesController.php

@@ -28,8 +28,8 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\SearchTerm\SearchTerm;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\SearchTerm\SearchTermMatcher;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
-use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
@@ -39,7 +39,6 @@
 use Neos\FluidAdaptor\View\TemplateView;
 use Neos\Neos\Controller\BackendUserTranslationTrait;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
-use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\Neos\FrontendRouting\SiteDetection\SiteDetectionResult;
 use Neos\Neos\Ui\Domain\Service\NodePropertyConverterService;
 use Neos\Neos\View\Service\NodeJsonView;
@@ -130,9 +129,8 @@ public function indexAction(
             : null;
         $nodeAddress = null;
         if (!$nodePath) {
-            // todo legacy uri node address notation used. Should be refactored to use json encoded NodeAddress
             $nodeAddress = $contextNode
-                ? NodeAddressFactory::create($contentRepository)->createCoreNodeAddressFromLegacyUriString($contextNode)
+                ? NodeAddress::fromJsonString($contextNode)
                 : null;
         }
 
@@ -238,7 +236,7 @@ public function showAction(string $identifier, string $workspaceName = 'live', a
             }
         });
 
-        $nodeAddress = NodeAddressFactory::create($contentRepository)->createFromNode($node)->serializeForUri();
+        $nodeAddress = NodeAddress::fromNode($node)->toJson();
 
         $this->view->assignMultiple([
             'node' => $node,

Neos.Neos/Classes/Routing/NodeIdentityConverterAspect.php

@@ -16,7 +16,6 @@
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
-use Neos\Neos\FrontendRouting\NodeAddress as LegacyNodeAddress;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Aop\JoinPointInterface;
 
@@ -47,8 +46,6 @@ public function convertNodeToContextPathForRouting(JoinPointInterface $joinPoint
             return ['__contextNodePath' => NodeAddress::fromNode($objectArgument)->toJson()];
         } elseif ($objectArgument instanceof NodeAddress) {
             return ['__contextNodePath' => $objectArgument->toJson()];
-        } elseif ($objectArgument instanceof LegacyNodeAddress) {
-            return ['__contextNodePath' => $objectArgument->serializeForUri()];
         }
 
         return $joinPoint->getAdviceChain()->proceed($joinPoint);

Neos.Neos/Classes/Service/ContentElementEditableService.php

@@ -15,11 +15,11 @@
 namespace Neos\Neos\Service;
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Security\Authorization\PrivilegeManagerInterface;
 use Neos\Fusion\Service\HtmlAugmenter as FusionHtmlAugmenter;
-use Neos\Neos\FrontendRouting\NodeAddressFactory;
 
 /**
  * The content element editable service adds the necessary markup around
@@ -61,9 +61,7 @@ public function wrapContentProperty(Node $node, string $property, string $conten
 
         $attributes = [
             'data-__neos-property' => $property,
-            'data-__neos-editable-node-contextpath' => NodeAddressFactory::create($contentRepository)
-                ->createFromNode($node)
-                ->serializeForUri()
+            'data-__neos-editable-node-contextpath' => NodeAddress::fromNode($node)->toJson()
         ];
 
         return $this->htmlAugmenter->addAttributes($content, $attributes, 'span');

Neos.Neos/Classes/Service/ContentElementWrappingService.php

@@ -15,10 +15,10 @@
 namespace Neos\Neos\Service;
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Fusion\Service\HtmlAugmenter as FusionHtmlAugmenter;
-use Neos\Neos\FrontendRouting\NodeAddressFactory;
 
 /**
  * The content element wrapping service adds the necessary markup around
@@ -62,10 +62,10 @@ public function wrapContentObject(
         //}
 
 
-        $nodeAddress = NodeAddressFactory::create($contentRepository)->createFromNode($node);
+        $nodeAddress = NodeAddress::fromNode($node);
         $attributes = $additionalAttributes;
         $attributes['data-__neos-fusion-path'] = $fusionPath;
-        $attributes['data-__neos-node-contextpath'] = $nodeAddress->serializeForUri();
+        $attributes['data-__neos-node-contextpath'] = $nodeAddress->toJson();
 
         // Define all attribute names as exclusive via the `exclusiveAttributes` parameter, to prevent the data of
         // two different nodes to be concatenated into the attributes of a single html node.

Neos.Neos/Classes/Service/Controller/DataSourceController.php

@@ -21,12 +21,10 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\View\JsonView;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
-use Neos\Neos\FrontendRouting\NodeAddressFactory;
-use Neos\Neos\FrontendRouting\SiteDetection\SiteDetectionResult;
-use Neos\Utility\ObjectAccess;
 use Neos\Flow\Reflection\ReflectionService;
 use Neos\Neos\Exception as NeosException;
 use Neos\Neos\Service\DataSource\DataSourceInterface;
+use Neos\Utility\ObjectAccess;
 
 /**
  * Data Source Controller
@@ -81,12 +79,9 @@ private function deserializeNodeFromLegacyAddress(?string $stringFormattedNodeAd
             return null;
         }
 
-        $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest())
-            ->contentRepositoryId;
-        $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId);
-        // todo legacy uri node address notation used. Should be refactored to use json encoded NodeAddress
-        $nodeAddress = NodeAddressFactory::create($contentRepository)->createCoreNodeAddressFromLegacyUriString($stringFormattedNodeAddress);
+        $nodeAddress = NodeAddress::fromJsonString($stringFormattedNodeAddress);
 
+        $contentRepository = $this->contentRepositoryRegistry->get($nodeAddress->contentRepositoryId);
         return $contentRepository->getContentGraph($nodeAddress->workspaceName)->getSubgraph(
             $nodeAddress->dimensionSpacePoint,
             VisibilityConstraints::withoutRestrictions()

Neos.Neos/Classes/TypeConverter/NodeAddressToStringConverter.php

@@ -14,10 +14,10 @@
 
 namespace Neos\Neos\TypeConverter;
 
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Property\PropertyMappingConfigurationInterface;
 use Neos\Flow\Property\TypeConverter\AbstractTypeConverter;
-use Neos\Neos\FrontendRouting\NodeAddress;
 
 /**
  * An Object Converter for Node Addresses which can be used for routing (but also for other
@@ -53,6 +53,6 @@ public function convertFrom(
         array $convertedChildProperties = [],
         PropertyMappingConfigurationInterface $configuration = null
     ): string {
-        return $source->serializeForUri();
+        return $source->toJson();
     }
 }