/*
 * Copyright 2013-2016 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.cloudfoundry.client.v2;

import org.cloudfoundry.AbstractIntegrationTest;
import org.cloudfoundry.client.CloudFoundryClient;
import org.cloudfoundry.client.v2.jobs.GetJobRequest;
import org.cloudfoundry.client.v2.organizations.CreateOrganizationRequest;
import org.cloudfoundry.client.v2.organizations.DeleteOrganizationRequest;
import org.cloudfoundry.util.ResourceUtils;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import reactor.core.publisher.Mono;
import reactor.core.tuple.Tuple2;

public final class JobsTest extends AbstractIntegrationTest {

    @Autowired
    private CloudFoundryClient cloudFoundryClient;

    @Test
    public void getJob() {
        String organizationName = getOrganizationName();

        this.cloudFoundryClient.organizations()
            .create(CreateOrganizationRequest.builder()
                .name(organizationName)
                .build())
            .map(ResourceUtils::getId)
            .then(organizationId -> this.cloudFoundryClient.organizations()
                .delete(DeleteOrganizationRequest.builder()
                    .organizationId(organizationId)
                    .async(true)
                    .build())
                .map(ResourceUtils::getId))
            .then(jobId -> this.cloudFoundryClient.jobs()
                .get(GetJobRequest.builder()
                    .jobId(jobId)
                    .build())
                .map(ResourceUtils::getId)
                .and(Mono.just(jobId)))
            .subscribe(this.<Tuple2<String, String>>testSubscriber()
                .assertThat(this::assertTupleEquality));
    }

}

@@ -948,32 +948,73 @@
 izationRequest;%0A
+import org.cloudfoundry.util.DelayUtils;%0A
 import org.cloud
@@ -1198,16 +1198,81 @@
 uple2;%0A%0A
+import static org.cloudfoundry.util.tuple.TupleUtils.predicate;%0A%0A
 public f
@@ -2242,16 +2242,116 @@
 obId)))%0A
+            .where(predicate(String::equals))%0A            .repeatWhenEmpty(5, DelayUtils.instant())%0A
         

Revert "Remove Unnecessary Delay in Test"