rename UuidGenerator => Uuid

prooph · Nov 19, 2018 · c2dccf9 · c2dccf9
1 parent f9fbb80
commit c2dccf9
Show file tree

Hide file tree

Showing 64 changed files with 160 additions and 160 deletions.
diff --git a/src/EventId.php b/src/EventId.php
@@ -13,7 +13,7 @@
 
 namespace Prooph\EventStoreClient;
 
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 use Ramsey\Uuid\UuidInterface;
 
 class EventId
@@ -23,17 +23,17 @@ class EventId
 
     public static function generate(): EventId
     {
-        return new self(UuidGenerator::generate());
+        return new self(Uuid::generate());
     }
 
     public static function fromString(string $eventId): EventId
     {
-        return new self(UuidGenerator::fromString($eventId));
+        return new self(Uuid::fromString($eventId));
     }
 
     public static function fromBinary(string $bytes): EventId
     {
-        return new self(UuidGenerator::fromBytes($bytes));
+        return new self(Uuid::fromBytes($bytes));
     }
 
     private function __construct(UuidInterface $eventId)

diff --git a/src/Internal/EventStoreAsyncNodeConnection.php b/src/Internal/EventStoreAsyncNodeConnection.php
@@ -65,7 +65,7 @@
 use Prooph\EventStoreClient\SystemSettings;
 use Prooph\EventStoreClient\UserCredentials;
 use Prooph\EventStoreClient\Util\Json;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 use Throwable;
 
 final class EventStoreAsyncNodeConnection implements
@@ -91,7 +91,7 @@ public function __construct(
     ) {
         $this->settings = $settings;
         $this->clusterSettings = $clusterSettings;
-        $this->connectionName = $connectionName ?? UuidGenerator::generateWithoutDash();
+        $this->connectionName = $connectionName ?? Uuid::generateWithoutDash();
         $this->endPointDiscoverer = $endPointDiscoverer;
         $this->handler = new EventStoreConnectionLogicHandler($this, $settings);
     }

diff --git a/src/Internal/EventStoreConnectionLogicHandler.php b/src/Internal/EventStoreConnectionLogicHandler.php
@@ -49,7 +49,7 @@
 use Prooph\EventStoreClient\SystemData\TcpFlags;
 use Prooph\EventStoreClient\SystemData\TcpPackage;
 use Prooph\EventStoreClient\Transport\Tcp\TcpPackageConnection;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 use Throwable;
 
 /** @internal */
@@ -316,7 +316,7 @@ private function establishTcpConnection(NodeEndPoints $endPoints): void
         $this->connection = new TcpPackageConnection(
             $this->settings->log(),
             $endPoint,
-            UuidGenerator::generateWithoutDash(),
+            Uuid::generateWithoutDash(),
             $this->settings->useSslConnection(),
             $this->settings->targetHost(),
             $this->settings->validateServer(),
@@ -386,7 +386,7 @@ private function tcpConnectionClosed(TcpPackageConnection $connection): void
         ) {
             $this->logDebug('IGNORED (state: %s, internal conn.ID: {1:B}, conn.ID: %s): TCP connection to [%s] closed',
                 $this->state,
-                null === $this->connection ? UuidGenerator::empty() : $this->connection->connectionId(),
+                null === $this->connection ? Uuid::empty() : $this->connection->connectionId(),
                 $connection->connectionId(),
                 $connection->remoteEndPoint()
             );
@@ -421,7 +421,7 @@ private function tcpConnectionEstablished(TcpPackageConnection $connection): voi
         ) {
             $this->logDebug('IGNORED (state %s, internal conn.Id %s, conn.Id %s, conn.closed %s): TCP connection to [%s] established',
                 $this->state,
-                null === $this->connection ? UuidGenerator::empty() : $this->connection->connectionId(),
+                null === $this->connection ? Uuid::empty() : $this->connection->connectionId(),
                 $connection->connectionId(),
                 $connection->isClosed() ? 'yes' : 'no',
                 $connection->remoteEndPoint()
@@ -438,7 +438,7 @@ private function tcpConnectionEstablished(TcpPackageConnection $connection): voi
         if ($this->settings->defaultUserCredentials() !== null) {
             $this->connectingPhase = ConnectingPhase::authentication();
 
-            $this->authInfo = new AuthInfo(UuidGenerator::generateWithoutDash(), $elapsed);
+            $this->authInfo = new AuthInfo(Uuid::generateWithoutDash(), $elapsed);
 
             $login = null;
             $pass = null;
@@ -464,7 +464,7 @@ private function tcpConnectionEstablished(TcpPackageConnection $connection): voi
     private function goToIdentifyState(): void
     {
         $this->connectingPhase = ConnectingPhase::identification();
-        $this->identityInfo = new IdentifyInfo(UuidGenerator::generateWithoutDash(), $this->stopWatch->elapsed());
+        $this->identityInfo = new IdentifyInfo(Uuid::generateWithoutDash(), $this->stopWatch->elapsed());
 
         $message = new IdentifyClient();
         $message->setVersion(self::CLIENT_VERSION);
@@ -582,7 +582,7 @@ private function manageHeartbeats(): void
             $this->connection->enqueueSend(new TcpPackage(
                 TcpCommand::heartbeatRequestCommand(),
                 TcpFlags::none(),
-                UuidGenerator::generateWithoutDash()
+                Uuid::generateWithoutDash()
             ));
 
             $this->heartbeatInfo = new HeartbeatInfo($this->heartbeatInfo->lastPackageNumber(), false, $elapsed);

diff --git a/src/Internal/OperationItem.php b/src/Internal/OperationItem.php
@@ -16,7 +16,7 @@
 use DateTimeImmutable;
 use Prooph\EventStoreClient\ClientOperations\ClientOperation;
 use Prooph\EventStoreClient\Util\DateTime;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 
 /** @internal */
 class OperationItem
@@ -49,7 +49,7 @@ public function __construct(ClientOperation $operation, int $maxRetries, int $ti
         $this->maxRetries = $maxRetries;
         $this->timeout = $timeout;
         $this->created = DateTime::utcNow();
-        $this->correlationId = UuidGenerator::generateWithoutDash();
+        $this->correlationId = Uuid::generateWithoutDash();
         $this->retryCount = 0;
         $this->lastUpdated = $this->created;
     }

diff --git a/src/Internal/OperationsManager.php b/src/Internal/OperationsManager.php
@@ -20,7 +20,7 @@
 use Prooph\EventStoreClient\Exception\RetriesLimitReachedException;
 use Prooph\EventStoreClient\Transport\Tcp\TcpPackageConnection;
 use Prooph\EventStoreClient\Util\DateTime;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 use SplQueue;
 
 /** @internal */
@@ -141,7 +141,7 @@ public function checkTimeoutsAndRetry(TcpPackageConnection $connection): void
 
             foreach ($this->retryPendingOperations as $operation) {
                 $oldCorrId = $operation->correlationId();
-                $operation->setCorrelationId(UuidGenerator::generateWithoutDash());
+                $operation->setCorrelationId(Uuid::generateWithoutDash());
                 $operation->incRetryCount();
                 $this->logDebug('retrying, old corrId %s, operation %s', $oldCorrId, $operation);
                 $this->scheduleOperation($operation, $connection);

diff --git a/src/Internal/SubscriptionItem.php b/src/Internal/SubscriptionItem.php
@@ -16,7 +16,7 @@
 use DateTimeImmutable;
 use Prooph\EventStoreClient\ClientOperations\SubscriptionOperation;
 use Prooph\EventStoreClient\Util\DateTime;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 
 /** @internal  */
 class SubscriptionItem
@@ -47,7 +47,7 @@ public function __construct(SubscriptionOperation $operation, int $maxRetries, i
         $this->maxRetries = $maxRetries;
         $this->timeout = $timeout;
         $this->created = DateTime::utcNow();
-        $this->correlationId = UuidGenerator::generateWithoutDash();
+        $this->correlationId = Uuid::generateWithoutDash();
         $this->retryCount = 0;
         $this->lastUpdated = $this->created;
         $this->isSubscribed = false;

diff --git a/src/Internal/SubscriptionsManager.php b/src/Internal/SubscriptionsManager.php
@@ -20,7 +20,7 @@
 use Prooph\EventStoreClient\SubscriptionDropReason;
 use Prooph\EventStoreClient\Transport\Tcp\TcpPackageConnection;
 use Prooph\EventStoreClient\Util\DateTime;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 use SplQueue;
 
 /** @internal  */
@@ -201,7 +201,7 @@ public function startSubscription(SubscriptionItem $subscription, TcpPackageConn
             return;
         }
 
-        $correlationId = UuidGenerator::generateWithoutDash();
+        $correlationId = Uuid::generateWithoutDash();
         $subscription->setCorrelationId($correlationId);
         $subscription->setConnectionId($connection->connectionId());
         $subscription->setLastUpdated(DateTime::utcNow());

diff --git a/src/Util/UuidGenerator.php → src/Util/Uuid.php b/src/Util/UuidGenerator.php → src/Util/Uuid.php
@@ -17,7 +17,7 @@
 use Ramsey\Uuid\UuidFactory;
 use Ramsey\Uuid\UuidInterface;
 
-class UuidGenerator
+class Uuid
 {
     /** @var UuidFactory */
     private static $factory;

diff --git a/tests/ProjectionSpecification.php b/tests/ProjectionSpecification.php
@@ -21,7 +21,7 @@
 use Prooph\EventStoreClient\ExpectedVersion;
 use Prooph\EventStoreClient\Projections\ProjectionsManager;
 use Prooph\EventStoreClient\UserCredentials;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 use ProophTest\EventStoreClient\Helper\TestConnection;
 use Throwable;
 use function Amp\call;
@@ -87,14 +87,14 @@ protected function postEvent(string $stream, string $eventType, string $data): P
 
     protected function createOneTimeProjection(string $type): Promise
     {
-        $query = $this->createStandardQuery(UuidGenerator::generateWithoutDash());
+        $query = $this->createStandardQuery(Uuid::generateWithoutDash());
 
         return $this->projectionsManager->createOneTimeAsync($query, $type, $this->credentials);
     }
 
     protected function createContinuousProjection(string $projectionName, string $type): Promise
     {
-        $query = $this->createStandardQuery(UuidGenerator::generateWithoutDash());
+        $query = $this->createStandardQuery(Uuid::generateWithoutDash());
 
         return $this->projectionsManager->createContinuousAsync(
             $projectionName,

diff --git a/tests/SpecificationWithLinkToToDeletedEvents.php b/tests/SpecificationWithLinkToToDeletedEvents.php
@@ -17,7 +17,7 @@
 use Prooph\EventStoreClient\Common\SystemEventTypes;
 use Prooph\EventStoreClient\EventData;
 use Prooph\EventStoreClient\ExpectedVersion;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 
 trait SpecificationWithLinkToToDeletedEvents
 {
@@ -31,8 +31,8 @@ trait SpecificationWithLinkToToDeletedEvents
     protected function given(): Generator
     {
         $creds = DefaultData::adminCredentials();
-        $this->linkedStreamName = UuidGenerator::generateWithoutDash();
-        $this->deletedStreamName = UuidGenerator::generateWithoutDash();
+        $this->linkedStreamName = Uuid::generateWithoutDash();
+        $this->deletedStreamName = Uuid::generateWithoutDash();
 
         yield $this->conn->appendToStreamAsync(
             $this->deletedStreamName,

diff --git a/tests/SpecificationWithLinkToToMaxCountDeletedEvents.php b/tests/SpecificationWithLinkToToMaxCountDeletedEvents.php
@@ -19,7 +19,7 @@
 use Prooph\EventStoreClient\EventId;
 use Prooph\EventStoreClient\ExpectedVersion;
 use Prooph\EventStoreClient\StreamMetadata;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 
 trait SpecificationWithLinkToToMaxCountDeletedEvents
 {
@@ -34,8 +34,8 @@ protected function given(): Generator
     {
         $creds = DefaultData::adminCredentials();
 
-        $this->deletedStreamName = UuidGenerator::generateWithoutDash();
-        $this->linkedStreamName = UuidGenerator::generateWithoutDash();
+        $this->deletedStreamName = Uuid::generateWithoutDash();
+        $this->linkedStreamName = Uuid::generateWithoutDash();
 
         yield $this->conn->appendToStreamAsync(
             $this->deletedStreamName,

diff --git a/tests/SystemData/clientapi_tcp_package.php b/tests/SystemData/clientapi_tcp_package.php
@@ -18,7 +18,7 @@
 use Prooph\EventStoreClient\SystemData\TcpCommand;
 use Prooph\EventStoreClient\SystemData\TcpFlags;
 use Prooph\EventStoreClient\SystemData\TcpPackage;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 
 class clientapi_tcp_package extends TestCase
 {
@@ -27,37 +27,37 @@ public function should_throw_argument_null_exception_when_created_as_authorized_
     {
         $this->expectException(InvalidArgumentException::class);
 
-        new TcpPackage(TcpCommand::badRequest(), TcpFlags::authenticated(), UuidGenerator::generateWithoutDash(), '');
+        new TcpPackage(TcpCommand::badRequest(), TcpFlags::authenticated(), Uuid::generateWithoutDash(), '');
     }
 
     /** @test */
     public function should_throw_argument_null_exception_when_created_as_authorized_but_password_not_provided(): void
     {
         $this->expectException(InvalidArgumentException::class);
 
-        new TcpPackage(TcpCommand::badRequest(), TcpFlags::authenticated(), UuidGenerator::generateWithoutDash(), '', 'login');
+        new TcpPackage(TcpCommand::badRequest(), TcpFlags::authenticated(), Uuid::generateWithoutDash(), '', 'login');
     }
 
     /** @test */
     public function should_throw_argument_exception_when_created_as_not_authorized_but_login_is_provided(): void
     {
         $this->expectException(InvalidArgumentException::class);
 
-        new TcpPackage(TcpCommand::badRequest(), TcpFlags::none(), UuidGenerator::generateWithoutDash(), '', 'login', null);
+        new TcpPackage(TcpCommand::badRequest(), TcpFlags::none(), Uuid::generateWithoutDash(), '', 'login', null);
     }
 
     /** @test */
     public function should_throw_argument_exception_when_created_as_not_authorized_but_password_is_provided(): void
     {
         $this->expectException(InvalidArgumentException::class);
 
-        new TcpPackage(TcpCommand::badRequest(), TcpFlags::none(), UuidGenerator::generateWithoutDash(), '', null, 'pa$$');
+        new TcpPackage(TcpCommand::badRequest(), TcpFlags::none(), Uuid::generateWithoutDash(), '', null, 'pa$$');
     }
 
     /** @test */
     public function not_authorized_with_data_should_serialize_and_deserialize_correctly(): void
     {
-        $corrId = UuidGenerator::generateWithoutDash();
+        $corrId = Uuid::generateWithoutDash();
         $refPkg = new TcpPackage(TcpCommand::badRequest(), TcpFlags::none(), $corrId, 'data');
         $bytes = $refPkg->asBytes();
         $pkg = TcpPackage::fromRawData($bytes);
@@ -73,7 +73,7 @@ public function not_authorized_with_data_should_serialize_and_deserialize_correc
     /** @test */
     public function not_authorized_with_empty_data_should_serialize_and_deserialize_correctly(): void
     {
-        $corrId = UuidGenerator::generateWithoutDash();
+        $corrId = Uuid::generateWithoutDash();
         $refPkg = new TcpPackage(TcpCommand::badRequest(), TcpFlags::none(), $corrId);
         $bytes = $refPkg->asBytes();
         $pkg = TcpPackage::fromRawData($bytes);
@@ -89,7 +89,7 @@ public function not_authorized_with_empty_data_should_serialize_and_deserialize_
     /** @test */
     public function authorized_with_data_should_serialize_and_deserialize_correctly(): void
     {
-        $corrId = UuidGenerator::generateWithoutDash();
+        $corrId = Uuid::generateWithoutDash();
         $refPkg = new TcpPackage(TcpCommand::badRequest(), TcpFlags::authenticated(), $corrId, 'data', 'login', 'password');
         $bytes = $refPkg->asBytes();
         $pkg = TcpPackage::fromRawData($bytes);
@@ -105,7 +105,7 @@ public function authorized_with_data_should_serialize_and_deserialize_correctly(
     /** @test */
     public function authorized_with_empty_data_should_serialize_and_deserialize_correctly(): void
     {
-        $corrId = UuidGenerator::generateWithoutDash();
+        $corrId = Uuid::generateWithoutDash();
         $refPkg = new TcpPackage(TcpCommand::badRequest(), TcpFlags::authenticated(), $corrId, '', 'login', 'password');
         $bytes = $refPkg->asBytes();
         $pkg = TcpPackage::fromRawData($bytes);
@@ -121,7 +121,7 @@ public function authorized_with_empty_data_should_serialize_and_deserialize_corr
     /** @test */
     public function should_throw_argument_exception_on_serialization_when_login_too_long(): void
     {
-        $corrId = UuidGenerator::generateWithoutDash();
+        $corrId = Uuid::generateWithoutDash();
         $pkg = new TcpPackage(TcpCommand::badRequest(), TcpFlags::authenticated(), $corrId, '', \str_repeat('*', 256), 'password');
 
         $this->expectException(InvalidArgumentException::class);
@@ -132,7 +132,7 @@ public function should_throw_argument_exception_on_serialization_when_login_too_
     /** @test */
     public function should_throw_argument_exception_on_serialization_when_password_too_long(): void
     {
-        $corrId = UuidGenerator::generateWithoutDash();
+        $corrId = Uuid::generateWithoutDash();
         $pkg = new TcpPackage(TcpCommand::badRequest(), TcpFlags::authenticated(), $corrId, '', 'login', \str_repeat('*', 256));
 
         $this->expectException(InvalidArgumentException::class);

diff --git a/tests/UserManagement/TestWithUser.php b/tests/UserManagement/TestWithUser.php
@@ -13,7 +13,7 @@
 
 namespace ProophTest\EventStoreClient\UserManagement;
 
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 use ProophTest\EventStoreClient\DefaultData;
 
 abstract class TestWithUser extends TestWithNode
@@ -25,7 +25,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->username = UuidGenerator::generateString();
+        $this->username = Uuid::generateString();
 
         $this->manager->createUser(
             $this->username,

diff --git a/tests/UserManagement/creating_a_user.php b/tests/UserManagement/creating_a_user.php
@@ -15,7 +15,7 @@
 
 use Exception;
 use Prooph\EventStoreClient\Exception\InvalidArgumentException;
-use Prooph\EventStoreClient\Util\UuidGenerator;
+use Prooph\EventStoreClient\Util\Uuid;
 use ProophTest\EventStoreClient\DefaultData;
 
 class creating_a_user extends TestWithNode
@@ -70,7 +70,7 @@ public function fetching_user_with_empty_name_throws(): void
     /** @test */
     public function creating_a_user_with_parameters_can_be_read(): void
     {
-        $login = UuidGenerator::generateString();
+        $login = Uuid::generateString();
 
         $this->manager->createUser(
             $login,