v.io/x/ref/lib/vdl/codegen/java: remove "public" modifier from Java interfaces
It's not necessary to specify this modifier. Also, we assume all interfaces
are public, so the code can be a bit simpler.
Change-Id: I2ee9a5b92120c41a3c6cbd497559cfd3d3b1f891
diff --git a/lib/vdl/codegen/java/file_client_interface.go b/lib/vdl/codegen/java/file_client_interface.go
index ffc17c8..229dbfa 100644
--- a/lib/vdl/codegen/java/file_client_interface.go
+++ b/lib/vdl/codegen/java/file_client_interface.go
@@ -19,7 +19,7 @@
package {{ .PackagePath }};
{{ .ServiceDoc }}
-{{ .AccessModifier }} interface {{ .ServiceName }}Client {{ .Extends }} {
+public interface {{ .ServiceName }}Client {{ .Extends }} {
{{ range $method := .Methods }}
{{/* If this method has multiple return arguments, generate the class. */}}
{{ if $method.IsMultipleRet }}
@@ -33,8 +33,8 @@
{{/* Generate the method signature. */}}
{{ $method.Doc }}
- {{ $method.AccessModifier }} {{ $method.RetType }} {{ $method.Name }}(final io.v.v23.context.VContext context{{ $method.Args }}) throws io.v.v23.verror.VException;
- {{ $method.AccessModifier }} {{ $method.RetType }} {{ $method.Name }}(final io.v.v23.context.VContext context{{ $method.Args }}, final io.v.v23.Options vOpts) throws io.v.v23.verror.VException;
+ {{ $method.RetType }} {{ $method.Name }}(final io.v.v23.context.VContext context{{ $method.Args }}) throws io.v.v23.verror.VException;
+ {{ $method.RetType }} {{ $method.Name }}(final io.v.v23.context.VContext context{{ $method.Args }}, final io.v.v23.Options vOpts) throws io.v.v23.verror.VException;
{{ end }}
}
`
@@ -45,7 +45,6 @@
}
type clientInterfaceMethod struct {
- AccessModifier string
Args string
Doc string
Name string
@@ -85,7 +84,6 @@
retArgs[i].Type = javaType(method.OutArgs[i].Type, false, env)
}
return clientInterfaceMethod{
- AccessModifier: accessModifierForName(method.Name),
Args: javaDeclarationArgStr(method.InArgs, env, true),
Doc: method.Doc,
Name: vdlutil.FirstRuneToLower(method.Name),
@@ -105,23 +103,21 @@
methods[i] = processClientInterfaceMethod(iface, method, env)
}
data := struct {
- FileDoc string
- AccessModifier string
- Extends string
- Methods []clientInterfaceMethod
- PackagePath string
- ServiceDoc string
- ServiceName string
- Source string
+ FileDoc string
+ Extends string
+ Methods []clientInterfaceMethod
+ PackagePath string
+ ServiceDoc string
+ ServiceName string
+ Source string
}{
- FileDoc: iface.File.Package.FileDoc,
- AccessModifier: accessModifierForName(iface.Name),
- Extends: javaClientExtendsStr(iface.Embeds),
- Methods: methods,
- PackagePath: javaPath(javaGenPkgPath(iface.File.Package.GenPath)),
- ServiceDoc: javaDoc(iface.Doc),
- ServiceName: javaServiceName,
- Source: iface.File.BaseName,
+ FileDoc: iface.File.Package.FileDoc,
+ Extends: javaClientExtendsStr(iface.Embeds),
+ Methods: methods,
+ PackagePath: javaPath(javaGenPkgPath(iface.File.Package.GenPath)),
+ ServiceDoc: javaDoc(iface.Doc),
+ ServiceName: javaServiceName,
+ Source: iface.File.BaseName,
}
var buf bytes.Buffer
err := parseTmpl("client interface", clientInterfaceTmpl).Execute(&buf, data)
diff --git a/lib/vdl/codegen/java/file_server_interface.go b/lib/vdl/codegen/java/file_server_interface.go
index d3d8891..4e50cbd 100644
--- a/lib/vdl/codegen/java/file_server_interface.go
+++ b/lib/vdl/codegen/java/file_server_interface.go
@@ -22,7 +22,7 @@
@io.v.v23.vdl.VServer(
serverWrapper = {{ .ServerWrapperPath }}.class
)
-{{ .AccessModifier }} interface {{ .ServiceName }}Server {{ .Extends }} {
+public interface {{ .ServiceName }}Server {{ .Extends }} {
{{ range $method := .Methods }}
{{/* If this method has multiple return arguments, generate the class. */}}
{{ if $method.IsMultipleRet }}
@@ -36,7 +36,7 @@
{{/* Generate the method signature. */}}
{{ $method.Doc }}
- {{ $method.AccessModifier }} {{ $method.RetType }} {{ $method.Name }}(final io.v.v23.context.VContext ctx, final io.v.v23.rpc.ServerCall call{{ $method.Args }}) throws io.v.v23.verror.VException;
+ {{ $method.RetType }} {{ $method.Name }}(final io.v.v23.context.VContext ctx, final io.v.v23.rpc.ServerCall call{{ $method.Args }}) throws io.v.v23.verror.VException;
{{ end }}
}
`
@@ -58,7 +58,6 @@
}
type serverInterfaceMethod struct {
- AccessModifier string
Args string
Doc string
Name string
@@ -84,7 +83,6 @@
}
return serverInterfaceMethod{
- AccessModifier: accessModifierForName(method.Name),
Args: args,
Doc: method.Doc,
Name: vdlutil.FirstRuneToLower(method.Name),
@@ -105,7 +103,6 @@
javaServiceName := vdlutil.FirstRuneToUpper(iface.Name)
data := struct {
FileDoc string
- AccessModifier string
Extends string
Methods []serverInterfaceMethod
PackagePath string
@@ -116,7 +113,6 @@
Source string
}{
FileDoc: iface.File.Package.FileDoc,
- AccessModifier: accessModifierForName(iface.Name),
Extends: javaServerExtendsStr(iface.Embeds),
Methods: methods,
PackagePath: javaPath(javaGenPkgPath(iface.File.Package.GenPath)),
