-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate some logic from generated code into the runtime library (#475)
Migrate some logic from generated code into the runtime library
- Loading branch information
1 parent
7e647a2
commit 1fad96e
Showing
8 changed files
with
182 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
versionOverrides: {} | ||
acceptedBreaks: | ||
"0.12.1": | ||
com.palantir.dialogue:dialogue-apache-hc4-client: [] | ||
com.palantir.dialogue:dialogue-blocking-channels: [] | ||
com.palantir.dialogue:dialogue-core: [] | ||
com.palantir.dialogue:dialogue-httpurlconnection-client: [] | ||
com.palantir.dialogue:dialogue-java-client: [] | ||
com.palantir.dialogue:dialogue-okhttp-client: [] | ||
com.palantir.dialogue:dialogue-serde: [] | ||
com.palantir.dialogue:dialogue-target: | ||
- code: "java.method.addedToInterface" | ||
old: null | ||
new: "method com.palantir.dialogue.Clients com.palantir.dialogue.ConjureRuntime::clients()" | ||
justification: "alpha software, runtime not meant for extension" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
type: improvement | ||
improvement: | ||
description: Migrate some logic from generated code into the runtime library | ||
links: | ||
- https://github.com/palantir/dialogue/pull/475 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
dialogue-serde/src/main/java/com/palantir/conjure/java/dialogue/serde/DefaultClients.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* | ||
* (c) Copyright 2020 Palantir Technologies 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.palantir.conjure.java.dialogue.serde; | ||
|
||
import com.google.common.util.concurrent.Futures; | ||
import com.google.common.util.concurrent.ListenableFuture; | ||
import com.google.common.util.concurrent.MoreExecutors; | ||
import com.palantir.dialogue.Channel; | ||
import com.palantir.dialogue.Clients; | ||
import com.palantir.dialogue.Deserializer; | ||
import com.palantir.dialogue.Endpoint; | ||
import com.palantir.dialogue.RemoteExceptions; | ||
import com.palantir.dialogue.Request; | ||
|
||
/** Package private internal API. */ | ||
enum DefaultClients implements Clients { | ||
INSTANCE; | ||
|
||
@Override | ||
public <T> ListenableFuture<T> call( | ||
Channel channel, Endpoint endpoint, Request request, Deserializer<T> deserializer) { | ||
return Futures.transform( | ||
channel.execute(endpoint, request), deserializer::deserialize, MoreExecutors.directExecutor()); | ||
} | ||
|
||
@Override | ||
public <T> T block(ListenableFuture<T> future) { | ||
// TODO(ckozak): remove RemoteExceptions from the codegen target module. | ||
return RemoteExceptions.getUnchecked(future); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
...ogue-serde/src/test/java/com/palantir/conjure/java/dialogue/serde/DefaultClientsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
/* | ||
* (c) Copyright 2020 Palantir Technologies 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.palantir.conjure.java.dialogue.serde; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
import static org.mockito.ArgumentMatchers.eq; | ||
import static org.mockito.Mockito.when; | ||
|
||
import com.google.common.util.concurrent.ListenableFuture; | ||
import com.google.common.util.concurrent.SettableFuture; | ||
import com.palantir.dialogue.Channel; | ||
import com.palantir.dialogue.Deserializer; | ||
import com.palantir.dialogue.Endpoint; | ||
import com.palantir.dialogue.Request; | ||
import com.palantir.dialogue.Response; | ||
import java.util.concurrent.ExecutionException; | ||
import org.junit.Test; | ||
import org.junit.runner.RunWith; | ||
import org.mockito.Mock; | ||
import org.mockito.junit.MockitoJUnitRunner; | ||
|
||
@RunWith(MockitoJUnitRunner.class) | ||
public final class DefaultClientsTest { | ||
|
||
@Mock | ||
private Channel channel; | ||
|
||
@Mock | ||
private Endpoint endpoint; | ||
|
||
@Mock | ||
private Response response; | ||
|
||
@Mock | ||
private Deserializer<String> deserializer; | ||
|
||
@Test | ||
public void testCall() throws ExecutionException, InterruptedException { | ||
Request request = Request.builder().build(); | ||
when(deserializer.deserialize(eq(response))).thenReturn("value"); | ||
SettableFuture<Response> responseFuture = SettableFuture.create(); | ||
when(channel.execute(eq(endpoint), eq(request))).thenReturn(responseFuture); | ||
ListenableFuture<String> result = DefaultClients.INSTANCE.call(channel, endpoint, request, deserializer); | ||
assertThat(result).isNotDone(); | ||
responseFuture.set(response); | ||
assertThat(result).isDone(); | ||
assertThat(result.get()).isEqualTo("value"); | ||
} | ||
} |
38 changes: 38 additions & 0 deletions
38
dialogue-target/src/main/java/com/palantir/dialogue/Clients.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
/* | ||
* (c) Copyright 2020 Palantir Technologies 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.palantir.dialogue; | ||
|
||
import com.google.common.util.concurrent.ListenableFuture; | ||
import java.util.concurrent.Future; | ||
|
||
/** | ||
* Provides functionality for generated code to make both blocking and asynchronous calls without | ||
* duplicating logic. | ||
*/ | ||
public interface Clients { | ||
|
||
/** | ||
* Makes a request to the specified {@link Endpoint} and deserializes the response using a provided deserializer. | ||
*/ | ||
<T> ListenableFuture<T> call(Channel channel, Endpoint endpoint, Request request, Deserializer<T> deserializer); | ||
|
||
/** | ||
* Similar to {@link com.google.common.util.concurrent.Futures#getUnchecked(Future)}, except with custom handling | ||
* for conjure exceptions and cancellation on interruption. | ||
*/ | ||
<T> T block(ListenableFuture<T> future); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters