Skip to content

Commit c5be4b5

Browse files
EricWittmannEricWittmann
authored
Renamed "createdBy" to "owner" (#4340)
1 parent ced223e commit c5be4b5

File tree

65 files changed

+446
-446
lines changed

Some content is hidden

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

65 files changed

+446
-446
lines changed

‎app/src/main/java/io/apicurio/registry/auth/AbstractAccessController.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -30,37 +30,37 @@ protected boolean isOwner(InvocationContext context) {
3030
if (style == AuthorizedStyle.GroupAndArtifact) {
3131
String groupId = getStringParam(context, 0);
3232
String artifactId = getStringParam(context, 1);
33-
return verifyArtifactCreatedBy(groupId, artifactId);
33+
return verifyArtifactOwner(groupId, artifactId);
3434
} else if (style == AuthorizedStyle.GroupOnly && authConfig.ownerOnlyAuthorizationLimitGroupAccess.get()) {
3535
String groupId = getStringParam(context, 0);
36-
return verifyGroupCreatedBy(groupId);
36+
return verifyGroupOwner(groupId);
3737
} else if (style == AuthorizedStyle.ArtifactOnly) {
3838
String artifactId = getStringParam(context, 0);
39-
return verifyArtifactCreatedBy(null, artifactId);
39+
return verifyArtifactOwner(null, artifactId);
4040
} else if (style == AuthorizedStyle.GlobalId) {
4141
long globalId = getLongParam(context, 0);
42-
return verifyArtifactCreatedBy(globalId);
42+
return verifyArtifactOwner(globalId);
4343
} else {
4444
return true;
4545
}
4646
}
4747

48-
private boolean verifyGroupCreatedBy(String groupId) {
48+
private boolean verifyGroupOwner(String groupId) {
4949
try {
5050
GroupMetaDataDto dto = storage.getGroupMetaData(groupId);
51-
String createdBy = dto.getCreatedBy();
52-
return createdBy == null || createdBy.equals(securityIdentity.getPrincipal().getName());
51+
String owner = dto.getOwner();
52+
return owner == null || owner.equals(securityIdentity.getPrincipal().getName());
5353
} catch (NotFoundException nfe) {
5454
// If the group is not found, then return true and let the operation proceed.
5555
return true;
5656
}
5757
}
5858

59-
private boolean verifyArtifactCreatedBy(String groupId, String artifactId) {
59+
private boolean verifyArtifactOwner(String groupId, String artifactId) {
6060
try {
6161
ArtifactMetaDataDto dto = storage.getArtifactMetaData(groupId, artifactId, DEFAULT);
62-
String createdBy = dto.getCreatedBy();
63-
return createdBy == null || createdBy.equals(securityIdentity.getPrincipal().getName());
62+
String owner = dto.getOwner();
63+
return owner == null || owner.equals(securityIdentity.getPrincipal().getName());
6464
} catch (NotFoundException nfe) {
6565
// If the artifact is not found, then return true and let the operation proceed
6666
// as normal. The result of which will typically be a 404 response, but sometimes
@@ -69,11 +69,11 @@ private boolean verifyArtifactCreatedBy(String groupId, String artifactId) {
6969
}
7070
}
7171

72-
private boolean verifyArtifactCreatedBy(long globalId) {
72+
private boolean verifyArtifactOwner(long globalId) {
7373
try {
7474
ArtifactMetaDataDto dto = storage.getArtifactMetaData(globalId);
75-
String createdBy = dto.getCreatedBy();
76-
return createdBy == null || createdBy.equals(securityIdentity.getPrincipal().getName());
75+
String owner = dto.getOwner();
76+
return owner == null || owner.equals(securityIdentity.getPrincipal().getName());
7777
} catch (NotFoundException nfe) {
7878
// If the artifact is not found, then return true and let the operation proceed
7979
// as normal. The result of which will typically be a 404 response, but sometimes

‎app/src/main/java/io/apicurio/registry/cncf/schemaregistry/impl/SchemagroupsResourceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void createGroup(String groupId, SchemaGroup data) {
9191
String user = securityIdentity.getPrincipal().getName();
9292

9393
try {
94-
group.createdBy(user)
94+
group.owner(user)
9595
.createdOn(new Date().getTime());
9696

9797
storage.createGroup(group.build());

‎app/src/main/java/io/apicurio/registry/rest/v2/GroupsResourceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public ArtifactOwner getArtifactOwner(String groupId, String artifactId) {
226226

227227
ArtifactMetaDataDto dto = storage.getArtifactMetaData(defaultGroupIdToNull(groupId), artifactId);
228228
ArtifactOwner owner = new ArtifactOwner();
229-
owner.setOwner(dto.getCreatedBy());
229+
owner.setOwner(dto.getOwner());
230230
return owner;
231231
}
232232

@@ -290,7 +290,7 @@ public GroupMetaData createGroup(CreateGroupMetaData data) {
290290
.labels(data.getProperties());
291291

292292
String user = securityIdentity.getPrincipal().getName();
293-
group.createdBy(user).createdOn(new Date().getTime());
293+
group.owner(user).createdOn(new Date().getTime());
294294

295295
storage.createGroup(group.build());
296296

‎app/src/main/java/io/apicurio/registry/rest/v2/V2ApiUtil.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private V2ApiUtil() {
4848
public static ArtifactMetaData dtoToMetaData(String groupId, String artifactId,
4949
String artifactType, ArtifactMetaDataDto dto) {
5050
ArtifactMetaData metaData = new ArtifactMetaData();
51-
metaData.setCreatedBy(dto.getCreatedBy());
51+
metaData.setCreatedBy(dto.getOwner());
5252
metaData.setCreatedOn(new Date(dto.getCreatedOn()));
5353
metaData.setDescription(dto.getDescription());
5454
if (groupId != null) {
@@ -148,12 +148,12 @@ public static Map<String, String> toV3Labels(List<String> v2Labels, Map<String,
148148
public static final ArtifactMetaData dtoToMetaData(String groupId, String artifactId, String artifactType,
149149
ArtifactVersionMetaDataDto dto) {
150150
ArtifactMetaData metaData = new ArtifactMetaData();
151-
metaData.setCreatedBy(dto.getCreatedBy());
151+
metaData.setCreatedBy(dto.getOwner());
152152
metaData.setCreatedOn(new Date(dto.getCreatedOn()));
153153
metaData.setDescription(dto.getDescription());
154154
metaData.setGroupId(groupId);
155155
metaData.setId(artifactId);
156-
metaData.setModifiedBy(dto.getCreatedBy());
156+
metaData.setModifiedBy(dto.getOwner());
157157
metaData.setModifiedOn(new Date(dto.getCreatedOn()));
158158
metaData.setName(dto.getName());
159159
if (artifactType != null) {
@@ -184,7 +184,7 @@ public static final VersionMetaData dtoToVersionMetaData(String groupId, String
184184
VersionMetaData metaData = new VersionMetaData();
185185
metaData.setGroupId(groupId);
186186
metaData.setId(artifactId);
187-
metaData.setCreatedBy(dto.getCreatedBy());
187+
metaData.setCreatedBy(dto.getOwner());
188188
metaData.setCreatedOn(new Date(dto.getCreatedOn()));
189189
metaData.setDescription(dto.getDescription());
190190
metaData.setName(dto.getName());
@@ -210,7 +210,7 @@ public static final VersionMetaData dtoToVersionMetaData(String groupId, String
210210
VersionMetaData metaData = new VersionMetaData();
211211
metaData.setGroupId(groupId);
212212
metaData.setId(artifactId);
213-
metaData.setCreatedBy(dto.getCreatedBy());
213+
metaData.setCreatedBy(dto.getOwner());
214214
metaData.setCreatedOn(new Date(dto.getCreatedOn()));
215215
metaData.setDescription(dto.getDescription());
216216
metaData.setName(dto.getName());
@@ -266,7 +266,7 @@ public static ArtifactSearchResults dtoToSearchResults(ArtifactSearchResultsDto
266266
results.setArtifacts(new ArrayList<>(dto.getArtifacts().size()));
267267
dto.getArtifacts().forEach(artifact -> {
268268
SearchedArtifact sa = new SearchedArtifact();
269-
sa.setCreatedBy(artifact.getCreatedBy());
269+
sa.setCreatedBy(artifact.getOwner());
270270
sa.setCreatedOn(artifact.getCreatedOn());
271271
sa.setDescription(artifact.getDescription());
272272
sa.setId(artifact.getId());
@@ -287,7 +287,7 @@ public static GroupSearchResults dtoToSearchResults(GroupSearchResultsDto dto) {
287287
results.setGroups(new ArrayList<>(dto.getGroups().size()));
288288
dto.getGroups().forEach(group -> {
289289
SearchedGroup sg = new SearchedGroup();
290-
sg.setCreatedBy(group.getCreatedBy());
290+
sg.setCreatedBy(group.getOwner());
291291
sg.setCreatedOn(group.getCreatedOn());
292292
sg.setDescription(group.getDescription());
293293
sg.setId(group.getId());
@@ -304,7 +304,7 @@ public static VersionSearchResults dtoToSearchResults(VersionSearchResultsDto dt
304304
results.setVersions(new ArrayList<>(dto.getVersions().size()));
305305
dto.getVersions().forEach(version -> {
306306
SearchedVersion sv = new SearchedVersion();
307-
sv.setCreatedBy(version.getCreatedBy());
307+
sv.setCreatedBy(version.getOwner());
308308
sv.setCreatedOn(version.getCreatedOn());
309309
sv.setDescription(version.getDescription());
310310
sv.setGlobalId(version.getGlobalId());
@@ -340,7 +340,7 @@ public static GroupMetaData groupDtoToGroup(GroupMetaDataDto dto) {
340340
GroupMetaData group = new GroupMetaData();
341341
group.setId(dto.getGroupId());
342342
group.setDescription(dto.getDescription());
343-
group.setCreatedBy(dto.getCreatedBy());
343+
group.setCreatedBy(dto.getOwner());
344344
group.setModifiedBy(dto.getModifiedBy());
345345
group.setCreatedOn(new Date(dto.getCreatedOn()));
346346
group.setModifiedOn(new Date(dto.getModifiedOn()));
@@ -351,7 +351,7 @@ public static GroupMetaData groupDtoToGroup(GroupMetaDataDto dto) {
351351
public static Comment commentDtoToComment(CommentDto dto) {
352352
return Comment.builder()
353353
.commentId(dto.getCommentId())
354-
.createdBy(dto.getCreatedBy())
354+
.createdBy(dto.getOwner())
355355
.createdOn(new Date(dto.getCreatedOn()))
356356
.value(dto.getValue())
357357
.build();

‎app/src/main/java/io/apicurio/registry/rest/v3/GroupsResourceImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public ArtifactOwner getArtifactOwner(String groupId, String artifactId) {
234234

235235
ArtifactMetaDataDto dto = storage.getArtifactMetaData(new GroupId(groupId).getRawGroupIdWithNull(), artifactId);
236236
ArtifactOwner owner = new ArtifactOwner();
237-
owner.setOwner(dto.getCreatedBy());
237+
owner.setOwner(dto.getOwner());
238238
return owner;
239239
}
240240

@@ -312,7 +312,7 @@ public GroupMetaData createGroup(CreateGroupMetaData data) {
312312
.labels(data.getLabels());
313313

314314
String user = securityIdentity.getPrincipal().getName();
315-
group.createdBy(user).createdOn(new Date().getTime());
315+
group.owner(user).createdOn(new Date().getTime());
316316

317317
storage.createGroup(group.build());
318318

‎app/src/main/java/io/apicurio/registry/rest/v3/V3ApiUtil.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private V3ApiUtil() {
5252
public static ArtifactMetaData dtoToMetaData(String groupId, String artifactId,
5353
String artifactType, ArtifactMetaDataDto dto) {
5454
ArtifactMetaData metaData = new ArtifactMetaData();
55-
metaData.setCreatedBy(dto.getCreatedBy());
55+
metaData.setOwner(dto.getOwner());
5656
metaData.setCreatedOn(new Date(dto.getCreatedOn()));
5757
metaData.setDescription(dto.getDescription());
5858
if (groupId != null) {
@@ -93,12 +93,12 @@ public static ArtifactMetaData dtoToMetaData(String groupId, String artifactId,
9393
public static final ArtifactMetaData dtoToMetaData(String groupId, String artifactId, String artifactType,
9494
ArtifactVersionMetaDataDto dto) {
9595
ArtifactMetaData metaData = new ArtifactMetaData();
96-
metaData.setCreatedBy(dto.getCreatedBy());
96+
metaData.setOwner(dto.getOwner());
9797
metaData.setCreatedOn(new Date(dto.getCreatedOn()));
9898
metaData.setDescription(dto.getDescription());
9999
metaData.setGroupId(groupId);
100100
metaData.setId(artifactId);
101-
metaData.setModifiedBy(dto.getCreatedBy());
101+
metaData.setModifiedBy(dto.getOwner());
102102
metaData.setModifiedOn(new Date(dto.getCreatedOn()));
103103
metaData.setName(dto.getName());
104104
if (artifactType != null) {
@@ -128,7 +128,7 @@ public static final VersionMetaData dtoToVersionMetaData(String groupId, String
128128
VersionMetaData metaData = new VersionMetaData();
129129
metaData.setGroupId(groupId);
130130
metaData.setId(artifactId);
131-
metaData.setCreatedBy(dto.getCreatedBy());
131+
metaData.setOwner(dto.getOwner());
132132
metaData.setCreatedOn(new Date(dto.getCreatedOn()));
133133
metaData.setDescription(dto.getDescription());
134134
metaData.setName(dto.getName());
@@ -154,7 +154,7 @@ public static final VersionMetaData dtoToVersionMetaData(String groupId, String
154154
VersionMetaData metaData = new VersionMetaData();
155155
metaData.setGroupId(groupId);
156156
metaData.setId(artifactId);
157-
metaData.setCreatedBy(amd.getCreatedBy());
157+
metaData.setOwner(amd.getOwner());
158158
metaData.setCreatedOn(amd.getCreatedOn());
159159
metaData.setDescription(amd.getDescription());
160160
metaData.setName(amd.getName());
@@ -178,7 +178,7 @@ public static final VersionMetaData dtoToVersionMetaData(String groupId, String
178178
VersionMetaData metaData = new VersionMetaData();
179179
metaData.setGroupId(groupId);
180180
metaData.setId(artifactId);
181-
metaData.setCreatedBy(dto.getCreatedBy());
181+
metaData.setOwner(dto.getOwner());
182182
metaData.setCreatedOn(new Date(dto.getCreatedOn()));
183183
metaData.setDescription(dto.getDescription());
184184
metaData.setName(dto.getName());
@@ -233,7 +233,7 @@ public static ArtifactSearchResults dtoToSearchResults(ArtifactSearchResultsDto
233233
results.setArtifacts(new ArrayList<>(dto.getArtifacts().size()));
234234
dto.getArtifacts().forEach(artifact -> {
235235
SearchedArtifact sa = new SearchedArtifact();
236-
sa.setCreatedBy(artifact.getCreatedBy());
236+
sa.setOwner(artifact.getOwner());
237237
sa.setCreatedOn(artifact.getCreatedOn());
238238
sa.setDescription(artifact.getDescription());
239239
sa.setId(artifact.getId());
@@ -254,7 +254,7 @@ public static GroupSearchResults dtoToSearchResults(GroupSearchResultsDto dto) {
254254
results.setGroups(new ArrayList<>(dto.getGroups().size()));
255255
dto.getGroups().forEach(group -> {
256256
SearchedGroup sg = new SearchedGroup();
257-
sg.setCreatedBy(group.getCreatedBy());
257+
sg.setOwner(group.getOwner());
258258
sg.setCreatedOn(group.getCreatedOn());
259259
sg.setDescription(group.getDescription());
260260
sg.setId(group.getId());
@@ -271,7 +271,7 @@ public static VersionSearchResults dtoToSearchResults(VersionSearchResultsDto dt
271271
results.setVersions(new ArrayList<>(dto.getVersions().size()));
272272
dto.getVersions().forEach(version -> {
273273
SearchedVersion sv = new SearchedVersion();
274-
sv.setCreatedBy(version.getCreatedBy());
274+
sv.setOwner(version.getOwner());
275275
sv.setCreatedOn(version.getCreatedOn());
276276
sv.setDescription(version.getDescription());
277277
sv.setGlobalId(version.getGlobalId());
@@ -307,7 +307,7 @@ public static GroupMetaData groupDtoToGroup(GroupMetaDataDto dto) {
307307
GroupMetaData group = new GroupMetaData();
308308
group.setId(dto.getGroupId());
309309
group.setDescription(dto.getDescription());
310-
group.setCreatedBy(dto.getCreatedBy());
310+
group.setOwner(dto.getOwner());
311311
group.setModifiedBy(dto.getModifiedBy());
312312
group.setCreatedOn(new Date(dto.getCreatedOn()));
313313
group.setModifiedOn(new Date(dto.getModifiedOn()));
@@ -318,7 +318,7 @@ public static GroupMetaData groupDtoToGroup(GroupMetaDataDto dto) {
318318
public static Comment commentDtoToComment(CommentDto dto) {
319319
return Comment.builder()
320320
.commentId(dto.getCommentId())
321-
.createdBy(dto.getCreatedBy())
321+
.owner(dto.getOwner())
322322
.createdOn(new Date(dto.getCreatedOn()))
323323
.value(dto.getValue())
324324
.build();

‎app/src/main/java/io/apicurio/registry/storage/RegistryStorage.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ void updateArtifactRule(String groupId, String artifactId, RuleType rule, RuleCo
839839

840840

841841
CommentDto createArtifactVersionCommentRaw(String groupId, String artifactId, String version, IdGenerator commentId,
842-
String createdBy, Date createdOn, String value);
842+
String owner, Date createdOn, String value);
843843

844844

845845
void resetGlobalId();
@@ -900,13 +900,13 @@ CommentDto createArtifactVersionCommentRaw(String groupId, String artifactId, St
900900

901901

902902
ArtifactMetaDataDto updateArtifactWithMetadata(String groupId, String artifactId, String version,
903-
String artifactType, String contentHash, String createdBy, Date createdOn,
903+
String artifactType, String contentHash, String owner, Date createdOn,
904904
EditableArtifactMetaDataDto metaData,
905905
IdGenerator globalIdGenerator);
906906

907907

908908
ArtifactMetaDataDto createArtifactWithMetadata(String groupId, String artifactId, String version,
909-
String artifactType, String contentHash, String createdBy,
909+
String artifactType, String contentHash, String owner,
910910
Date createdOn, EditableArtifactMetaDataDto metaData, IdGenerator globalIdGenerator)
911911
throws ArtifactNotFoundException, RegistryStorageException;
912912

‎app/src/main/java/io/apicurio/registry/storage/decorator/ReadOnlyRegistryStorageDecorator.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -364,9 +364,9 @@ public void deleteAllExpiredDownloads() throws RegistryStorageException {
364364

365365
@Override
366366
public CommentDto createArtifactVersionCommentRaw(String groupId, String artifactId, String version,
367-
IdGenerator commentId, String createdBy, Date createdOn, String value) {
367+
IdGenerator commentId, String owner, Date createdOn, String value) {
368368
checkReadOnly();
369-
return delegate.createArtifactVersionCommentRaw(groupId, artifactId, version, commentId, createdBy, createdOn, value);
369+
return delegate.createArtifactVersionCommentRaw(groupId, artifactId, version, commentId, owner, createdOn, value);
370370
}
371371

372372

@@ -449,23 +449,23 @@ public void updateContentCanonicalHash(String newCanonicalHash, long contentId,
449449

450450
@Override
451451
public ArtifactMetaDataDto updateArtifactWithMetadata(String groupId, String artifactId, String version,
452-
String artifactType, String contentHash, String createdBy,
452+
String artifactType, String contentHash, String owner,
453453
Date createdOn, EditableArtifactMetaDataDto metaData,
454454
IdGenerator globalIdGenerator) {
455455
checkReadOnly();
456-
return delegate.updateArtifactWithMetadata(groupId, artifactId, version, artifactType, contentHash, createdBy,
456+
return delegate.updateArtifactWithMetadata(groupId, artifactId, version, artifactType, contentHash, owner,
457457
createdOn, metaData, globalIdGenerator);
458458
}
459459

460460

461461
@Override
462462
public ArtifactMetaDataDto createArtifactWithMetadata(String groupId, String artifactId, String version,
463-
String artifactType, String contentHash, String createdBy,
463+
String artifactType, String contentHash, String owner,
464464
Date createdOn, EditableArtifactMetaDataDto metaData,
465465
IdGenerator globalIdGenerator)
466466
throws ArtifactNotFoundException, RegistryStorageException {
467467
checkReadOnly();
468-
return delegate.createArtifactWithMetadata(groupId, artifactId, version, artifactType, contentHash, createdBy,
468+
return delegate.createArtifactWithMetadata(groupId, artifactId, version, artifactType, contentHash, owner,
469469
createdOn, metaData, globalIdGenerator);
470470
}
471471

0 commit comments

Comments
 (0)