fixup! feat(snowflake): extend Entity class to support snowflakes

Author: miaulalala

apps/files_sharing/lib/AppInfo/Application.php

@@ -142,15 +142,15 @@ public function registerEventsScripts(IEventDispatcher $dispatcher): void {
 		// notifications api to accept incoming user shares
 		$dispatcher->addListener(ShareCreatedEvent::class, function (ShareCreatedEvent $event): void {
 			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
+			$listener = $this->getContainer()->get(Listener::class);
 			$listener->shareNotification($event);
 		});
 		$dispatcher->addListener(IGroup::class . '::postAddUser', function ($event): void {
 			if (!$event instanceof OldGenericEvent) {
 				return;
 			}
 			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
+			$listener = $this->getContainer()->get(Listener::class);
 			$listener->userAddedToGroup($event);
 		});
 	}

core/AppInfo/Application.php

@@ -22,27 +22,19 @@
 use OC\Core\Listener\BeforeTemplateRenderedListener;
 use OC\Core\Listener\PasswordUpdatedListener;
 use OC\Core\Notification\CoreNotifier;
-use OC\Snowflake\ISequence;
-use OC\Snowflake\SnowflakeDecoder;
-use OC\Snowflake\SnowflakeGenerator;
 use OC\TagManager;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeLoginTemplateRenderedEvent;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
-use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\DB\Events\AddMissingIndicesEvent;
 use OCP\DB\Events\AddMissingPrimaryKeyEvent;
-use OCP\IConfig;
-use OCP\Snowflake\ISnowflakeDecoder;
-use OCP\Snowflake\ISnowflakeGenerator;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\PasswordUpdatedEvent;
 use OCP\User\Events\UserDeletedEvent;
 use OCP\Util;
-use Psr\Container\ContainerInterface;
 
 /**
  * Class Application

lib/private/Server.php

@@ -1266,16 +1266,8 @@ public function __construct($webRoot, \OC\Config $config) {
 		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
 
 		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
-//
-//		$this->registerAlias(ISnowflakeGenerator::class, SnowflakeGenerator::class);
-		$this->registerService(ISnowflakeGenerator::class, function (ContainerInterface $c) {
-			return new SnowflakeGenerator(
-				$c->get(ITimeFactory::class),
-				$c->get(IConfig::class),
-				$c->get(ISequence::class),
-			);
-		});
 
+		$this->registerAlias(ISnowflakeGenerator::class, SnowflakeGenerator::class);
 		$this->registerService(ISequence::class, function (ContainerInterface $c): ISequence {
 			if (PHP_SAPI !== 'cli') {
 				$sequence = $c->get(APCuSequence::class);
@@ -1286,12 +1278,7 @@ public function __construct($webRoot, \OC\Config $config) {
 
 			return $c->get(FileSequence::class);
 		}, false);
-
-
-		$this->registerService(ISnowflakeDecoder::class, function (ContainerInterface $c) {
-			return new SnowflakeDecoder();
-		});
-//		$this->registerAlias(ISnowflakeDecoder::class, SnowflakeDecoder::class);
+		$this->registerAlias(ISnowflakeDecoder::class, SnowflakeDecoder::class);
 
 		$this->connectDispatcher();
 	}

lib/private/Snowflake/SnowflakeGenerator.php

@@ -24,8 +24,8 @@
 final readonly class SnowflakeGenerator implements ISnowflakeGenerator {
 	public function __construct(
 		private ITimeFactory $timeFactory,
-		private IConfig      $config,
-		private ISequence    $sequenceGenerator,
+		private IConfig $config,
+		private ISequence $sequenceGenerator,
 	) {
 	}
 

lib/public/AppFramework/Db/SnowflakeAwareEntity.php

@@ -29,10 +29,6 @@ abstract class SnowflakeAwareEntity extends Entity {
 	/** @var array<string, \OCP\DB\Types::*> */
 	private array $_fieldTypes = ['id' => Types::STRING];
 
-	private ISnowflakeGenerator $snowflakeGenerator;
-	private ISnowflakeDecoder $snowflakeDecoder;
-
-
 	/**
 	 * Automatically creates a snowflake ID
 	 *
@@ -41,7 +37,7 @@ abstract class SnowflakeAwareEntity extends Entity {
 	#[\Override]
 	public function setId(): void {
 		if (empty($this->id)) {
-			$this->id = $this->snowflakeGenerator->nextId();
+			$this->id = Server::get(ISnowflakeGenerator::class)->nextId();
 			$this->markFieldUpdated('id');
 		}
 	}
@@ -65,7 +61,7 @@ public function getSnowflake(): ?Snowflake {
 		}
 
 		if ($this->snowflake === null) {
-			$this->snowflake = $this->snowflakeDecoder->decode($this->id);
+			$this->snowflake = Server::get(ISnowflakeDecoder::class)->decode($this->id);
 		}
 
 		return $this->snowflake;