Updated with parallel PR changes.

Author: isoos

app/lib/search/handlers.dart

@@ -66,7 +66,9 @@ Future<shelf.Response> _searchHandler(shelf.Request request) async {
             json.decode(await request.readAsString()) as Map<String, dynamic>,
           ),
         )
-      : ServiceSearchQuery.fromServiceUrl(request.requestedUri);
+      : ServiceSearchQuery(
+          SearchRequestData.fromServiceUrl(request.requestedUri),
+        );
   final result = await searchIndex.search(query);
   final Duration elapsed = sw.elapsed;
   if (elapsed > _slowSearchThreshold) {

app/lib/search/search_service.dart

@@ -186,10 +186,6 @@ class ServiceSearchQuery {
     ));
   }
 
-  factory ServiceSearchQuery.fromServiceUrl(Uri uri) {
-    return ServiceSearchQuery(SearchRequestData.fromServiceUrl(uri));
-  }
-
   ServiceSearchQuery change({
     TextMatchExtent? textMatchExtent,
   }) {

app/lib/service/entrypoint/search_index.dart

@@ -60,9 +60,8 @@ Future<void> main(List<String> args, var message) async {
             final info = await searchIndex.indexInfo();
             return ReplyMessage.result(info.toJson());
           } else if (payload is String) {
-            final q = ServiceSearchQuery.fromSearchRequestData(
-                SearchRequestData.fromJson(
-                    json.decode(payload) as Map<String, dynamic>));
+            final q = ServiceSearchQuery(SearchRequestData.fromJson(
+                json.decode(payload) as Map<String, dynamic>));
             final rs = await searchIndex.search(q);
             return ReplyMessage.result(json.encode(rs.toJson()));
           } else {