Skip to content

RSRVR-28 remove deprecated matchkey interface #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdickmeiss merged 1 commit into from
Feb 3, 2026
Merged

RSRVR-28 remove deprecated matchkey interface #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions server/src/main/java/com/indexdata/reservoir/matchkey/MatchKeyMethod.java
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions server/src/main/java/com/indexdata/reservoir/matchkey/MatchKeyMethodEntry.java
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions server/src/main/java/com/indexdata/reservoir/matchkey/MatchKeyMethodFactory.java
View file
Open in desktop

This file was deleted.

103 changes: 0 additions & 103 deletions server/src/main/java/com/indexdata/reservoir/matchkey/impl/MatchKeyJavaScript.java
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions server/src/main/java/com/indexdata/reservoir/matchkey/impl/MatchKeyJsonPath.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions server/src/main/java/com/indexdata/reservoir/server/IngestMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.indexdata.reservoir.server;

import com.indexdata.reservoir.matchkey.MatchKeyMethod;
import com.indexdata.reservoir.module.ModuleExecutable;

public class IngestMatcher {
String matchKeyId;
ModuleExecutable moduleExecutable;
MatchKeyMethod matchKeyMethod;
}
8 changes: 2 additions & 6 deletions server/src/main/java/com/indexdata/reservoir/server/ReservoirService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.indexdata.reservoir.server;

import com.indexdata.reservoir.matchkey.MatchKeyMethodFactory;
import com.indexdata.reservoir.module.ModuleCache;
import com.indexdata.reservoir.module.ModuleInvocation;
import com.indexdata.reservoir.server.entity.CodeModuleEntity;
Expand Down Expand Up @@ -250,9 +249,6 @@ Future<Void> getCluster(RoutingContext ctx) {

static String getMethod(JsonObject config) {
String method = config.getString("method");
if (method != null && MatchKeyMethodFactory.get(method) == null) {
throw new IllegalArgumentException("Non-existing method '" + method + "'");
}
return method;
}

Expand Down Expand Up @@ -395,7 +391,7 @@ Future<Void> postCodeModule(RoutingContext ctx) {
.compose(res ->
HttpResponse.responseJson(ctx, 201)
.putHeader("Location", ctx.request().absoluteURI() + "/" + cm.getId())
.end(cm.asJson().encode())
.end(cm.asJson(true).encode())
)
);
}
Expand All @@ -410,7 +406,7 @@ Future<Void> getCodeModule(RoutingContext ctx) {
String.format(ENTITY_ID_NOT_FOUND_PATTERN, MODULE_LABEL, id));
return;
}
HttpResponse.responseJson(ctx, 200).end(e.asJson().encode());
HttpResponse.responseJson(ctx, 200).end(e.asJson(true).encode());
})
.mapEmpty();
}
Expand Down
20 changes: 1 addition & 19 deletions server/src/main/java/com/indexdata/reservoir/server/Storage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.indexdata.reservoir.server;

import com.indexdata.reservoir.matchkey.MatchKeyMethod;
import com.indexdata.reservoir.module.ModuleCache;
import com.indexdata.reservoir.module.ModuleExecutable;
import com.indexdata.reservoir.module.ModuleInvocation;
Expand Down Expand Up @@ -362,14 +361,6 @@ Future<MatcherResult> runMatcher(IngestMatcher ingestMatcher, IngestMetrics inge
return result;
});
}
if (ingestMatcher.matchKeyMethod != null) {
HashSet<String> values = new HashSet<>();
ingestMatcher.matchKeyMethod.getKeys(payload, values);
values.forEach(k -> result.keys.add(k.length() > MATCHVALUE_MAX_LENGTH
? k.substring(0, MATCHVALUE_MAX_LENGTH) : k));

ingestMetrics.recordMatcher(System.nanoTime() - startTime, TimeUnit.NANOSECONDS);
}
return Future.succeededFuture(result);
}

Expand Down Expand Up @@ -403,16 +394,7 @@ Future<IngestMatcher> createIngestMatcher(JsonObject matchKeyConfig, Vertx vertx
});
});
}
String methodName = matchKeyConfig.getString("method");
if (methodName != null) {
JsonObject params = matchKeyConfig.getJsonObject("params");
return MatchKeyMethod.get(vertx, tenant, ingestMatcher.matchKeyId, methodName, params)
.compose(matchKeyMethod -> {
ingestMatcher.matchKeyMethod = matchKeyMethod;
return Future.succeededFuture(ingestMatcher);
});
}
return Future.failedFuture("match key config must include 'method' or 'matcher'");
return Future.failedFuture("match key config must include 'matcher'");
}

Future<List<IngestMatcher>> createIngestMatchers(JsonArray matchKeyConfigs, Vertx vertx) {
Expand Down
10 changes: 0 additions & 10 deletions server/src/main/resources/openapi/schemas/matchKey.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@
"type": "string",
"description": "matcher module invocation: 'moduleId<::function>' where <::function> is optional"
},
"method": {
"type": "string",
"description": "DEPRECATED: use 'matcher' instead",
"deprecated": true
},
"params": {
"type": "object",
"description": "DEPRECATED: use 'matcher' instead",
"deprecated": true
},
"update": {
"type": "string",
"enum": ["ingest", "manual"],
Expand Down
Loading