Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion sdk/kusto/mgmt-v2018_09_07_preview/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.2.0</version>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-kusto</artifactId>
Expand Down Expand Up @@ -71,6 +71,8 @@
<artifactId>azure-arm-client-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
<version>1.6.5</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ public PagedList<Cluster> list() {
public Observable<Cluster> listAsync() {
ClustersInner client = this.inner();
return client.listAsync()
.flatMap(new Func1<Page<ClusterInner>, Observable<ClusterInner>>() {
.flatMap(new Func1<List<ClusterInner>, Observable<ClusterInner>>() {
@Override
public Observable<ClusterInner> call(Page<ClusterInner> innerList) {
return Observable.from(innerList.items());
public Observable<ClusterInner> call(List<ClusterInner> innerList) {
return Observable.from(innerList);
}
})
.map(new Func1<ClusterInner, Cluster>() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1120,16 +1120,8 @@ private ServiceResponse<PageImpl<ClusterInner>> listByResourceGroupDelegate(Resp
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
* @return the List&lt;ClusterInner&gt; object if successful.
*/
public PagedList<ClusterInner> list() {
PageImpl<ClusterInner> page = new PageImpl<>();
page.setItems(listWithServiceResponseAsync().toBlocking().single().body());
page.setNextPageLink(null);
return new PagedList<ClusterInner>(page) {
@Override
public Page<ClusterInner> nextPage(String nextPageLink) {
return null;
}
};
public List<ClusterInner> list() {
return listWithServiceResponseAsync().toBlocking().single().body();
}

/**
Expand All @@ -1149,13 +1141,11 @@ public ServiceFuture<List<ClusterInner>> listAsync(final ServiceCallback<List<Cl
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the List&lt;ClusterInner&gt; object
*/
public Observable<Page<ClusterInner>> listAsync() {
return listWithServiceResponseAsync().map(new Func1<ServiceResponse<List<ClusterInner>>, Page<ClusterInner>>() {
public Observable<List<ClusterInner>> listAsync() {
return listWithServiceResponseAsync().map(new Func1<ServiceResponse<List<ClusterInner>>, List<ClusterInner>>() {
@Override
public Page<ClusterInner> call(ServiceResponse<List<ClusterInner>> response) {
PageImpl<ClusterInner> page = new PageImpl<>();
page.setItems(response.body());
return page;
public List<ClusterInner> call(ServiceResponse<List<ClusterInner>> response) {
return response.body();
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,14 @@ public Database call(DatabaseInner inner) {
public Observable<Database> getAsync(String resourceGroupName, String clusterName, String databaseName) {
DatabasesInner client = this.inner();
return client.getAsync(resourceGroupName, clusterName, databaseName)
.map(new Func1<DatabaseInner, Database>() {
.flatMap(new Func1<DatabaseInner, Observable<Database>>() {
@Override
public Database call(DatabaseInner inner) {
return wrapModel(inner);
public Observable<Database> call(DatabaseInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((Database)wrapModel(inner));
}
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,14 @@ public EventHubConnection call(EventHubConnectionInner inner) {
public Observable<EventHubConnection> getAsync(String resourceGroupName, String clusterName, String databaseName, String eventHubConnectionName) {
EventHubConnectionsInner client = this.inner();
return client.getAsync(resourceGroupName, clusterName, databaseName, eventHubConnectionName)
.map(new Func1<EventHubConnectionInner, EventHubConnection>() {
.flatMap(new Func1<EventHubConnectionInner, Observable<EventHubConnection>>() {
@Override
public EventHubConnection call(EventHubConnectionInner inner) {
return wrapModel(inner);
public Observable<EventHubConnection> call(EventHubConnectionInner inner) {
if (inner == null) {
return Observable.empty();
} else {
return Observable.just((EventHubConnection)wrapModel(inner));
}
}
});
}
Expand Down