Skip to content
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.

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

feat: add query method with all params for BucketsApi, OrganizationApi and TasksApi #278

Merged
merged 46 commits into from
Nov 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
30ba009
add query with full rest params for buckets,org and tasks api.
Nov 4, 2021
7fbabae
Update client/src/main/java/com/influxdb/client/BucketsApi.java
lonelyleaf Nov 4, 2021
3d1e24c
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 4, 2021
3d7b52d
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 4, 2021
6434fb1
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 4, 2021
d74d02c
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 4, 2021
61439fc
Update client/src/main/java/com/influxdb/client/internal/BucketsApiIm…
lonelyleaf Nov 4, 2021
8948163
Update client/src/main/java/com/influxdb/client/internal/Organization…
lonelyleaf Nov 4, 2021
e50bd11
Update client/src/main/java/com/influxdb/client/internal/TasksApiImpl…
lonelyleaf Nov 4, 2021
2e05888
Update client/src/main/java/com/influxdb/client/internal/TasksApiImpl…
lonelyleaf Nov 4, 2021
0952a9a
Update client/src/main/java/com/influxdb/client/internal/TasksApiImpl…
lonelyleaf Nov 4, 2021
26f5afd
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 4, 2021
f60965c
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 4, 2021
9f39d5b
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 4, 2021
fae5156
Update client/src/main/java/com/influxdb/client/OrganizationsApi.java
lonelyleaf Nov 4, 2021
ab01f01
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 4, 2021
aad6b1e
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 4, 2021
b88bc94
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 4, 2021
0d7d221
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 4, 2021
6ffaef8
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 4, 2021
b61fe8b
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 4, 2021
1640ad6
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 4, 2021
1633270
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 4, 2021
35252af
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 4, 2021
5c20a7c
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 4, 2021
12110d4
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 4, 2021
94ebe1b
Update client/src/main/java/com/influxdb/client/TasksApi.java
lonelyleaf Nov 4, 2021
0aee074
Update client/src/main/java/com/influxdb/client/TasksApi.java
lonelyleaf Nov 4, 2021
2049119
Update client/src/main/java/com/influxdb/client/internal/BucketsApiIm…
lonelyleaf Nov 4, 2021
82b3509
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 5, 2021
679a669
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 5, 2021
89c8426
Update client/src/main/java/com/influxdb/client/internal/BucketsApiIm…
lonelyleaf Nov 5, 2021
0fd8f13
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 5, 2021
0589e7c
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 5, 2021
d984e43
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 5, 2021
d490997
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 5, 2021
ecf0fc9
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 5, 2021
0ae6fe8
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 5, 2021
01cfdae
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 5, 2021
7439e25
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 5, 2021
f35c777
Update client/src/main/java/com/influxdb/client/OrganizationsQuery.java
lonelyleaf Nov 5, 2021
a1f6294
Update client/src/main/java/com/influxdb/client/TaskQuery.java
lonelyleaf Nov 5, 2021
dbbe70c
Update client/src/main/java/com/influxdb/client/BucketsQuery.java
lonelyleaf Nov 5, 2021
90b060b
update CHANGELOG.md
Nov 5, 2021
4a15418
fix compilation error
Nov 5, 2021
b277596
fix for checkstyle
Nov 5, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

### Features
1. [#272](https://github.com/influxdata/influxdb-client-java/pull/272): Add `PingService` to check status of OSS and Cloud instance
2. [#278](https://github.com/influxdata/influxdb-client-java/pull/278): Add query method with all params for BucketsApi, OrganizationApi and TasksApi

### CI
1. [#275](https://github.com/influxdata/influxdb-client-java/pull/275): Deploy `influxdb-client-test` package into Maven repository
Expand Down
10 changes: 9 additions & 1 deletion client/src/main/java/com/influxdb/client/BucketsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,14 @@ Bucket createBucket(@Nonnull final String name,
@Nonnull
List<Bucket> findBucketsByOrgName(@Nullable final String orgName);

/**
* List all buckets.
*
* @return List all buckets
*/
@Nonnull
List<Bucket> findBuckets(@Nonnull final BucketsQuery query);

/**
* List all users with member privileges for a bucket.
*
Expand Down Expand Up @@ -368,4 +376,4 @@ Bucket createBucket(@Nonnull final String name,
* @param labelID the ID of a label
*/
void deleteLabel(@Nonnull final String labelID, @Nonnull final String bucketID);
}
}
134 changes: 134 additions & 0 deletions client/src/main/java/com/influxdb/client/BucketsQuery.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
/*
* The MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.influxdb.client;

import javax.annotation.Nullable;

public class BucketsQuery {

/**
* Offset. (optional)
*/
@Nullable
private Integer offset;

/**
* Limit. (optional, default to 20)
*/
@Nullable
private Integer limit;

/**
* The last resource ID from which to seek from (but not including).
* This is to be used instead of &#x60;offset&#x60;. (optional)
*/
@Nullable
private String after;

/**
* The name of the organization. (optional)
*/
@Nullable
private String org;

/**
* The organization ID. (optional)
*/
@Nullable
private String orgID;

/**
* Only returns buckets with a specific name. (optional)
*/
@Nullable
private String name;

/**
* Only returns buckets with a specific ID. (optional)
*/
@Nullable
private String id;

@Nullable
public Integer getOffset() {
return offset;
}

public void setOffset(@Nullable final Integer offset) {
this.offset = offset;
}

@Nullable
public Integer getLimit() {
return limit;
}

public void setLimit(@Nullable final Integer limit) {
this.limit = limit;
}

@Nullable
public String getAfter() {
return after;
}

public void setAfter(@Nullable final String after) {
this.after = after;
}

@Nullable
public String getOrg() {
return org;
}

public void setOrg(@Nullable final String org) {
this.org = org;
}

@Nullable
public String getOrgID() {
return orgID;
}

public void setOrgID(@Nullable final String orgID) {
this.orgID = orgID;
}

@Nullable
public String getName() {
return name;
}

public void setName(@Nullable final String name) {
this.name = name;
}

@Nullable
public String getId() {
return id;
}

public void setId(@Nullable final String id) {
this.id = id;
}

}
12 changes: 10 additions & 2 deletions client/src/main/java/com/influxdb/client/OrganizationsApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ public interface OrganizationsApi {
@Nonnull
List<Organization> findOrganizations();

/**
* List all organizations.
*
* @return List all organizations
*/
@Nonnull
List<Organization> findOrganizations(@Nonnull final OrganizationsQuery query);

/**
* List of secret keys the are stored for Organization.
* <p>
Expand Down Expand Up @@ -185,7 +193,7 @@ public interface OrganizationsApi {
* Delete provided secrets.
*
* @param secretKeys secret key to deleted (required)
* @param orgID ID of the organization (required)
* @param orgID ID of the organization (required)
*/
void deleteSecrets(@Nonnull final SecretKeys secretKeys, @Nonnull final String orgID);

Expand Down Expand Up @@ -297,4 +305,4 @@ public interface OrganizationsApi {
*/
void deleteOwner(@Nonnull final String ownerID, @Nonnull final String orgID);

}
}
117 changes: 117 additions & 0 deletions client/src/main/java/com/influxdb/client/OrganizationsQuery.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
/*
* The MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package com.influxdb.client;

import javax.annotation.Nullable;

public class OrganizationsQuery {

/**
* Offset. (optional)
*/
@Nullable
private Integer offset;

/**
* Limit. (optional, default to 20)
*/
@Nullable
private Integer limit;

/**
* Descending. (optional, default to false)
*/
@Nullable
private Boolean descending;

/**
* Filter organizations to a specific organization name. (optional)
*/
@Nullable
private String org;
/**
* Filter organizations to a specific organization ID. (optional)
*/
@Nullable
private String orgID;

/**
* Filter organizations to a specific user ID. (optional)
*/
@Nullable
private String userID;

@Nullable
public Integer getOffset() {
return offset;
}

public void setOffset(@Nullable final Integer offset) {
this.offset = offset;
}

@Nullable
public Integer getLimit() {
return limit;
}

public void setLimit(@Nullable final Integer limit) {
this.limit = limit;
}

@Nullable
public Boolean getDescending() {
return descending;
}

public void setDescending(@Nullable final Boolean descending) {
this.descending = descending;
}

@Nullable
public String getOrg() {
return org;
}

public void setOrg(@Nullable final String org) {
this.org = org;
}

@Nullable
public String getOrgID() {
return orgID;
}

public void setOrgID(@Nullable final String orgID) {
this.orgID = orgID;
}

@Nullable
public String getUserID() {
return userID;
}

public void setUserID(@Nullable final String userID) {
this.userID = userID;
}

}
12 changes: 10 additions & 2 deletions client/src/main/java/com/influxdb/client/TasksApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,15 @@ List<Task> findTasks(@Nullable final String afterID,
@Nullable final String userID,
@Nullable final String orgID);

/**
* Lists tasks, limit 100.
*
* @param query query params for task
* @return A list of tasks
*/
@Nonnull
List<Task> findTasks(@Nonnull final TasksQuery query);

/**
* List all task members.
*
Expand Down Expand Up @@ -402,7 +411,6 @@ List<Run> getRuns(@Nonnull final Task task,
* Retrieve list of run records for a task.
*
* @param taskID ID of task to get runs for
*
* @return the list of run records for a task
*/
@Nonnull
Expand Down Expand Up @@ -585,4 +593,4 @@ List<Run> getRuns(@Nonnull final String taskID,
* @param labelID the ID of a label
*/
void deleteLabel(@Nonnull final String labelID, @Nonnull final String taskID);
}
}
Loading