Skip to content

Commit 6ae2596

Browse files
EricWittmannEricWittmann
committed
Added a new /search/versions endpoint
1 parent f23ae7d commit 6ae2596

File tree

77 files changed

+6012
-5307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+6012
-5307
lines changed

‎app/script.sql

+200
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
-- H2 2.2.224;
2+
;
3+
CREATE USER IF NOT EXISTS "SA" SALT '21904752fe90d528' HASH 'a22afcad09bc7b21af73037cb8ca4a00af4f2c787c26050e8840cdcd3182a89e' ADMIN;
4+
CREATE MEMORY TABLE "PUBLIC"."APICURIO"(
5+
"PROPNAME" CHARACTER VARYING(255) NOT NULL,
6+
"PROPVALUE" CHARACTER VARYING(255)
7+
);
8+
ALTER TABLE "PUBLIC"."APICURIO" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_6" PRIMARY KEY("PROPNAME");
9+
-- 1 +/- SELECT COUNT(*) FROM PUBLIC.APICURIO;
10+
INSERT INTO "PUBLIC"."APICURIO" VALUES
11+
('db_version', '100');
12+
CREATE MEMORY TABLE "PUBLIC"."SEQUENCES"(
13+
"SEQNAME" CHARACTER VARYING(32) NOT NULL,
14+
"SEQVALUE" BIGINT NOT NULL
15+
);
16+
ALTER TABLE "PUBLIC"."SEQUENCES" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_63" PRIMARY KEY("SEQNAME");
17+
-- 3 +/- SELECT COUNT(*) FROM PUBLIC.SEQUENCES;
18+
INSERT INTO "PUBLIC"."SEQUENCES" VALUES
19+
('contentId', 224),
20+
('globalId', 423),
21+
('commentId', 3);
22+
CREATE MEMORY TABLE "PUBLIC"."CONFIG"(
23+
"PROPNAME" CHARACTER VARYING(255) NOT NULL,
24+
"PROPVALUE" CHARACTER VARYING(1024) NOT NULL,
25+
"MODIFIEDON" BIGINT NOT NULL
26+
);
27+
ALTER TABLE "PUBLIC"."CONFIG" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_7" PRIMARY KEY("PROPNAME");
28+
-- 1 +/- SELECT COUNT(*) FROM PUBLIC.CONFIG;
29+
INSERT INTO "PUBLIC"."CONFIG" VALUES
30+
('apicurio.storage.read-only.enabled', 'false', 1717417241100);
31+
CREATE INDEX "PUBLIC"."IDX_CONFIG_1" ON "PUBLIC"."CONFIG"("MODIFIEDON" NULLS FIRST);
32+
CREATE MEMORY TABLE "PUBLIC"."ACLS"(
33+
"PRINCIPALID" CHARACTER VARYING(256) NOT NULL,
34+
"ROLE" CHARACTER VARYING(32) NOT NULL,
35+
"PRINCIPALNAME" CHARACTER VARYING(256)
36+
);
37+
ALTER TABLE "PUBLIC"."ACLS" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_1" PRIMARY KEY("PRINCIPALID");
38+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.ACLS;
39+
CREATE MEMORY TABLE "PUBLIC"."DOWNLOADS"(
40+
"DOWNLOADID" CHARACTER VARYING(128) NOT NULL,
41+
"EXPIRES" BIGINT NOT NULL,
42+
"CONTEXT" CHARACTER VARYING(1024)
43+
);
44+
ALTER TABLE "PUBLIC"."DOWNLOADS" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_F" PRIMARY KEY("DOWNLOADID");
45+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.DOWNLOADS;
46+
CREATE HASH INDEX "PUBLIC"."IDX_DOWN_1" ON "PUBLIC"."DOWNLOADS"("EXPIRES" NULLS FIRST);
47+
CREATE MEMORY TABLE "PUBLIC"."GLOBAL_RULES"(
48+
"TYPE" CHARACTER VARYING(32) NOT NULL,
49+
"CONFIGURATION" CHARACTER VARYING NOT NULL
50+
);
51+
ALTER TABLE "PUBLIC"."GLOBAL_RULES" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_A" PRIMARY KEY("TYPE");
52+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.GLOBAL_RULES;
53+
CREATE MEMORY TABLE "PUBLIC"."CONTENT"(
54+
"CONTENTID" BIGINT NOT NULL,
55+
"CANONICALHASH" CHARACTER VARYING(64) NOT NULL,
56+
"CONTENTHASH" CHARACTER VARYING(64) NOT NULL,
57+
"CONTENTTYPE" CHARACTER VARYING(64) NOT NULL,
58+
"CONTENT" BINARY VARYING NOT NULL,
59+
"REFS" CHARACTER VARYING
60+
);
61+
ALTER TABLE "PUBLIC"."CONTENT" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_638" PRIMARY KEY("CONTENTID");
62+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.CONTENT;
63+
CREATE HASH INDEX "PUBLIC"."IDX_CONTENT_1" ON "PUBLIC"."CONTENT"("CANONICALHASH" NULLS FIRST);
64+
CREATE HASH INDEX "PUBLIC"."IDX_CONTENT_2" ON "PUBLIC"."CONTENT"("CONTENTHASH" NULLS FIRST);
65+
CREATE MEMORY TABLE "PUBLIC"."CONTENT_REFERENCES"(
66+
"CONTENTID" BIGINT NOT NULL,
67+
"GROUPID" CHARACTER VARYING(512),
68+
"ARTIFACTID" CHARACTER VARYING(512) NOT NULL,
69+
"VERSION" CHARACTER VARYING(256),
70+
"NAME" CHARACTER VARYING(512) NOT NULL
71+
);
72+
ALTER TABLE "PUBLIC"."CONTENT_REFERENCES" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_5" PRIMARY KEY("CONTENTID", "NAME");
73+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.CONTENT_REFERENCES;
74+
CREATE MEMORY TABLE "PUBLIC"."GROUPS"(
75+
"GROUPID" CHARACTER VARYING(512) NOT NULL,
76+
"DESCRIPTION" CHARACTER VARYING(1024),
77+
"ARTIFACTSTYPE" CHARACTER VARYING(32),
78+
"OWNER" CHARACTER VARYING(256),
79+
"CREATEDON" TIMESTAMP NOT NULL,
80+
"MODIFIEDBY" CHARACTER VARYING(256),
81+
"MODIFIEDON" TIMESTAMP,
82+
"LABELS" CHARACTER VARYING
83+
);
84+
ALTER TABLE "PUBLIC"."GROUPS" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_7D" PRIMARY KEY("GROUPID");
85+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC."GROUPS";
86+
CREATE MEMORY TABLE "PUBLIC"."GROUP_LABELS"(
87+
"GROUPID" CHARACTER VARYING(512) NOT NULL,
88+
"LABELKEY" CHARACTER VARYING(256) NOT NULL,
89+
"LABELVALUE" CHARACTER VARYING(512)
90+
);
91+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.GROUP_LABELS;
92+
CREATE INDEX "PUBLIC"."IDX_GLABELS_1" ON "PUBLIC"."GROUP_LABELS"("LABELKEY" NULLS FIRST);
93+
CREATE INDEX "PUBLIC"."IDX_GLABELS_2" ON "PUBLIC"."GROUP_LABELS"("LABELVALUE" NULLS FIRST);
94+
CREATE MEMORY TABLE "PUBLIC"."GROUP_RULES"(
95+
"GROUPID" CHARACTER VARYING(512) NOT NULL,
96+
"TYPE" CHARACTER VARYING(32) NOT NULL,
97+
"CONFIGURATION" CHARACTER VARYING(1024) NOT NULL
98+
);
99+
ALTER TABLE "PUBLIC"."GROUP_RULES" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_F8" PRIMARY KEY("GROUPID", "TYPE");
100+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.GROUP_RULES;
101+
CREATE MEMORY TABLE "PUBLIC"."ARTIFACTS"(
102+
"GROUPID" CHARACTER VARYING(512) NOT NULL,
103+
"ARTIFACTID" CHARACTER VARYING(512) NOT NULL,
104+
"TYPE" CHARACTER VARYING(32) NOT NULL,
105+
"OWNER" CHARACTER VARYING(256),
106+
"CREATEDON" TIMESTAMP NOT NULL,
107+
"MODIFIEDBY" CHARACTER VARYING(256),
108+
"MODIFIEDON" TIMESTAMP,
109+
"NAME" CHARACTER VARYING(512),
110+
"DESCRIPTION" CHARACTER VARYING(1024),
111+
"LABELS" CHARACTER VARYING
112+
);
113+
ALTER TABLE "PUBLIC"."ARTIFACTS" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_C" PRIMARY KEY("GROUPID", "ARTIFACTID");
114+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.ARTIFACTS;
115+
CREATE HASH INDEX "PUBLIC"."IDX_ARTIFACTS_0" ON "PUBLIC"."ARTIFACTS"("TYPE" NULLS FIRST);
116+
CREATE HASH INDEX "PUBLIC"."IDX_ARTIFACTS_1" ON "PUBLIC"."ARTIFACTS"("OWNER" NULLS FIRST);
117+
CREATE INDEX "PUBLIC"."IDX_ARTIFACTS_2" ON "PUBLIC"."ARTIFACTS"("CREATEDON" NULLS FIRST);
118+
CREATE INDEX "PUBLIC"."IDX_ARTIFACTS_3" ON "PUBLIC"."ARTIFACTS"("NAME" NULLS FIRST);
119+
CREATE INDEX "PUBLIC"."IDX_ARTIFACTS_4" ON "PUBLIC"."ARTIFACTS"("DESCRIPTION" NULLS FIRST);
120+
CREATE MEMORY TABLE "PUBLIC"."ARTIFACT_LABELS"(
121+
"GROUPID" CHARACTER VARYING(512) NOT NULL,
122+
"ARTIFACTID" CHARACTER VARYING(512) NOT NULL,
123+
"LABELKEY" CHARACTER VARYING(256) NOT NULL,
124+
"LABELVALUE" CHARACTER VARYING(512)
125+
);
126+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.ARTIFACT_LABELS;
127+
CREATE INDEX "PUBLIC"."IDX_ALABELS_1" ON "PUBLIC"."ARTIFACT_LABELS"("LABELKEY" NULLS FIRST);
128+
CREATE INDEX "PUBLIC"."IDX_ALABELS_2" ON "PUBLIC"."ARTIFACT_LABELS"("LABELVALUE" NULLS FIRST);
129+
CREATE MEMORY TABLE "PUBLIC"."ARTIFACT_RULES"(
130+
"GROUPID" CHARACTER VARYING(512) NOT NULL,
131+
"ARTIFACTID" CHARACTER VARYING(512) NOT NULL,
132+
"TYPE" CHARACTER VARYING(32) NOT NULL,
133+
"CONFIGURATION" CHARACTER VARYING(1024) NOT NULL
134+
);
135+
ALTER TABLE "PUBLIC"."ARTIFACT_RULES" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_5E" PRIMARY KEY("GROUPID", "ARTIFACTID", "TYPE");
136+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.ARTIFACT_RULES;
137+
CREATE MEMORY TABLE "PUBLIC"."VERSIONS"(
138+
"GLOBALID" BIGINT NOT NULL,
139+
"GROUPID" CHARACTER VARYING(512) NOT NULL,
140+
"ARTIFACTID" CHARACTER VARYING(512) NOT NULL,
141+
"VERSION" CHARACTER VARYING(256),
142+
"VERSIONORDER" INTEGER NOT NULL,
143+
"STATE" CHARACTER VARYING(64) NOT NULL,
144+
"NAME" CHARACTER VARYING(512),
145+
"DESCRIPTION" CHARACTER VARYING(1024),
146+
"OWNER" CHARACTER VARYING(256),
147+
"CREATEDON" TIMESTAMP NOT NULL,
148+
"LABELS" CHARACTER VARYING,
149+
"CONTENTID" BIGINT NOT NULL
150+
);
151+
ALTER TABLE "PUBLIC"."VERSIONS" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_B" PRIMARY KEY("GLOBALID");
152+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.VERSIONS;
153+
CREATE INDEX "PUBLIC"."IDX_VERSIONS_1" ON "PUBLIC"."VERSIONS"("VERSION" NULLS FIRST);
154+
CREATE HASH INDEX "PUBLIC"."IDX_VERSIONS_2" ON "PUBLIC"."VERSIONS"("STATE" NULLS FIRST);
155+
CREATE INDEX "PUBLIC"."IDX_VERSIONS_3" ON "PUBLIC"."VERSIONS"("NAME" NULLS FIRST);
156+
CREATE INDEX "PUBLIC"."IDX_VERSIONS_4" ON "PUBLIC"."VERSIONS"("DESCRIPTION" NULLS FIRST);
157+
CREATE HASH INDEX "PUBLIC"."IDX_VERSIONS_5" ON "PUBLIC"."VERSIONS"("OWNER" NULLS FIRST);
158+
CREATE INDEX "PUBLIC"."IDX_VERSIONS_6" ON "PUBLIC"."VERSIONS"("CREATEDON" NULLS FIRST);
159+
CREATE HASH INDEX "PUBLIC"."IDX_VERSIONS_7" ON "PUBLIC"."VERSIONS"("CONTENTID" NULLS FIRST);
160+
CREATE MEMORY TABLE "PUBLIC"."VERSION_LABELS"(
161+
"GLOBALID" BIGINT NOT NULL,
162+
"LABELKEY" CHARACTER VARYING(256) NOT NULL,
163+
"LABELVALUE" CHARACTER VARYING(512)
164+
);
165+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.VERSION_LABELS;
166+
CREATE INDEX "PUBLIC"."IDX_VLABELS_1" ON "PUBLIC"."VERSION_LABELS"("LABELKEY" NULLS FIRST);
167+
CREATE INDEX "PUBLIC"."IDX_VLABELS_2" ON "PUBLIC"."VERSION_LABELS"("LABELVALUE" NULLS FIRST);
168+
CREATE MEMORY TABLE "PUBLIC"."VERSION_COMMENTS"(
169+
"COMMENTID" CHARACTER VARYING(128) NOT NULL,
170+
"GLOBALID" BIGINT NOT NULL,
171+
"OWNER" CHARACTER VARYING(256),
172+
"CREATEDON" TIMESTAMP NOT NULL,
173+
"CVALUE" CHARACTER VARYING(1024) NOT NULL
174+
);
175+
ALTER TABLE "PUBLIC"."VERSION_COMMENTS" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_4" PRIMARY KEY("COMMENTID");
176+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.VERSION_COMMENTS;
177+
CREATE INDEX "PUBLIC"."IDX_VERSION_COMMENTS_1" ON "PUBLIC"."VERSION_COMMENTS"("OWNER" NULLS FIRST);
178+
CREATE MEMORY TABLE "PUBLIC"."ARTIFACT_BRANCHES"(
179+
"GROUPID" CHARACTER VARYING(512) NOT NULL,
180+
"ARTIFACTID" CHARACTER VARYING(512) NOT NULL,
181+
"BRANCHID" CHARACTER VARYING(256) NOT NULL,
182+
"BRANCHORDER" INTEGER NOT NULL,
183+
"VERSION" CHARACTER VARYING(256) NOT NULL
184+
);
185+
ALTER TABLE "PUBLIC"."ARTIFACT_BRANCHES" ADD CONSTRAINT "PUBLIC"."CONSTRAINT_1E" PRIMARY KEY("GROUPID", "ARTIFACTID", "BRANCHID", "BRANCHORDER");
186+
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.ARTIFACT_BRANCHES;
187+
CREATE INDEX "PUBLIC"."IDX_ARTIFACT_BRANCHES_1" ON "PUBLIC"."ARTIFACT_BRANCHES"("GROUPID" NULLS FIRST, "ARTIFACTID" NULLS FIRST, "BRANCHID" NULLS FIRST, "BRANCHORDER" NULLS FIRST);
188+
ALTER TABLE "PUBLIC"."CONTENT" ADD CONSTRAINT "PUBLIC"."UQ_CONTENT_1" UNIQUE("CONTENTHASH");
189+
ALTER TABLE "PUBLIC"."VERSIONS" ADD CONSTRAINT "PUBLIC"."UQ_VERSIONS_1" UNIQUE("GROUPID", "ARTIFACTID", "VERSION");
190+
ALTER TABLE "PUBLIC"."VERSIONS" ADD CONSTRAINT "PUBLIC"."UQ_VERSIONS_2" UNIQUE("GLOBALID", "VERSIONORDER");
191+
ALTER TABLE "PUBLIC"."CONTENT_REFERENCES" ADD CONSTRAINT "PUBLIC"."FK_CONTENT_REFERENCES_1" FOREIGN KEY("CONTENTID") REFERENCES "PUBLIC"."CONTENT"("CONTENTID") ON DELETE CASCADE NOCHECK;
192+
ALTER TABLE "PUBLIC"."ARTIFACT_BRANCHES" ADD CONSTRAINT "PUBLIC"."FK_ARTIFACT_BRANCHES_1" FOREIGN KEY("GROUPID", "ARTIFACTID") REFERENCES "PUBLIC"."ARTIFACTS"("GROUPID", "ARTIFACTID") ON DELETE CASCADE NOCHECK;
193+
ALTER TABLE "PUBLIC"."VERSION_COMMENTS" ADD CONSTRAINT "PUBLIC"."FK_VERSION_COMMENTS_1" FOREIGN KEY("GLOBALID") REFERENCES "PUBLIC"."VERSIONS"("GLOBALID") ON DELETE CASCADE NOCHECK;
194+
ALTER TABLE "PUBLIC"."ARTIFACT_BRANCHES" ADD CONSTRAINT "PUBLIC"."FK_ARTIFACT_BRANCHES_2" FOREIGN KEY("GROUPID", "ARTIFACTID", "VERSION") REFERENCES "PUBLIC"."VERSIONS"("GROUPID", "ARTIFACTID", "VERSION") ON DELETE CASCADE NOCHECK;
195+
ALTER TABLE "PUBLIC"."GROUP_LABELS" ADD CONSTRAINT "PUBLIC"."FK_GLABELS_1" FOREIGN KEY("GROUPID") REFERENCES "PUBLIC"."GROUPS"("GROUPID") ON DELETE CASCADE NOCHECK;
196+
ALTER TABLE "PUBLIC"."GROUP_RULES" ADD CONSTRAINT "PUBLIC"."FK_GRULES_1" FOREIGN KEY("GROUPID") REFERENCES "PUBLIC"."GROUPS"("GROUPID") ON DELETE CASCADE NOCHECK;
197+
ALTER TABLE "PUBLIC"."ARTIFACT_LABELS" ADD CONSTRAINT "PUBLIC"."FK_ALABELS_1" FOREIGN KEY("GROUPID", "ARTIFACTID") REFERENCES "PUBLIC"."ARTIFACTS"("GROUPID", "ARTIFACTID") ON DELETE CASCADE NOCHECK;
198+
ALTER TABLE "PUBLIC"."VERSIONS" ADD CONSTRAINT "PUBLIC"."FK_VERSIONS_1" FOREIGN KEY("GROUPID", "ARTIFACTID") REFERENCES "PUBLIC"."ARTIFACTS"("GROUPID", "ARTIFACTID") ON DELETE CASCADE NOCHECK;
199+
ALTER TABLE "PUBLIC"."VERSIONS" ADD CONSTRAINT "PUBLIC"."FK_VERSIONS_2" FOREIGN KEY("CONTENTID") REFERENCES "PUBLIC"."CONTENT"("CONTENTID") NOCHECK;
200+
ALTER TABLE "PUBLIC"."VERSION_LABELS" ADD CONSTRAINT "PUBLIC"."FK_VLABELS_1" FOREIGN KEY("GLOBALID") REFERENCES "PUBLIC"."VERSIONS"("GLOBALID") ON DELETE CASCADE NOCHECK;

‎app/src/main/java/io/apicurio/registry/ccompat/rest/v7/impl/CompatibilityResourceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public CompatibilityCheckResponse testCompatibilityBySubjectName(String subject,
3131
final List<String> versions = storage.getArtifactVersions(groupId, subject);
3232
for (String version : versions) {
3333
final ArtifactVersionMetaDataDto artifactVersionMetaData = storage.getArtifactVersionMetaData(groupId, subject, version);
34-
rulesService.applyRules(groupId, subject, version, artifactVersionMetaData.getType(), ContentHandle.create(request.getSchema()), Collections.emptyList(), Collections.emptyMap());
34+
rulesService.applyRules(groupId, subject, version, artifactVersionMetaData.getArtifactType(), ContentHandle.create(request.getSchema()), Collections.emptyList(), Collections.emptyMap());
3535
}
3636
return CompatibilityCheckResponse.IS_COMPATIBLE;
3737
} catch (RuleViolationException ex) {
@@ -53,7 +53,7 @@ public CompatibilityCheckResponse testCompatibilityByVersion(String subject, Str
5353
return parseVersionString(subject, versionString, groupId, v -> {
5454
try {
5555
final ArtifactVersionMetaDataDto artifact = storage.getArtifactVersionMetaData(groupId, subject, v);
56-
rulesService.applyRules(groupId, subject, v, artifact.getType(), ContentHandle.create(request.getSchema()), Collections.emptyList(), Collections.emptyMap());
56+
rulesService.applyRules(groupId, subject, v, artifact.getArtifactType(), ContentHandle.create(request.getSchema()), Collections.emptyList(), Collections.emptyMap());
5757
return CompatibilityCheckResponse.IS_COMPATIBLE;
5858
} catch (RuleViolationException ex) {
5959
if (fverbose) {

‎app/src/main/java/io/apicurio/registry/ccompat/rest/v7/impl/SubjectVersionsResourceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ protected Schema getSchema(String groupId, String subject, String versionString,
186186
ArtifactVersionMetaDataDto amd = storage.getArtifactVersionMetaData(groupId, subject, version);
187187
if (amd.getState() != VersionState.DISABLED || deleted) {
188188
StoredArtifactVersionDto storedArtifact = storage.getArtifactVersionContent(groupId, subject, amd.getVersion());
189-
return converter.convert(subject, storedArtifact, amd.getType());
189+
return converter.convert(subject, storedArtifact, amd.getArtifactType());
190190
} else {
191191
throw new VersionNotFoundException(groupId, subject, version);
192192
}

‎app/src/main/java/io/apicurio/registry/ccompat/rest/v7/impl/SubjectsResourceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ public class SubjectsResourceImpl extends AbstractResource implements SubjectsRe
4444
public List<String> listSubjects(String subjectPrefix, Boolean deleted, String groupId) {
4545
//Since contexts are not supported, subjectPrefix is not used
4646
final boolean fdeleted = deleted == null ? Boolean.FALSE : deleted;
47-
Set<SearchFilter> filters = new HashSet<>(Set.of(SearchFilter.ofGroup(groupId)));
47+
Set<SearchFilter> filters = new HashSet<>(Set.of(SearchFilter.ofGroupId(groupId)));
4848
if (!fdeleted) {
4949
filters.add(SearchFilter.ofState(VersionState.DISABLED).negated());
5050
}
5151
ArtifactSearchResultsDto searchResults = storage.searchArtifacts(filters,
5252
OrderBy.createdOn, OrderDirection.asc, 0, cconfig.maxSubjects.get());
5353
return searchResults.getArtifacts().stream()
54-
.filter(searchedArtifactDto -> isCcompatManagedType(searchedArtifactDto.getType()) /* && shouldFilterState(fdeleted, searchedArtifactDto.getState())*/)
54+
.filter(searchedArtifactDto -> isCcompatManagedType(searchedArtifactDto.getArtifactType()) /* && shouldFilterState(fdeleted, searchedArtifactDto.getState())*/)
5555
.map(SearchedArtifactDto::getArtifactId)
5656
.collect(Collectors.toList());
5757
}

0 commit comments

Comments
 (0)