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

Third concept of DNS batch. #787

Merged
merged 21 commits into from
Apr 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
107 changes: 107 additions & 0 deletions gcloud-java-core/src/main/java/com/google/cloud/BatchResult.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/*
* Copyright 2016 Google Inc. All Rights Reserved.
*
* 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 com.google.cloud;

import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;

import java.util.LinkedList;
import java.util.List;

/**
* This class holds a single result of a batch call. {@code T} is the type of the result and {@code
* E} is the type of the service-dependent exception thrown when a processing error occurs.
*/
public abstract class BatchResult<T, E extends BaseServiceException> {

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.


private T result;
private boolean completed = false;
private E error;
private List<Callback<T, E>> toBeNotified = new LinkedList<>();

/**
* Returns {@code true} if the batch has been completed and the result is available; {@code false}
* otherwise.
*/
public boolean completed() {
return completed;
}

/**
* Returns the result of this call.
*
* @throws IllegalStateException if the batch has not been completed yet
* @throws E if an error occurred when processing this request

This comment was marked as spam.

This comment was marked as spam.

*/
public T get() throws E {
checkState(completed(), "Batch has not been completed yet");
if (error != null) {
throw error;
}
return result;
}

/**
* Adds a callback for the batch operation.
*
* @throws IllegalStateException if the batch has been completed already
*/
public void notify(Callback<T, E> callback) {
if (completed) {

This comment was marked as spam.

This comment was marked as spam.

throw new IllegalStateException("The batch has been completed. All the calls to the notify()"
+ " method should be done prior to submitting the batch.");
}
toBeNotified.add(callback);
}

/**
* Sets an error and status as completed. Notifies all callbacks.
*/
protected void error(E error) {
this.error = error;

This comment was marked as spam.

This comment was marked as spam.

this.completed = true;
for (Callback<T, E> callback : toBeNotified) {
callback.error(error);
}
}

/**
* Sets a result and status as completed. Notifies all callbacks.
*/
protected void success(T result) {
this.result = result;
this.completed = true;
for (Callback<T, E> callback : toBeNotified) {
callback.success(result);
}
}

/**
* An interface for the batch callbacks.
*/
public interface Callback<T, E> {
/**
* The method to be called when the batched operation succeeds.
*/
void success(T result);

/**
* The method to be called when the batched operation fails.
*/
void error(E exception);
}
}
107 changes: 107 additions & 0 deletions gcloud-java-core/src/test/java/com/google/cloud/BatchResultTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/*
* Copyright 2016 Google Inc. All Rights Reserved.
*
* 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 com.google.cloud;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;

public class BatchResultTest {

private BatchResult<Boolean, BaseServiceException> result;

@Before
public void setUp() {
result = new BatchResult<Boolean, BaseServiceException>() {};
}

@Test
public void testSuccess() {
assertFalse(result.completed());
try {
result.get();
fail("This was not completed yet.");
} catch (IllegalStateException ex) {
// expected
}
result.success(true);
assertTrue(result.get());
// test that null is allowed
result.success(null);
}

@Test
public void testError() {
assertFalse(result.completed());
try {
result.get();
fail("This was not completed yet.");
} catch (IllegalStateException ex) {
// expected
}
BaseServiceException ex = new BaseServiceException(0, "message", "reason", false);
result.error(ex);
try {
result.get();
fail("This is a failed operation and should have thrown a DnsException.");
} catch (BaseServiceException real) {
assertSame(ex, real);
}
}

@Test
public void testNotifyError() {
final BaseServiceException ex = new BaseServiceException(0, "message", "reason", false);
assertFalse(result.completed());
BatchResult.Callback<Boolean, BaseServiceException> callback =
EasyMock.createStrictMock(BatchResult.Callback.class);
callback.error(ex);
EasyMock.replay(callback);
result.notify(callback);
result.error(ex);
try {
result.notify(callback);
fail("The batch has been completed.");
} catch (IllegalStateException exception) {
// expected
}
EasyMock.verify(callback);
}

@Test
public void testNotifySuccess() {
assertFalse(result.completed());
BatchResult.Callback<Boolean, BaseServiceException> callback =
EasyMock.createStrictMock(BatchResult.Callback.class);
callback.success(true);
EasyMock.replay(callback);
result.notify(callback);
result.success(true);
try {
result.notify(callback);
fail("The batch has been completed.");
} catch (IllegalStateException exception) {
// expected
}
EasyMock.verify(callback);
}
}
7 changes: 6 additions & 1 deletion gcloud-java-dns/src/main/java/com/google/cloud/dns/Dns.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

package com.google.cloud.dns;

import com.google.common.collect.ImmutableList;
import com.google.cloud.FieldSelector;
import com.google.cloud.FieldSelector.Helper;
import com.google.cloud.Page;
import com.google.cloud.Service;
import com.google.cloud.dns.spi.DnsRpc;
import com.google.common.collect.ImmutableList;

import java.util.List;

Expand Down Expand Up @@ -503,4 +503,9 @@ ChangeRequest getChangeRequest(String zoneName, String changeRequestId,
* @see <a href="https://cloud.google.com/dns/api/v1/changes/list">Cloud DNS Chages: list</a>
*/
Page<ChangeRequest> listChangeRequests(String zoneName, ChangeRequestListOption... options);

/**
* Creates a new empty batch for grouping multiple service calls in one underlying RPC call.
*/
DnsBatch batch();
}
Loading