Merge a99a825 into 9a3f5c5

cultuurnet · Jan 23, 2017 · f6c0e28 · f6c0e28
2 parents 9a3f5c5 + a99a825
commit f6c0e28
Show file tree

Hide file tree

Showing 14 changed files with 687 additions and 162 deletions.
diff --git a/bootstrap.php b/bootstrap.php
@@ -4,8 +4,6 @@
 use Broadway\EventDispatcher\EventDispatcher;
 use Broadway\EventHandling\EventBusInterface;
 use Broadway\EventStore\DBALEventStore;
-use Broadway\Saga\MultipleSagaManager;
-use Broadway\Saga\State\MongoDBRepository;
 use Broadway\Serializer\SimpleInterfaceSerializer;
 use CommerceGuys\Intl\Currency\CurrencyRepository;
 use CommerceGuys\Intl\NumberFormat\NumberFormatRepository;
@@ -19,7 +17,10 @@
 use CultuurNet\UDB3\EventSourcing\ExecutionContextMetadataEnricher;
 use CultuurNet\UDB3\LabelCollection;
 use CultuurNet\UDB3\SimpleEventBus;
-use CultuurNet\UDB3\UiTPASService\Broadway\Saga\StaticallyConfiguredSagaNamespacedEventsMetadataFactory;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\Metadata\StaticallyConfiguredSagaMetadataFactory;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\MultipleSagaManager;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\State\MongoDBRepository;
+use CultuurNet\UDB3\UiTPASService\Broadway\Saga\State\StateManager;
 use CultuurNet\UDB3\UiTPASService\OrganizerLabelReadRepository\JSONLDOrganizerLabelReadRepository;
 use CultuurNet\UDB3\UiTPASService\Permissions\DefaultEventPermission;
 use CultuurNet\UDB3\UiTPASService\Permissions\UDB3EventPermission;
@@ -469,11 +470,11 @@ function (Application $app) {
             [
                 'uitpas_sync' => $app['uitpas_event_saga'],
             ],
-            new \Broadway\Saga\State\StateManager(
+            new StateManager(
                 $app['saga_repository'],
                 new Broadway\UuidGenerator\Rfc4122\Version4Generator()
             ),
-            new StaticallyConfiguredSagaNamespacedEventsMetadataFactory(),
+            new StaticallyConfiguredSagaMetadataFactory(),
             new EventDispatcher()
         );
     }

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "authors": [],
     "require": {
         "silex/silex": "~1.3",
-        "cultuurnet/udb3": "~0.1",
+        "cultuurnet/udb3": "dev-feature/III-1807 as 0.1",
         "deralex/yaml-config-service-provider": "~1.0",
         "knplabs/console-service-provider": "~1.0",
         "jdesrosiers/silex-cors-provider": "~0.1.4",