Merge "server: add .jar extension"
diff --git a/cmd/checker/checker.go b/cmd/checker/checker.go index 4cfc13f..8528e4b 100644 --- a/cmd/checker/checker.go +++ b/cmd/checker/checker.go
@@ -26,8 +26,8 @@ "strings" "time" - "github.com/google/gerritfmt" - "github.com/google/gerritfmt/gerrit" + linter "github.com/google/gerrit-linter" + "github.com/google/gerrit-linter/gerrit" ) // gerritChecker run formatting checks against a gerrit server. @@ -80,7 +80,7 @@ Repository: repo, Description: "check source code formatting.", Status: "ENABLED", - Query: gerritfmt.Formatters[language].Query, + Query: linter.Formatters[language].Query, } body, err := json.Marshal(&in) @@ -139,9 +139,9 @@ if err != nil { return nil, err } - req := gerritfmt.FormatRequest{} + req := linter.FormatRequest{} for n, f := range ch.Files { - cfg := gerritfmt.Formatters[language] + cfg := linter.Formatters[language] if cfg == nil { return nil, fmt.Errorf("language %q not configured", language) } @@ -150,7 +150,7 @@ } req.Files = append(req.Files, - gerritfmt.File{ + linter.File{ Language: language, Name: n, Content: f.Content, @@ -160,8 +160,8 @@ return nil, errIrrelevant } - rep := gerritfmt.FormatReply{} - if err := gerritfmt.Format(&req, &rep); err != nil { + rep := linter.FormatReply{} + if err := linter.Format(&req, &rep); err != nil { _, ok := err.(rpc.ServerError) if ok { return nil, fmt.Errorf("server returned: %s", err)
diff --git a/cmd/checker/main.go b/cmd/checker/main.go index 1243562..999212a 100644 --- a/cmd/checker/main.go +++ b/cmd/checker/main.go
@@ -28,8 +28,8 @@ "sync" "time" - "github.com/google/gerritfmt" - "github.com/google/gerritfmt/gerrit" + linter "github.com/google/gerrit-linter" + "github.com/google/gerrit-linter/gerrit" "github.com/google/slothfs/cookie" ) @@ -167,8 +167,8 @@ log.Fatalf("must set --language.") } - if !gerritfmt.IsSupported(*language) { - log.Fatalf("language is not supported. Choices are %s", gerritfmt.SupportedLanguages()) + if !linter.IsSupported(*language) { + log.Fatalf("language is not supported. Choices are %s", linter.SupportedLanguages()) } ch, err := gc.PostChecker(*repo, *language, *update)
diff --git a/go.mod b/go.mod index a654f9a..57bf6a9 100644 --- a/go.mod +++ b/go.mod
@@ -1,4 +1,4 @@ -module github.com/google/gerritfmt +module github.com/google/gerrit-linter require ( github.com/bazelbuild/buildtools v0.0.0-20190405103555-895625218c56 // indirect