Skip to content

Commit 8da2755

Browse files
snazysnazy
committed
u rest-services
1 parent c0722ec commit 8da2755

File tree

6 files changed

+41
-0
lines changed

6 files changed

+41
-0
lines changed

‎servers/rest-services/src/main/java/org/projectnessie/services/rest/RestContentResource.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import jakarta.enterprise.context.RequestScoped;
2020
import jakarta.inject.Inject;
2121
import jakarta.ws.rs.Path;
22+
import org.eclipse.microprofile.openapi.annotations.Operation;
2223
import org.projectnessie.api.v1.http.HttpContentApi;
2324
import org.projectnessie.error.NessieNotFoundException;
2425
import org.projectnessie.model.Content;
@@ -55,13 +56,15 @@ private ContentService resource() {
5556

5657
@Override
5758
@JsonView(Views.V1.class)
59+
@Operation(operationId = "nessie.v1.getContent")
5860
public Content getContent(ContentKey key, String ref, String hashOnRef)
5961
throws NessieNotFoundException {
6062
return resource().getContent(key, ref, hashOnRef, false, false).getContent();
6163
}
6264

6365
@Override
6466
@JsonView(Views.V1.class)
67+
@Operation(operationId = "nessie.v1.getMultipleContents")
6568
public GetMultipleContentsResponse getMultipleContents(
6669
String ref, String hashOnRef, GetMultipleContentsRequest request)
6770
throws NessieNotFoundException {

‎servers/rest-services/src/main/java/org/projectnessie/services/rest/RestDiffResource.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import jakarta.enterprise.context.RequestScoped;
2222
import jakarta.inject.Inject;
2323
import jakarta.ws.rs.Path;
24+
import org.eclipse.microprofile.openapi.annotations.Operation;
2425
import org.projectnessie.api.v1.http.HttpDiffApi;
2526
import org.projectnessie.api.v1.params.DiffParams;
2627
import org.projectnessie.error.NessieNotFoundException;
@@ -58,6 +59,7 @@ private DiffService resource() {
5859

5960
@Override
6061
@JsonView(Views.V1.class)
62+
@Operation(operationId = "nessie.v1.getDiff")
6163
public DiffResponse getDiff(DiffParams params) throws NessieNotFoundException {
6264
ImmutableDiffResponse.Builder builder = DiffResponse.builder();
6365
return resource()

‎servers/rest-services/src/main/java/org/projectnessie/services/rest/RestNamespaceResource.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import jakarta.inject.Inject;
2121
import jakarta.validation.constraints.NotNull;
2222
import jakarta.ws.rs.Path;
23+
import org.eclipse.microprofile.openapi.annotations.Operation;
2324
import org.projectnessie.api.v1.http.HttpNamespaceApi;
2425
import org.projectnessie.api.v1.params.MultipleNamespacesParams;
2526
import org.projectnessie.api.v1.params.NamespaceParams;
@@ -60,13 +61,15 @@ private NamespaceService resource() {
6061

6162
@Override
6263
@JsonView(Views.V1.class)
64+
@Operation(operationId = "nessie.v1.createNamespace")
6365
public Namespace createNamespace(NamespaceParams params, Namespace namespace)
6466
throws NessieNamespaceAlreadyExistsException, NessieReferenceNotFoundException {
6567
return resource().createNamespace(params.getRefName(), namespace);
6668
}
6769

6870
@Override
6971
@JsonView(Views.V1.class)
72+
@Operation(operationId = "nessie.v1.deleteNamespace")
7073
public void deleteNamespace(@NotNull NamespaceParams params)
7174
throws NessieReferenceNotFoundException,
7275
NessieNamespaceNotEmptyException,
@@ -76,6 +79,7 @@ public void deleteNamespace(@NotNull NamespaceParams params)
7679

7780
@Override
7881
@JsonView(Views.V1.class)
82+
@Operation(operationId = "nessie.v1.getNamespace")
7983
public Namespace getNamespace(@NotNull NamespaceParams params)
8084
throws NessieNamespaceNotFoundException, NessieReferenceNotFoundException {
8185
return resource()
@@ -84,6 +88,7 @@ public Namespace getNamespace(@NotNull NamespaceParams params)
8488

8589
@Override
8690
@JsonView(Views.V1.class)
91+
@Operation(operationId = "nessie.v1.getNamespaces")
8792
public GetNamespacesResponse getNamespaces(@NotNull MultipleNamespacesParams params)
8893
throws NessieReferenceNotFoundException {
8994
return resource()
@@ -92,6 +97,7 @@ public GetNamespacesResponse getNamespaces(@NotNull MultipleNamespacesParams par
9297

9398
@Override
9499
@JsonView(Views.V1.class)
100+
@Operation(operationId = "nessie.v1.updateProperties")
95101
public void updateProperties(NamespaceParams params, NamespaceUpdate namespaceUpdate)
96102
throws NessieNamespaceNotFoundException, NessieReferenceNotFoundException {
97103
resource()

‎servers/rest-services/src/main/java/org/projectnessie/services/rest/RestTreeResource.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import jakarta.enterprise.context.RequestScoped;
2424
import jakarta.inject.Inject;
2525
import jakarta.ws.rs.Path;
26+
import org.eclipse.microprofile.openapi.annotations.Operation;
2627
import org.projectnessie.api.v1.http.HttpTreeApi;
2728
import org.projectnessie.api.v1.params.BaseMergeTransplant;
2829
import org.projectnessie.api.v1.params.CommitLogParams;
@@ -75,6 +76,7 @@ private TreeService resource() {
7576
}
7677

7778
@JsonView(Views.V1.class)
79+
@Operation(operationId = "nessie.v1.getAllReferences")
7880
@Override
7981
public ReferencesResponse getAllReferences(ReferencesParams params) {
8082
Integer maxRecords = params.maxRecords();
@@ -105,12 +107,14 @@ public void hasMore(String pagingToken) {
105107
}
106108

107109
@JsonView(Views.V1.class)
110+
@Operation(operationId = "nessie.v1.getDefaultBranch")
108111
@Override
109112
public Branch getDefaultBranch() throws NessieNotFoundException {
110113
return resource().getDefaultBranch();
111114
}
112115

113116
@JsonView(Views.V1.class)
117+
@Operation(operationId = "nessie.v1.createReference")
114118
@Override
115119
public Reference createReference(String sourceRefName, Reference reference)
116120
throws NessieNotFoundException, NessieConflictException {
@@ -120,12 +124,14 @@ public Reference createReference(String sourceRefName, Reference reference)
120124
}
121125

122126
@JsonView(Views.V1.class)
127+
@Operation(operationId = "nessie.v1.getReferenceByName")
123128
@Override
124129
public Reference getReferenceByName(GetReferenceParams params) throws NessieNotFoundException {
125130
return resource().getReferenceByName(params.getRefName(), params.fetchOption());
126131
}
127132

128133
@JsonView(Views.V1.class)
134+
@Operation(operationId = "nessie.v1.getEntries")
129135
@Override
130136
public EntriesResponse getEntries(String refName, EntriesParams params)
131137
throws NessieNotFoundException {
@@ -164,6 +170,7 @@ public void hasMore(String pagingToken) {
164170
}
165171

166172
@JsonView(Views.V1.class)
173+
@Operation(operationId = "nessie.v1.getCommitLog")
167174
@Override
168175
public LogResponse getCommitLog(String ref, CommitLogParams params)
169176
throws NessieNotFoundException {
@@ -198,6 +205,7 @@ public void hasMore(String pagingToken) {
198205
}
199206

200207
@JsonView(Views.V1.class)
208+
@Operation(operationId = "nessie.v1.assignReference")
201209
@Override
202210
public void assignReference(
203211
Reference.ReferenceType referenceType,
@@ -209,6 +217,7 @@ public void assignReference(
209217
}
210218

211219
@JsonView(Views.V1.class)
220+
@Operation(operationId = "nessie.v1.deleteReference")
212221
@Override
213222
public void deleteReference(
214223
Reference.ReferenceType referenceType, String referenceName, String expectedHash)
@@ -217,6 +226,7 @@ public void deleteReference(
217226
}
218227

219228
@JsonView(Views.V1.class)
229+
@Operation(operationId = "nessie.v1.transplantCommitsIntoBranch")
220230
@Override
221231
public MergeResponse transplantCommitsIntoBranch(
222232
String branchName, String expectedHash, String message, Transplant transplant)
@@ -237,6 +247,7 @@ public MergeResponse transplantCommitsIntoBranch(
237247
}
238248

239249
@JsonView(Views.V1.class)
250+
@Operation(operationId = "nessie.v1.mergeRefIntoBranch")
240251
@Override
241252
public MergeResponse mergeRefIntoBranch(String branchName, String expectedHash, Merge merge)
242253
throws NessieNotFoundException, NessieConflictException {
@@ -267,6 +278,7 @@ private void validateKeepIndividual(
267278
}
268279

269280
@JsonView(Views.V1.class)
281+
@Operation(operationId = "nessie.v1.commitMultipleOperations")
270282
@Override
271283
public Branch commitMultipleOperations(
272284
String branchName, String expectedHash, Operations operations)

‎servers/rest-services/src/main/java/org/projectnessie/services/rest/RestV2ConfigResource.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.List;
2323
import java.util.Set;
2424
import java.util.stream.Collectors;
25+
import org.eclipse.microprofile.openapi.annotations.Operation;
2526
import org.projectnessie.api.v2.http.HttpConfigApi;
2627
import org.projectnessie.error.NessieConflictException;
2728
import org.projectnessie.model.ImmutableRepositoryConfigResponse;
@@ -59,6 +60,7 @@ public RestV2ConfigResource(
5960

6061
@Override
6162
@JsonView(Views.V2.class)
63+
@Operation(operationId = "nessie.v2.getConfig")
6264
public NessieConfiguration getConfig() {
6365
return config.getConfig();
6466
}

‎servers/rest-services/src/main/java/org/projectnessie/services/rest/RestV2TreeResource.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.List;
3030
import java.util.Locale;
3131
import java.util.stream.Collectors;
32+
import org.eclipse.microprofile.openapi.annotations.Operation;
3233
import org.projectnessie.api.v2.http.HttpTreeApi;
3334
import org.projectnessie.api.v2.params.CommitLogParams;
3435
import org.projectnessie.api.v2.params.DiffParams;
@@ -125,6 +126,7 @@ private ContentService content() {
125126
}
126127

127128
@JsonView(Views.V2.class)
129+
@Operation(operationId = "nessie.v2.getAllReferences")
128130
@Override
129131
public ReferencesResponse getAllReferences(ReferencesParams params) {
130132
Integer maxRecords = params.maxRecords();
@@ -155,6 +157,7 @@ public void hasMore(String pagingToken) {
155157
}
156158

157159
@JsonView(Views.V2.class)
160+
@Operation(operationId = "nessie.v2.createReference")
158161
@Override
159162
public SingleReferenceResponse createReference(String name, String type, Reference reference)
160163
throws NessieNotFoundException, NessieConflictException {
@@ -174,6 +177,7 @@ public SingleReferenceResponse createReference(String name, String type, Referen
174177
}
175178

176179
@JsonView(Views.V2.class)
180+
@Operation(operationId = "nessie.v2.getReferenceByName")
177181
@Override
178182
public SingleReferenceResponse getReferenceByName(GetReferenceParams params)
179183
throws NessieNotFoundException {
@@ -187,6 +191,7 @@ public SingleReferenceResponse getReferenceByName(GetReferenceParams params)
187191
}
188192

189193
@JsonView(Views.V2.class)
194+
@Operation(operationId = "nessie.v2.getReferenceHistory")
190195
@Override
191196
public ReferenceHistoryResponse getReferenceHistory(ReferenceHistoryParams params)
192197
throws NessieNotFoundException {
@@ -198,6 +203,7 @@ public ReferenceHistoryResponse getReferenceHistory(ReferenceHistoryParams param
198203
}
199204

200205
@JsonView(Views.V2.class)
206+
@Operation(operationId = "nessie.v2.getEntries")
201207
@Override
202208
public EntriesResponse getEntries(String ref, EntriesParams params)
203209
throws NessieNotFoundException {
@@ -237,6 +243,7 @@ public void hasMore(String pagingToken) {
237243
}
238244

239245
@JsonView(Views.V2.class)
246+
@Operation(operationId = "nessie.v2.getCommitLog")
240247
@Override
241248
public LogResponse getCommitLog(String ref, CommitLogParams params)
242249
throws NessieNotFoundException {
@@ -272,6 +279,7 @@ public void hasMore(String pagingToken) {
272279
}
273280

274281
@JsonView(Views.V2.class)
282+
@Operation(operationId = "nessie.v2.getDiff")
275283
@Override
276284
public DiffResponse getDiff(DiffParams params) throws NessieNotFoundException {
277285
Integer maxRecords = params.maxRecords();
@@ -312,6 +320,7 @@ public void hasMore(String pagingToken) {
312320
}
313321

314322
@JsonView(Views.V2.class)
323+
@Operation(operationId = "nessie.v2.assignReference")
315324
@Override
316325
public SingleReferenceResponse assignReference(String type, String ref, Reference assignTo)
317326
throws NessieNotFoundException, NessieConflictException {
@@ -324,6 +333,7 @@ public SingleReferenceResponse assignReference(String type, String ref, Referenc
324333
}
325334

326335
@JsonView(Views.V2.class)
336+
@Operation(operationId = "nessie.v2.deleteReference")
327337
@Override
328338
public SingleReferenceResponse deleteReference(String type, String ref)
329339
throws NessieConflictException, NessieNotFoundException {
@@ -342,6 +352,7 @@ private static Reference.ReferenceType parseReferenceType(String type) {
342352
}
343353

344354
@JsonView(Views.V2.class)
355+
@Operation(operationId = "nessie.v2.getContent")
345356
@Override
346357
public ContentResponse getContent(
347358
ContentKey key, String ref, boolean withDocumentation, boolean forWrite)
@@ -353,6 +364,7 @@ public ContentResponse getContent(
353364
}
354365

355366
@JsonView(Views.V2.class)
367+
@Operation(operationId = "nessie.v2.getSeveralContents")
356368
@Override
357369
public GetMultipleContentsResponse getSeveralContents(
358370
String ref, List<String> keys, boolean withDocumentation, boolean forWrite)
@@ -363,6 +375,7 @@ public GetMultipleContentsResponse getSeveralContents(
363375
}
364376

365377
@JsonView(Views.V2.class)
378+
@Operation(operationId = "nessie.v2.getMultipleContents")
366379
@Override
367380
public GetMultipleContentsResponse getMultipleContents(
368381
String ref, GetMultipleContentsRequest request, boolean withDocumentation, boolean forWrite)
@@ -378,6 +391,7 @@ public GetMultipleContentsResponse getMultipleContents(
378391
}
379392

380393
@JsonView(Views.V2.class)
394+
@Operation(operationId = "nessie.v2.transplantCommitsIntoBranch")
381395
@Override
382396
public MergeResponse transplantCommitsIntoBranch(String branch, Transplant transplant)
383397
throws NessieNotFoundException, NessieConflictException {
@@ -401,6 +415,7 @@ public MergeResponse transplantCommitsIntoBranch(String branch, Transplant trans
401415
}
402416

403417
@JsonView(Views.V2.class)
418+
@Operation(operationId = "nessie.v2.mergeRefIntoBranch")
404419
@Override
405420
public MergeResponse mergeRefIntoBranch(String branch, Merge merge)
406421
throws NessieNotFoundException, NessieConflictException {
@@ -436,6 +451,7 @@ public MergeResponse mergeRefIntoBranch(String branch, Merge merge)
436451
}
437452

438453
@JsonView(Views.V2.class)
454+
@Operation(operationId = "nessie.v2.commitMultipleOperations")
439455
@Override
440456
public CommitResponse commitMultipleOperations(String branch, Operations operations)
441457
throws NessieNotFoundException, NessieConflictException {

0 commit comments

Comments
 (0)