Skip to content

Commit

Permalink
remove ParentName as param in LoggingClient
Browse files Browse the repository at this point in the history
  • Loading branch information
@andreamlin
andreamlin committed Jul 2, 2018
1 parent bb14eb1 commit 386c987
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 58 deletions.
62 changes: 7 additions & 55 deletions ...clients/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
*
* <pre><code>
* try (LoggingClient loggingClient = LoggingClient.create()) {
* List&lt;ParentName&gt; resourceNames = new ArrayList&lt;&gt;();
* List&lt;String&gt; resourceNames = new ArrayList&lt;&gt;();
* String filter = "";
* String orderBy = "";
* for (LogEntry element : loggingClient.listLogEntries(resourceNames, filter, orderBy).iterateAll()) {
Expand All @@ -360,54 +360,6 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
* timestamps are returned in order of their `insert_id` values.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ListLogEntriesPagedResponse listLogEntries(
List<ParentName> resourceNames, String filter, String orderBy) {
ListLogEntriesRequest request =
ListLogEntriesRequest.newBuilder()
.addAllResourceNames(
resourceNames == null ? null : ParentName.toStringList(resourceNames))
.setFilter(filter)
.setOrderBy(orderBy)
.build();
return listLogEntries(request);
}

// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
* Lists log entries. Use this method to retrieve log entries from Stackdriver Logging. For ways
* to export log entries, see [Exporting Logs](/logging/docs/export).
*
* <p>Sample code:
*
* <pre><code>
* try (LoggingClient loggingClient = LoggingClient.create()) {
* List&lt;ParentName&gt; resourceNames = new ArrayList&lt;&gt;();
* String filter = "";
* String orderBy = "";
* for (LogEntry element : loggingClient.listLogEntries(ParentName.toStringList(resourceNames), filter, orderBy).iterateAll()) {
* // doThingsWith(element);
* }
* }
* </code></pre>
*
* @param resourceNames Required. Names of one or more parent resources from which to retrieve log
* entries:
* <p>"projects/[PROJECT_ID]" "organizations/[ORGANIZATION_ID]"
* "billingAccounts/[BILLING_ACCOUNT_ID]" "folders/[FOLDER_ID]"
* <p>Projects listed in the `project_ids` field are added to this list.
* @param filter Optional. A filter that chooses which log entries to return. See [Advanced Logs
* Filters](/logging/docs/view/advanced_filters). Only log entries that match the filter are
* returned. An empty filter matches all log entries in the resources listed in
* `resource_names`. Referencing a parent resource that is not listed in `resource_names` will
* cause the filter to return no results. The maximum length of the filter is 20000
* characters.
* @param orderBy Optional. How the results should be sorted. Presently, the only permitted values
* are `"timestamp asc"` (default) and `"timestamp desc"`. The first option returns entries in
* order of increasing values of `LogEntry.timestamp` (oldest first), and the second option
* returns entries in order of decreasing timestamps (newest first). Entries with equal
* timestamps are returned in order of their `insert_id` values.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ListLogEntriesPagedResponse listLogEntries(
List<String> resourceNames, String filter, String orderBy) {
ListLogEntriesRequest request =
Expand All @@ -428,9 +380,9 @@ public final ListLogEntriesPagedResponse listLogEntries(
*
* <pre><code>
* try (LoggingClient loggingClient = LoggingClient.create()) {
* List&lt;ParentName&gt; resourceNames = new ArrayList&lt;&gt;();
* List&lt;String&gt; resourceNames = new ArrayList&lt;&gt;();
* ListLogEntriesRequest request = ListLogEntriesRequest.newBuilder()
* .addAllResourceNames(ParentName.toStringList(resourceNames))
* .addAllResourceNames(resourceNames)
* .build();
* for (LogEntry element : loggingClient.listLogEntries(request).iterateAll()) {
* // doThingsWith(element);
Expand All @@ -454,9 +406,9 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
*
* <pre><code>
* try (LoggingClient loggingClient = LoggingClient.create()) {
* List&lt;ParentName&gt; resourceNames = new ArrayList&lt;&gt;();
* List&lt;String&gt; resourceNames = new ArrayList&lt;&gt;();
* ListLogEntriesRequest request = ListLogEntriesRequest.newBuilder()
* .addAllResourceNames(ParentName.toStringList(resourceNames))
* .addAllResourceNames(resourceNames)
* .build();
* ApiFuture&lt;ListLogEntriesPagedResponse&gt; future = loggingClient.listLogEntriesPagedCallable().futureCall(request);
* // Do something
Expand All @@ -480,9 +432,9 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
*
* <pre><code>
* try (LoggingClient loggingClient = LoggingClient.create()) {
* List&lt;ParentName&gt; resourceNames = new ArrayList&lt;&gt;();
* List&lt;String&gt; resourceNames = new ArrayList&lt;&gt;();
* ListLogEntriesRequest request = ListLogEntriesRequest.newBuilder()
* .addAllResourceNames(ParentName.toStringList(resourceNames))
* .addAllResourceNames(resourceNames)
* .build();
* while (true) {
* ListLogEntriesResponse response = loggingClient.listLogEntriesCallable().call(request);
Expand Down
6 changes: 3 additions & 3 deletions ...nts/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void listLogEntriesTest() {
.build();
mockLoggingServiceV2.addResponse(expectedResponse);

List<ParentName> resourceNames = new ArrayList<>();
List<String> resourceNames = new ArrayList<>();
String filter = "filter-1274492040";
String orderBy = "orderBy1234304744";

Expand All @@ -162,7 +162,7 @@ public void listLogEntriesTest() {
Assert.assertEquals(1, actualRequests.size());
ListLogEntriesRequest actualRequest = (ListLogEntriesRequest) actualRequests.get(0);

Assert.assertEquals(resourceNames, ParentName.parseList(actualRequest.getResourceNamesList()));
Assert.assertEquals(resourceNames, actualRequest.getResourceNamesList());
Assert.assertEquals(filter, actualRequest.getFilter());
Assert.assertEquals(orderBy, actualRequest.getOrderBy());
Assert.assertTrue(
Expand All @@ -178,7 +178,7 @@ public void listLogEntriesExceptionTest() throws Exception {
mockLoggingServiceV2.addException(exception);

try {
List<ParentName> resourceNames = new ArrayList<>();
List<String> resourceNames = new ArrayList<>();
String filter = "filter-1274492040";
String orderBy = "orderBy1234304744";

Expand Down

0 comments on commit 386c987

Please sign in to comment.