Skip to content

Commit

Permalink
Bulk substitution of all imports
Browse files Browse the repository at this point in the history
  • Loading branch information
Girish Kalele committed Oct 14, 2016
1 parent 3cb2139 commit 58577cb
Show file tree
Hide file tree
Showing 58 changed files with 171 additions and 171 deletions.
6 changes: 3 additions & 3 deletions balancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ import (
"sync"

"golang.org/x/net/context"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/naming"
"github.com/gkalele/grpc-go/credentials"
"github.com/gkalele/grpc-go/grpclog"
"github.com/gkalele/grpc-go/naming"
)

// Address represents a server the client connects to.
Expand Down
4 changes: 2 additions & 2 deletions balancer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import (
"time"

"golang.org/x/net/context"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/naming"
"github.com/gkalele/grpc-go/codes"
"github.com/gkalele/grpc-go/naming"
)

type testWatcher struct {
Expand Down
6 changes: 3 additions & 3 deletions benchmark/benchmark.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ import (
"net"

"golang.org/x/net/context"
"google.golang.org/grpc"
testpb "google.golang.org/grpc/benchmark/grpc_testing"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go"
testpb "github.com/gkalele/grpc-go/benchmark/grpc_testing"
"github.com/gkalele/grpc-go/grpclog"
)

func newPayload(t testpb.PayloadType, size int) *testpb.Payload {
Expand Down
8 changes: 4 additions & 4 deletions benchmark/benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"time"

"golang.org/x/net/context"
"google.golang.org/grpc"
testpb "google.golang.org/grpc/benchmark/grpc_testing"
"google.golang.org/grpc/benchmark/stats"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go"
testpb "github.com/gkalele/grpc-go/benchmark/grpc_testing"
"github.com/gkalele/grpc-go/benchmark/stats"
"github.com/gkalele/grpc-go/grpclog"
)

func runUnary(b *testing.B, maxConcurrentCalls int) {
Expand Down
10 changes: 5 additions & 5 deletions benchmark/client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"time"

"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/benchmark"
testpb "google.golang.org/grpc/benchmark/grpc_testing"
"google.golang.org/grpc/benchmark/stats"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go"
"github.com/gkalele/grpc-go/benchmark"
testpb "github.com/gkalele/grpc-go/benchmark/grpc_testing"
"github.com/gkalele/grpc-go/benchmark/stats"
"github.com/gkalele/grpc-go/grpclog"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion benchmark/grpc_testing/services.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions benchmark/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
_ "net/http/pprof"
"time"

"google.golang.org/grpc/benchmark"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go/benchmark"
"github.com/gkalele/grpc-go/grpclog"
)

var (
Expand Down
14 changes: 7 additions & 7 deletions benchmark/worker/benchmark_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ import (
"time"

"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/benchmark"
testpb "google.golang.org/grpc/benchmark/grpc_testing"
"google.golang.org/grpc/benchmark/stats"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go"
"github.com/gkalele/grpc-go/benchmark"
testpb "github.com/gkalele/grpc-go/benchmark/grpc_testing"
"github.com/gkalele/grpc-go/benchmark/stats"
"github.com/gkalele/grpc-go/codes"
"github.com/gkalele/grpc-go/credentials"
"github.com/gkalele/grpc-go/grpclog"
)

var (
Expand Down
14 changes: 7 additions & 7 deletions benchmark/worker/benchmark_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ import (
"sync"
"time"

"google.golang.org/grpc"
"google.golang.org/grpc/benchmark"
testpb "google.golang.org/grpc/benchmark/grpc_testing"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go"
"github.com/gkalele/grpc-go/benchmark"
testpb "github.com/gkalele/grpc-go/benchmark/grpc_testing"
"github.com/gkalele/grpc-go/codes"
"github.com/gkalele/grpc-go/credentials"
"github.com/gkalele/grpc-go/grpclog"
)

var (
// File path related to google.golang.org/grpc.
// File path related to github.com/gkalele/grpc-go.
certFile = "benchmark/server/testdata/server1.pem"
keyFile = "benchmark/server/testdata/server1.key"
)
Expand Down
8 changes: 4 additions & 4 deletions benchmark/worker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ import (
"time"

"golang.org/x/net/context"
"google.golang.org/grpc"
testpb "google.golang.org/grpc/benchmark/grpc_testing"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go"
testpb "github.com/gkalele/grpc-go/benchmark/grpc_testing"
"github.com/gkalele/grpc-go/codes"
"github.com/gkalele/grpc-go/grpclog"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions benchmark/worker/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ import (
)

// abs returns the absolute path the given relative file or directory path,
// relative to the google.golang.org/grpc directory in the user's GOPATH.
// relative to the github.com/gkalele/grpc-go directory in the user's GOPATH.
// If rel is already absolute, it is returned unmodified.
func abs(rel string) string {
if filepath.IsAbs(rel) {
return rel
}
v, err := goPackagePath("google.golang.org/grpc")
v, err := goPackagePath("github.com/gkalele/grpc-go")
if err != nil {
log.Fatalf("Error finding google.golang.org/grpc/testdata directory: %v", err)
log.Fatalf("Error finding github.com/gkalele/grpc-go/testdata directory: %v", err)
}
return filepath.Join(v, rel)
}
Expand Down
4 changes: 2 additions & 2 deletions call.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import (

"golang.org/x/net/context"
"golang.org/x/net/trace"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/transport"
"github.com/gkalele/grpc-go/codes"
"github.com/gkalele/grpc-go/transport"
)

// recvResponse receives and parses an RPC response.
Expand Down
4 changes: 2 additions & 2 deletions call_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ import (
"time"

"golang.org/x/net/context"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/transport"
"github.com/gkalele/grpc-go/codes"
"github.com/gkalele/grpc-go/transport"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions clientconn.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ import (

"golang.org/x/net/context"
"golang.org/x/net/trace"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/transport"
"github.com/gkalele/grpc-go/credentials"
"github.com/gkalele/grpc-go/grpclog"
"github.com/gkalele/grpc-go/transport"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions clientconn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ import (

"golang.org/x/net/context"

"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/oauth"
"github.com/gkalele/grpc-go/credentials"
"github.com/gkalele/grpc-go/credentials/oauth"
)

const tlsDir = "testdata/"
Expand Down
2 changes: 1 addition & 1 deletion codes/codes.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

// Package codes defines the canonical error codes used by gRPC. It is
// consistent across various languages.
package codes // import "google.golang.org/grpc/codes"
package codes // import "github.com/gkalele/grpc-go/codes"

// A Code is an unsigned 32-bit error code as defined in the gRPC spec.
type Code uint32
Expand Down
2 changes: 1 addition & 1 deletion credentials/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
// which encapsulate all the state needed by a client to authenticate with a
// server and make various assertions, e.g., about the client's identity, role,
// or whether it is authorized to make a particular call.
package credentials // import "google.golang.org/grpc/credentials"
package credentials // import "github.com/gkalele/grpc-go/credentials"

import (
"crypto/tls"
Expand Down
2 changes: 1 addition & 1 deletion credentials/oauth/oauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"golang.org/x/oauth2/jwt"
"google.golang.org/grpc/credentials"
"github.com/gkalele/grpc-go/credentials"
)

// TokenSource supplies PerRPCCredentials from an oauth2.TokenSource.
Expand Down
2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Package grpc implements an RPC system called gRPC.
See www.grpc.io for more information about gRPC.
*/
package grpc // import "google.golang.org/grpc"
package grpc // import "github.com/gkalele/grpc-go"
4 changes: 2 additions & 2 deletions examples/helloworld/greeter_client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
"os"

"golang.org/x/net/context"
"google.golang.org/grpc"
pb "google.golang.org/grpc/examples/helloworld/helloworld"
"github.com/gkalele/grpc-go"
pb "github.com/gkalele/grpc-go/examples/helloworld/helloworld"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions examples/helloworld/greeter_server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
"net"

"golang.org/x/net/context"
"google.golang.org/grpc"
pb "google.golang.org/grpc/examples/helloworld/helloworld"
"github.com/gkalele/grpc-go"
pb "github.com/gkalele/grpc-go/examples/helloworld/helloworld"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion examples/helloworld/helloworld/helloworld.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/route_guide/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ import (
"time"

"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
pb "google.golang.org/grpc/examples/route_guide/routeguide"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go"
"github.com/gkalele/grpc-go/credentials"
pb "github.com/gkalele/grpc-go/examples/route_guide/routeguide"
"github.com/gkalele/grpc-go/grpclog"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion examples/route_guide/routeguide/route_guide.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/route_guide/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ import (
"time"

"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/gkalele/grpc-go"

"google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go/credentials"
"github.com/gkalele/grpc-go/grpclog"

"github.com/golang/protobuf/proto"

pb "google.golang.org/grpc/examples/route_guide/routeguide"
pb "github.com/gkalele/grpc-go/examples/route_guide/routeguide"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion grpclb/grpc_lb_v1/grpclb.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions grpclb/grpclb.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ import (
"sync"

"golang.org/x/net/context"
"google.golang.org/grpc"
lbpb "google.golang.org/grpc/grpclb/grpc_lb_v1"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/naming"
"github.com/gkalele/grpc-go"
lbpb "github.com/gkalele/grpc-go/grpclb/grpc_lb_v1"
"github.com/gkalele/grpc-go/grpclog"
"github.com/gkalele/grpc-go/naming"
)

// AddressType indicates the address type returned by name resolution.
Expand Down
10 changes: 5 additions & 5 deletions grpclb/grpclb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ import (
"time"

"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
lbpb "google.golang.org/grpc/grpclb/grpc_lb_v1"
"google.golang.org/grpc/naming"
"github.com/gkalele/grpc-go"
"github.com/gkalele/grpc-go/codes"
"github.com/gkalele/grpc-go/credentials"
lbpb "github.com/gkalele/grpc-go/grpclb/grpc_lb_v1"
"github.com/gkalele/grpc-go/naming"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion grpclog/glogger/glogger.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ package glogger

import (
"github.com/golang/glog"
"google.golang.org/grpc/grpclog"
"github.com/gkalele/grpc-go/grpclog"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion grpclog/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/*
Package grpclog defines logging for grpc.
*/
package grpclog // import "google.golang.org/grpc/grpclog"
package grpclog // import "github.com/gkalele/grpc-go/grpclog"

import (
"log"
Expand Down
2 changes: 1 addition & 1 deletion health/grpc_health_v1/health.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 58577cb

Please sign in to comment.