Integrating Endpoint Handling

Author: mgerzabek

src/Endpoint.php

@@ -21,7 +21,7 @@ class Endpoint
 
     public function __construct(string $serviceUri)
     {
-        $this->serviceUri = rtrim($serviceUri, '/');
+        $this->serviceUri = trim($serviceUri, '/');
 
         $prefix = rtrim(config('lodata.prefix'), '/');
         $this->route = ('' === $serviceUri)

src/ServiceProvider.php

@@ -14,7 +14,6 @@
 use Flat3\Lodata\Helper\Flysystem;
 use Flat3\Lodata\Helper\DBAL;
 use Flat3\Lodata\Helper\Symfony;
-use Illuminate\Database\ConnectionInterface;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Route;
 use Symfony\Component\HttpKernel\Kernel;
@@ -51,13 +50,12 @@ public function boot()
             $segments = explode('/', request()->path());
 
             // we only kick off operation when path prefix is configured in lodata.php
-            // as all requests share the same root configuration
+            // and bypass all other routes for performance
             if ($segments[0] === config('lodata.prefix')) {
 
                 // next look up the configured service endpoints
                 $serviceUris = config('lodata.endpoints', []);
 
-                $service = null;
                 if (0 === sizeof($serviceUris)) {
                     // when no locators are defined, fallback to global mode; this will
                     // ensure compatibility with prior versions of this package
@@ -68,10 +66,9 @@ public function boot()
                     $service = new $clazz($segments[1]);
                 }
                 else {
-                    // when no service definition is configured for the path segment,
-                    // we abort with an error condition; typically a dev working on
-                    // setting up his project
-                    abort('No odata service endpoint defined for path ' . $segments[1]);
+                    // when no service definition could be found for the path segment,
+                    // we assume global scope
+                    $service = new Endpoint('');
                 }
 
                 $this->bootServices($service);
@@ -87,6 +84,10 @@ private function bootServices($service): void
         // app()->make(ODataService::class)->endpoint()
         $this->app->instance(Endpoint::class, $service);
 
+        $this->app->bind(DBAL::class, function (Application $app, array $args) {
+            return version_compare(InstalledVersions::getVersion('doctrine/dbal'), '4.0.0', '>=') ? new DBAL\DBAL4($args['connection']) : new DBAL\DBAL3($args['connection']);
+        });
+
         $this->loadJsonTranslationsFrom(__DIR__.'/../lang');
 
         // next instantiate and discover the global Model
@@ -109,10 +110,6 @@ private function bootServices($service): void
             return class_exists('League\Flysystem\Adapter\Local') ? new Flysystem\Flysystem1() : new Flysystem\Flysystem3();
         });
 
-        $this->app->bind(DBAL::class, function (Application $app, array $args) {
-            return version_compare(InstalledVersions::getVersion('doctrine/dbal'), '4.0.0', '>=') ? new DBAL\DBAL4($args['connection']) : new DBAL\DBAL3($args['connection']);
-        });
-
         $route = $service->route();
         $middleware = config('lodata.middleware', []);