From ff669ac9c234cb7220b2918f9c102eaa2c3d22ba Mon Sep 17 00:00:00 2001 From: ejona Date: Fri, 7 Nov 2014 10:28:47 -0800 Subject: [PATCH] More precise Builder generics ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=79430607 --- .../main/java/com/google/net/stubby/AbstractChannelBuilder.java | 2 +- .../main/java/com/google/net/stubby/AbstractServerBuilder.java | 2 +- .../main/java/com/google/net/stubby/AbstractServiceBuilder.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java b/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java index 61a8111777..b9a308f3d0 100644 --- a/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java +++ b/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java @@ -14,7 +14,7 @@ import javax.annotation.Nullable; * * @param The concrete type of this builder. */ -public abstract class AbstractChannelBuilder> +public abstract class AbstractChannelBuilder> extends AbstractServiceBuilder { @Override diff --git a/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java b/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java index 6e210cb937..5c3cdb88fa 100644 --- a/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java +++ b/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java @@ -11,7 +11,7 @@ import java.util.concurrent.ExecutorService; * * @param The concrete type for this builder. */ -public abstract class AbstractServerBuilder> +public abstract class AbstractServerBuilder> extends AbstractServiceBuilder { private final HandlerRegistry registry; diff --git a/core/src/main/java/com/google/net/stubby/AbstractServiceBuilder.java b/core/src/main/java/com/google/net/stubby/AbstractServiceBuilder.java index f5b4655e52..4ca69ce7b7 100644 --- a/core/src/main/java/com/google/net/stubby/AbstractServiceBuilder.java +++ b/core/src/main/java/com/google/net/stubby/AbstractServiceBuilder.java @@ -23,7 +23,7 @@ import javax.annotation.Nullable; * @param The concrete type of this builder. */ abstract class AbstractServiceBuilder> { + BuilderT extends AbstractServiceBuilder> { private static final Resource DEFAULT_EXECUTOR = new Resource() {