Code cleanup on skylarkbuildapi classes.
Removed redundant "abstract" and "public static" modifiers.
PiperOrigin-RevId: 284659300
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java
index a2fca54..744292d 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/GeneratedExtensionRegistryProviderApi.java
@@ -52,7 +52,7 @@
/** The provider implementing this can construct the GeneratedExtensionRegistryProvider. */
@SkylarkModule(name = "Provider", doc = "", documented = false)
- public interface Provider<FileT extends FileApi> extends ProviderApi {
+ interface Provider<FileT extends FileApi> extends ProviderApi {
@SkylarkCallable(
name = NAME,
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaAnnotationProcessingApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaAnnotationProcessingApi.java
index cdfeea7..0b21246 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaAnnotationProcessingApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaAnnotationProcessingApi.java
@@ -34,29 +34,26 @@
public interface JavaAnnotationProcessingApi<FileTypeT extends FileApi> extends StarlarkValue {
@SkylarkCallable(
- name = "enabled",
- structField = true,
- doc = "Returns true if the Java rule uses annotation processing."
- )
- public boolean usesAnnotationProcessing();
+ name = "enabled",
+ structField = true,
+ doc = "Returns true if the Java rule uses annotation processing.")
+ boolean usesAnnotationProcessing();
@SkylarkCallable(
- name = "class_jar",
- structField = true,
- allowReturnNones = true,
- doc = "Returns a jar File that is a result of annotation processing for this rule."
- )
+ name = "class_jar",
+ structField = true,
+ allowReturnNones = true,
+ doc = "Returns a jar File that is a result of annotation processing for this rule.")
@Nullable
- public FileTypeT getGenClassJar();
+ FileTypeT getGenClassJar();
@SkylarkCallable(
- name = "source_jar",
- structField = true,
- allowReturnNones = true,
- doc = "Returns a source archive resulting from annotation processing of this rule."
- )
+ name = "source_jar",
+ structField = true,
+ allowReturnNones = true,
+ doc = "Returns a source archive resulting from annotation processing of this rule.")
@Nullable
- public FileTypeT getGenSourceJar();
+ FileTypeT getGenSourceJar();
@SkylarkCallable(
name = "transitive_class_jars",
@@ -64,7 +61,7 @@
doc =
"Returns a transitive set of class file jars resulting from annotation "
+ "processing of this rule and its dependencies.")
- public Depset /*<FileTypeT>*/ getTransitiveGenClassJarsForStarlark();
+ Depset /*<FileTypeT>*/ getTransitiveGenClassJarsForStarlark();
@SkylarkCallable(
name = "transitive_source_jars",
@@ -72,19 +69,17 @@
doc =
"Returns a transitive set of source archives resulting from annotation processing "
+ "of this rule and its dependencies.")
- public Depset /*<FileTypeT>*/ getTransitiveGenSourceJarsForStarlark();
+ Depset /*<FileTypeT>*/ getTransitiveGenSourceJarsForStarlark();
@SkylarkCallable(
name = "processor_classpath",
structField = true,
doc = "Returns a classpath of annotation processors applied to this rule.")
- public Depset /*<FileTypeT>*/ getProcessorClasspathForStarlark();
+ Depset /*<FileTypeT>*/ getProcessorClasspathForStarlark();
@SkylarkCallable(
- name = "processor_classnames",
- structField = true,
- doc =
- "Returns class names of annotation processors applied to this rule."
- )
- public ImmutableList<String> getProcessorClassNames();
+ name = "processor_classnames",
+ structField = true,
+ doc = "Returns class names of annotation processors applied to this rule.")
+ ImmutableList<String> getProcessorClassNames();
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCcLinkParamsProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCcLinkParamsProviderApi.java
index 3fa17b5..969fe4d 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCcLinkParamsProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCcLinkParamsProviderApi.java
@@ -36,7 +36,7 @@
category = SkylarkModuleCategory.PROVIDER)
public interface JavaCcLinkParamsProviderApi<CcInfoApiT extends CcInfoApi> extends StarlarkValue {
/** Name of this info object. */
- public static String NAME = "JavaCcLinkParamsInfo";
+ String NAME = "JavaCcLinkParamsInfo";
/** Returns the cc linking info */
@SkylarkCallable(
@@ -54,7 +54,7 @@
"Do not use this module. It is intended for migration purposes only. If you depend on "
+ "it, you will be broken when it is removed.",
documented = false)
- public interface Provider<CcInfoApiT extends CcInfoApi> extends ProviderApi {
+ interface Provider<CcInfoApiT extends CcInfoApi> extends ProviderApi {
@SkylarkCallable(
name = NAME,
@@ -71,7 +71,6 @@
},
selfCall = true)
@SkylarkConstructor(objectType = JavaCcLinkParamsProviderApi.class, receiverNameForDoc = NAME)
- public JavaCcLinkParamsProviderApi<CcInfoApiT> createInfo(CcInfoApiT store)
- throws EvalException;
+ JavaCcLinkParamsProviderApi<CcInfoApiT> createInfo(CcInfoApiT store) throws EvalException;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java
index 6155715..5e97471 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java
@@ -51,7 +51,7 @@
"Returns the Java declared provider. <br>"
+ "The same value is accessible as <code>JavaInfo</code>. <br>"
+ "Prefer using <code>JavaInfo</code> in new code.")
- public ProviderApi getJavaProvider();
+ ProviderApi getJavaProvider();
@SkylarkCallable(
name = "compile",
@@ -203,7 +203,7 @@
},
useLocation = true,
useStarlarkThread = true)
- public JavaInfoT createJavaCompileAction(
+ JavaInfoT createJavaCompileAction(
SkylarkRuleContextT skylarkRuleContext,
Sequence<?> sourceJars, // <FileT> expected.
Sequence<?> sourceFiles, // <FileT> expected.
@@ -267,7 +267,7 @@
},
useStarlarkSemantics = true,
useLocation = true)
- public FileApi runIjar(
+ FileApi runIjar(
SkylarkActionFactoryT actions,
FileT jar,
Object targetLabel,
@@ -317,7 +317,7 @@
},
useStarlarkSemantics = true,
useLocation = true)
- public FileApi stampJar(
+ FileApi stampJar(
SkylarkActionFactoryT actions,
FileT jar,
Label targetLabel,
@@ -379,7 +379,7 @@
allowReturnNones = true,
useStarlarkSemantics = true,
useLocation = true)
- public FileApi packSources(
+ FileApi packSources(
SkylarkActionFactoryT actions,
FileT outputJar,
Sequence<?> sourceFiles, // <FileT> expected.
@@ -408,7 +408,7 @@
useLocation = true)
// TODO(b/78512644): migrate callers to passing explicit javacopts or using custom toolchains, and
// delete
- public ImmutableList<String> getDefaultJavacOpts(JavaToolchainT javaToolchain, Location loc)
+ ImmutableList<String> getDefaultJavacOpts(JavaToolchainT javaToolchain, Location loc)
throws EvalException;
@SkylarkCallable(
@@ -423,7 +423,7 @@
generic1 = JavaInfoApi.class,
doc = "The list of providers to merge."),
})
- public JavaInfoT mergeJavaProviders(Sequence<?> providers /* <JavaInfoT> expected. */)
+ JavaInfoT mergeJavaProviders(Sequence<?> providers /* <JavaInfoT> expected. */)
throws EvalException;
@SkylarkCallable(
@@ -439,7 +439,7 @@
type = JavaInfoApi.class,
doc = "The java info."),
})
- public JavaInfoT makeNonStrict(JavaInfoT javaInfo);
+ JavaInfoT makeNonStrict(JavaInfoT javaInfo);
@SkylarkCallable(
name = "JavaToolchainInfo",
@@ -447,7 +447,7 @@
"The key used to retrieve the provider that contains information about the Java "
+ "toolchain being used.",
structField = true)
- public ProviderApi getJavaToolchainProvider();
+ ProviderApi getJavaToolchainProvider();
@SkylarkCallable(
name = "JavaRuntimeInfo",
@@ -455,7 +455,7 @@
"The key used to retrieve the provider that contains information about the Java "
+ "runtime being used.",
structField = true)
- public ProviderApi getJavaRuntimeProvider();
+ ProviderApi getJavaRuntimeProvider();
@SkylarkCallable(
name = "is_java_toolchain_resolution_enabled_do_not_use",
@@ -476,7 +476,7 @@
doc = "The provider used to supply message bundles for translation",
structField = true,
enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API)
- public ProviderApi getMessageBundleInfo();
+ ProviderApi getMessageBundleInfo();
@SkylarkCallable(
name = "add_constraints",
@@ -498,8 +498,8 @@
doc = "Constraints to add")
},
enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API)
- public JavaInfoT addConstraints(
- JavaInfoT javaInfo, Sequence<?> constraints /* <String> expected. */) throws EvalException;
+ JavaInfoT addConstraints(JavaInfoT javaInfo, Sequence<?> constraints /* <String> expected. */)
+ throws EvalException;
@SkylarkCallable(
name = "experimental_disable_annotation_processing",
@@ -517,7 +517,7 @@
doc = "The JavaInfo to process.")
},
enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API)
- public JavaInfoT removeAnnotationProcessors(JavaInfoT javaInfo);
+ JavaInfoT removeAnnotationProcessors(JavaInfoT javaInfo);
@SkylarkCallable(
name = "compile_time_jdeps",
@@ -531,7 +531,7 @@
doc = "The JavaInfo to query."),
},
enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API)
- public Depset /*<FileT>*/ getCompileTimeJavaDependencyArtifacts(JavaInfoT javaInfo);
+ Depset /*<FileT>*/ getCompileTimeJavaDependencyArtifacts(JavaInfoT javaInfo);
@SkylarkCallable(
name = "add_compile_time_jdeps",
@@ -553,7 +553,7 @@
doc = "Compile-time jdeps files to add.")
},
enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API)
- public JavaInfoT addCompileTimeJavaDependencyArtifacts(
+ JavaInfoT addCompileTimeJavaDependencyArtifacts(
JavaInfoT javaInfo, Sequence<?> compileTimeJavaDependencyArtifacts /* <FileT> expected. */)
throws EvalException;
@@ -570,6 +570,6 @@
},
useLocation = true,
enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_GOOGLE_LEGACY_API)
- public Label getJavaToolchainLabel(
- JavaToolchainSkylarkApiProviderApi toolchain, Location location) throws EvalException;
+ Label getJavaToolchainLabel(JavaToolchainSkylarkApiProviderApi toolchain, Location location)
+ throws EvalException;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCompilationInfoProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCompilationInfoProviderApi.java
index 51243f3..b06f19c 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCompilationInfoProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCompilationInfoProviderApi.java
@@ -30,23 +30,23 @@
public interface JavaCompilationInfoProviderApi<FileT extends FileApi> extends StarlarkValue {
@SkylarkCallable(name = "javac_options", structField = true, doc = "Options to java compiler.")
- public ImmutableList<String> getJavacOpts();
+ ImmutableList<String> getJavacOpts();
@SkylarkCallable(
name = "runtime_classpath",
structField = true,
doc = "Run-time classpath for this Java target.")
- public Depset /*<FileT>*/ getRuntimeClasspath();
+ Depset /*<FileT>*/ getRuntimeClasspath();
@SkylarkCallable(
name = "compilation_classpath",
structField = true,
doc = "Compilation classpath for this Java target.")
- public Depset /*<FileT>*/ getCompilationClasspath();
+ Depset /*<FileT>*/ getCompilationClasspath();
@SkylarkCallable(
name = "boot_classpath",
structField = true,
doc = "Boot classpath for this Java target.")
- public ImmutableList<FileT> getBootClasspath();
+ ImmutableList<FileT> getBootClasspath();
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaConfigurationApi.java
index dc8cbd1..b2195e1 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaConfigurationApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaConfigurationApi.java
@@ -28,22 +28,23 @@
category = SkylarkModuleCategory.CONFIGURATION_FRAGMENT)
public interface JavaConfigurationApi extends StarlarkValue {
- @SkylarkCallable(name = "default_javac_flags", structField = true,
+ @SkylarkCallable(
+ name = "default_javac_flags",
+ structField = true,
doc = "The default flags for the Java compiler.")
// TODO(bazel-team): this is the command-line passed options, we should remove from skylark
// probably.
- public ImmutableList<String> getDefaultJavacFlags();
+ ImmutableList<String> getDefaultJavacFlags();
@SkylarkCallable(
name = "strict_java_deps",
structField = true,
- doc = "The value of the strict_java_deps flag."
- )
- public String getStrictJavaDepsName();
+ doc = "The value of the strict_java_deps flag.")
+ String getStrictJavaDepsName();
@SkylarkCallable(
name = "plugins",
structField = true,
doc = "A list containing the labels provided with --plugins, if any.")
- public ImmutableList<Label> getPlugins();
+ ImmutableList<Label> getPlugins();
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaInfoApi.java
index d869474..271cb71 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaInfoApi.java
@@ -43,7 +43,7 @@
+ " href=\"JavaInfo.html#transitive_runtime_deps\">JavaInfo.transitive_runtime_deps"
+ "</a></code> for legacy reasons.",
structField = true)
- public Depset getTransitiveRuntimeJars();
+ Depset getTransitiveRuntimeJars();
@SkylarkCallable(
name = "transitive_compile_time_jars",
@@ -53,7 +53,7 @@
+ " href=\"JavaInfo.html#transitive_deps\">JavaInfo.transitive_deps</a></code> for"
+ " legacy reasons.",
structField = true)
- public Depset getTransitiveCompileTimeJars();
+ Depset getTransitiveCompileTimeJars();
@SkylarkCallable(
name = "compile_jars",
@@ -62,7 +62,7 @@
+ " interface jars (ijar or hjar), regular jars or both, depending on whether rule"
+ " implementations chose to create interface jars or not.",
structField = true)
- public Depset getCompileTimeJars();
+ Depset getCompileTimeJars();
@SkylarkCallable(
name = "full_compile_jars",
@@ -81,7 +81,7 @@
+ " <code><a class=\"anchor\""
+ " href=\"JavaInfo.html#compile_jars\">JavaInfo.compile_jars</a></code></li>",
structField = true)
- public Depset getFullCompileTimeJars();
+ Depset getFullCompileTimeJars();
@SkylarkCallable(
name = "source_jars",
@@ -90,34 +90,34 @@
+ " annotations) of the target itself, i.e. NOT including the sources of the"
+ " transitive dependencies.",
structField = true)
- public Sequence<FileT> getSourceJars();
+ Sequence<FileT> getSourceJars();
@SkylarkCallable(
name = "outputs",
doc = "Returns information about outputs of this Java/Java-like target.",
structField = true,
allowReturnNones = true)
- public JavaRuleOutputJarsProviderApi<?> getOutputJars();
+ JavaRuleOutputJarsProviderApi<?> getOutputJars();
@SkylarkCallable(
name = "annotation_processing",
structField = true,
allowReturnNones = true,
doc = "Returns information about annotation processing for this Java/Java-like target.")
- public JavaAnnotationProcessingApi<?> getGenJarsProvider();
+ JavaAnnotationProcessingApi<?> getGenJarsProvider();
@SkylarkCallable(
name = "compilation_info",
structField = true,
allowReturnNones = true,
doc = "Returns compilation information for this Java/Java-like target.")
- public JavaCompilationInfoProviderApi<?> getCompilationInfoProvider();
+ JavaCompilationInfoProviderApi<?> getCompilationInfoProvider();
@SkylarkCallable(
name = "runtime_output_jars",
doc = "Returns a list of runtime Jars created by this Java/Java-like target.",
structField = true)
- public Sequence<FileT> getRuntimeOutputJars();
+ Sequence<FileT> getRuntimeOutputJars();
@SkylarkCallable(
name = "transitive_deps",
@@ -127,7 +127,7 @@
+ " href=\"JavaInfo.html#transitive_compile_time_jars\">JavaInfo.transitive_compile_time_jars</a></code>"
+ " for legacy reasons.",
structField = true)
- public Depset /*<FileT>*/ getTransitiveDeps();
+ Depset /*<FileT>*/ getTransitiveDeps();
@SkylarkCallable(
name = "transitive_runtime_deps",
@@ -137,7 +137,7 @@
+ " href=\"JavaInfo.html#transitive_runtime_jars\">JavaInfo.transitive_runtime_jars"
+ "</a></code> for legacy reasons.",
structField = true)
- public Depset /*<FileT>*/ getTransitiveRuntimeDeps();
+ Depset /*<FileT>*/ getTransitiveRuntimeDeps();
@SkylarkCallable(
name = "transitive_source_jars",
@@ -145,17 +145,17 @@
"Returns the Jars containing source files of the current target and all of its"
+ " transitive dependencies.",
structField = true)
- public Depset /*<FileT>*/ getTransitiveSourceJars();
+ Depset /*<FileT>*/ getTransitiveSourceJars();
@SkylarkCallable(
name = "transitive_exports",
structField = true,
doc = "Returns a set of labels that are being exported from this rule transitively.")
- public Depset /*<Label>*/ getTransitiveExports();
+ Depset /*<Label>*/ getTransitiveExports();
/** Provider class for {@link JavaInfoApi} objects. */
@SkylarkModule(name = "Provider", documented = false, doc = "")
- public interface JavaInfoProviderApi extends ProviderApi {
+ interface JavaInfoProviderApi extends ProviderApi {
@SkylarkCallable(
name = "JavaInfo",
@@ -239,7 +239,7 @@
useLocation = true,
useStarlarkThread = true)
@SkylarkConstructor(objectType = JavaInfoApi.class, receiverNameForDoc = "JavaInfo")
- public JavaInfoApi<?> javaInfo(
+ JavaInfoApi<?> javaInfo(
FileApi outputJarApi,
Object compileJarApi,
Object sourceJarApi,
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java
index 2f551bc..f4647c2 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java
@@ -61,7 +61,7 @@
type = String.class,
defaultValue = "'java'")
})
- public void createProtoCompileAction(
+ void createProtoCompileAction(
SkylarkRuleContextT skylarkRuleContext,
TransitiveInfoCollectionT target,
FileT sourceJar,
@@ -71,36 +71,33 @@
@SkylarkCallable(
name = "has_proto_sources",
- doc = "Returns whether the given proto_library target contains proto sources. If there are no"
- + " sources it means that the proto_library is an alias library, which exports its"
- + " dependencies.",
+ doc =
+ "Returns whether the given proto_library target contains proto sources. If there are no"
+ + " sources it means that the proto_library is an alias library, which exports its"
+ + " dependencies.",
parameters = {
@Param(
name = "target",
positional = true,
named = false,
type = TransitiveInfoCollectionApi.class,
- doc = "The proto_library target."
- ),
- }
- )
- public boolean hasProtoSources(TransitiveInfoCollectionT target);
+ doc = "The proto_library target."),
+ })
+ boolean hasProtoSources(TransitiveInfoCollectionT target);
@SkylarkCallable(
- name = "toolchain_deps",
- // This function is experimental for now.
- documented = false,
- parameters = {
- @Param(
- name = "ctx",
- positional = true,
- named = false,
- type = SkylarkRuleContextApi.class,
- doc = "The rule context."
- ),
- @Param(name = "proto_toolchain_attr", positional = false, named = true, type = String.class)
- }
- )
- public JavaInfoApi<FileT> getRuntimeToolchainProvider(
+ name = "toolchain_deps",
+ // This function is experimental for now.
+ documented = false,
+ parameters = {
+ @Param(
+ name = "ctx",
+ positional = true,
+ named = false,
+ type = SkylarkRuleContextApi.class,
+ doc = "The rule context."),
+ @Param(name = "proto_toolchain_attr", positional = false, named = true, type = String.class)
+ })
+ JavaInfoApi<FileT> getRuntimeToolchainProvider(
SkylarkRuleContextT skylarkRuleContext, String protoToolchainAttr) throws EvalException;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuleOutputJarsProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuleOutputJarsProviderApi.java
index 8a6b063..859cb9c 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuleOutputJarsProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuleOutputJarsProviderApi.java
@@ -30,21 +30,19 @@
extends StarlarkValue {
@SkylarkCallable(name = "jars", doc = "A list of jars the rule outputs.", structField = true)
- public ImmutableList<OutputJarT> getOutputJars();
+ ImmutableList<OutputJarT> getOutputJars();
@SkylarkCallable(
- name = "jdeps",
- doc = "The jdeps file for rule outputs.",
- structField = true,
- allowReturnNones = true
- )
- public FileApi getJdeps();
+ name = "jdeps",
+ doc = "The jdeps file for rule outputs.",
+ structField = true,
+ allowReturnNones = true)
+ FileApi getJdeps();
@SkylarkCallable(
- name = "native_headers",
- doc = "An archive of native header files.",
- structField = true,
- allowReturnNones = true
- )
- public FileApi getNativeHeaders();
+ name = "native_headers",
+ doc = "An archive of native header files.",
+ structField = true,
+ allowReturnNones = true)
+ FileApi getNativeHeaders();
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuntimeClasspathProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuntimeClasspathProviderApi.java
index 5f96b9e..ea1f3ec 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuntimeClasspathProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaRuntimeClasspathProviderApi.java
@@ -24,5 +24,5 @@
public interface JavaRuntimeClasspathProviderApi extends StarlarkValue {
@SkylarkCallable(name = "runtime_classpath", documented = false, structField = true)
- public Depset /*<File>*/ getRuntimeClasspath();
+ Depset /*<File>*/ getRuntimeClasspath();
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaToolchainSkylarkApiProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaToolchainSkylarkApiProviderApi.java
index cfa2af6..4d26d34 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaToolchainSkylarkApiProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaToolchainSkylarkApiProviderApi.java
@@ -37,33 +37,33 @@
String LEGACY_NAME = "java_toolchain";
@SkylarkCallable(name = "source_version", doc = "The java source version.", structField = true)
- public String getSourceVersion();
+ String getSourceVersion();
@SkylarkCallable(name = "target_version", doc = "The java target version.", structField = true)
- public String getTargetVersion();
+ String getTargetVersion();
@SkylarkCallable(
name = "javac_jar",
doc = "The javac jar.",
structField = true,
allowReturnNones = true)
- public FileApi getJavacJar();
+ FileApi getJavacJar();
@SkylarkCallable(name = "single_jar", doc = "The SingleJar deploy jar.", structField = true)
- public FileApi getSingleJar();
+ FileApi getSingleJar();
@SkylarkCallable(
name = "bootclasspath",
doc = "The Java target bootclasspath entries. Corresponds to javac's -bootclasspath flag.",
structField = true)
- public Depset getSkylarkBootclasspath();
+ Depset getSkylarkBootclasspath();
@SkylarkCallable(
name = "jvm_opt",
doc = "The default options for the JVM running the java compiler and associated tools.",
structField = true)
- public Sequence<String> getSkylarkJvmOptions();
+ Sequence<String> getSkylarkJvmOptions();
@SkylarkCallable(name = "tools", doc = "The compilation tools.", structField = true)
- public Depset getSkylarkTools();
+ Depset getSkylarkTools();
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/OutputJarApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/OutputJarApi.java
index 4c2f404..d794550 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/OutputJarApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/OutputJarApi.java
@@ -29,20 +29,18 @@
public interface OutputJarApi<FileT extends FileApi> extends StarlarkValue {
@SkylarkCallable(
- name = "class_jar",
- doc = "A classes jar file.",
- allowReturnNones = true,
- structField = true
- )
- public FileT getClassJar();
+ name = "class_jar",
+ doc = "A classes jar file.",
+ allowReturnNones = true,
+ structField = true)
+ FileT getClassJar();
@SkylarkCallable(
- name = "ijar",
- doc = "A interface jar file.",
- allowReturnNones = true,
- structField = true
- )
- public FileT getIJar();
+ name = "ijar",
+ doc = "A interface jar file.",
+ allowReturnNones = true,
+ structField = true)
+ FileT getIJar();
@SkylarkCallable(
name = "manifest_proto",
@@ -51,22 +49,22 @@
+ "JavaBuilder.",
allowReturnNones = true,
structField = true)
- public FileT getManifestProto();
+ FileT getManifestProto();
@SkylarkCallable(
- name = "source_jar",
- doc = "A sources archive file. Deprecated. Kept for migration reasons. "
- + "Please use source_jars instead.",
- allowReturnNones = true,
- structField = true
- )
+ name = "source_jar",
+ doc =
+ "A sources archive file. Deprecated. Kept for migration reasons. "
+ + "Please use source_jars instead.",
+ allowReturnNones = true,
+ structField = true)
@Deprecated
- public FileT getSrcJar();
+ FileT getSrcJar();
@SkylarkCallable(
name = "source_jars",
doc = "A list of sources archive files.",
allowReturnNones = true,
structField = true)
- public Sequence<FileT> getSrcJarsSkylark();
+ Sequence<FileT> getSrcJarsSkylark();
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/ProguardSpecProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/ProguardSpecProviderApi.java
index 0631025..fe88938 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/ProguardSpecProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/ProguardSpecProviderApi.java
@@ -31,14 +31,14 @@
category = SkylarkModuleCategory.PROVIDER)
public interface ProguardSpecProviderApi<FileT extends FileApi> extends StructApi {
- public static final String NAME = "ProguardSpecProvider";
+ String NAME = "ProguardSpecProvider";
@SkylarkCallable(name = "specs", structField = true, doc = "", documented = false)
Depset /*<FileT>*/ getTransitiveProguardSpecsForStarlark();
/** The provider implementing this can construct the ProguardSpecProvider. */
@SkylarkModule(name = "Provider", doc = "", documented = false)
- public interface Provider<FileT extends FileApi> extends ProviderApi {
+ interface Provider<FileT extends FileApi> extends ProviderApi {
@SkylarkCallable(
name = NAME,
