[
https://issues.apache.org/jira/browse/BEAM-4356?focusedWorklogId=107612&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-107612
]
ASF GitHub Bot logged work on BEAM-4356:
----------------------------------------
Author: ASF GitHub Bot
Created on: 31/May/18 08:42
Start Date: 31/May/18 08:42
Worklog Time Spent: 10m
Work Description: echauchot closed pull request #5513: [BEAM-4356]
Enforce ErrorProne analysis in nexmark
URL: https://github.com/apache/beam/pull/5513
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/sdks/java/nexmark/build.gradle b/sdks/java/nexmark/build.gradle
index 53739af1ac5..bc7a0f0e4b3 100644
--- a/sdks/java/nexmark/build.gradle
+++ b/sdks/java/nexmark/build.gradle
@@ -17,7 +17,7 @@
*/
apply from: project(":").file("build_rules.gradle")
-applyJavaNature()
+applyJavaNature(failOnWarning: true)
description = "Apache Beam :: SDKs :: Java :: Nexmark"
@@ -43,6 +43,7 @@ configurations {
dependencies {
compile library.java.guava
+ compileOnly library.java.findbugs_annotations
shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
shadow project(path: ":beam-sdks-java-io-google-cloud-platform",
configuration: "shadow")
shadow project(path:
":beam-sdks-java-extensions-google-cloud-platform-core", configuration:
"shadow")
@@ -63,6 +64,7 @@ dependencies {
shadow project(path: ":beam-runners-direct-java", configuration: "shadow")
shadow library.java.slf4j_jdk14
testCompile library.java.hamcrest_core
+ testCompileOnly library.java.findbugs_annotations
gradleRun project(path: project.path, configuration: "shadow")
gradleRun project(path: nexmarkRunnerDependency, configuration: "shadow")
diff --git
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkOptions.java
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkOptions.java
index 14a91bd71a3..592d1aa9c06 100644
---
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkOptions.java
+++
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkOptions.java
@@ -172,19 +172,16 @@
void setUseWallclockEventTime(Boolean useWallclockEventTime);
@Description("Assert pipeline results match model results.")
- @Nullable
boolean getAssertCorrectness();
void setAssertCorrectness(boolean assertCorrectness);
@Description("Log all input events.")
- @Nullable
boolean getLogEvents();
void setLogEvents(boolean logEvents);
@Description("Log all query results.")
- @Nullable
boolean getLogResults();
void setLogResults(boolean logResults);
@@ -282,7 +279,6 @@
@Description("If true, don't run the actual query. Instead, calculate the
distribution "
+ "of number of query results per (event time) minute according
to the query model.")
- @Nullable
boolean getJustModelResultRate();
void setJustModelResultRate(boolean justModelResultRate);
diff --git
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkSuite.java
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkSuite.java
index a6e9f6b2a20..3a6e1174d36 100644
---
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkSuite.java
+++
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/NexmarkSuite.java
@@ -25,6 +25,7 @@
/**
* A set of {@link NexmarkConfiguration}s.
*/
+@SuppressWarnings("ImmutableEnumChecker")
public enum NexmarkSuite {
/**
* The default.
diff --git
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/model/Event.java
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/model/Event.java
index 7a1d1f1c2b8..9f40eb85c2b 100644
---
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/model/Event.java
+++
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/model/Event.java
@@ -57,7 +57,7 @@ public int hashCode() {
AUCTION(1),
BID(2);
- private int value = -1;
+ private final int value;
Tag(int value) {
this.value = value;
diff --git
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/Query10.java
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/Query10.java
index 24d4d044f4e..a5f834bf682 100644
---
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/Query10.java
+++
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/queries/Query10.java
@@ -143,6 +143,8 @@ private String timingToString(PaneInfo.Timing timing) {
return "O";
case LATE:
return "L";
+ case UNKNOWN:
+ return "U";
}
throw new RuntimeException(); // cases are exhaustive
}
diff --git
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/sources/generator/model/AuctionGenerator.java
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/sources/generator/model/AuctionGenerator.java
index 41a81da35a1..2c43aa59527 100644
---
a/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/sources/generator/model/AuctionGenerator.java
+++
b/sdks/java/nexmark/src/main/java/org/apache/beam/sdk/nexmark/sources/generator/model/AuctionGenerator.java
@@ -127,7 +127,7 @@ private static long nextAuctionLengthMs(
long currentEventNumber = config.nextAdjustedEventNumber(eventsCountSoFar);
// How many events till we've generated numInFlightAuctions?
long numEventsForAuctions =
- (config.getNumInFlightAuctions() *
GeneratorConfig.PROPORTION_DENOMINATOR)
+ ((long) config.getNumInFlightAuctions() *
GeneratorConfig.PROPORTION_DENOMINATOR)
/ GeneratorConfig.AUCTION_PROPORTION;
// When will the auction numInFlightAuctions beyond now be generated?
long futureAuction = config
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 107612)
Time Spent: 1h 10m (was: 1h)
> Enforce ErrorProne analysis in the nexmark project
> --------------------------------------------------
>
> Key: BEAM-4356
> URL: https://issues.apache.org/jira/browse/BEAM-4356
> Project: Beam
> Issue Type: Improvement
> Components: examples-nexmark
> Reporter: Scott Wegner
> Assignee: Ismaël Mejía
> Priority: Minor
> Labels: errorprone, starter
> Time Spent: 1h 10m
> Remaining Estimate: 0h
>
> Java ErrorProne static analysis was [recently
> enabled|https://github.com/apache/beam/pull/5161] in the Gradle build
> process, but only as warnings. ErrorProne errors are generally useful and
> easy to fix. Some work was done to [make sdks-java-core
> ErrorProne-clean|https://github.com/apache/beam/pull/5319] and add
> enforcement. This task is clean ErrorProne warnings and add enforcement in
> {{beam-sdks-java-nexmark}}. Additional context discussed on the [dev
> list|https://lists.apache.org/thread.html/95aae2785c3cd728c2d3378cbdff2a7ba19caffcd4faa2049d2e2f46@%3Cdev.beam.apache.org%3E].
> Fixing this issue will involve:
> # Follow instructions in the [Contribution
> Guide|https://beam.apache.org/contribute/] to set up a {{beam}} development
> environment.
> # Run the following command to compile and run ErrorProne analysis on the
> project: {{./gradlew :beam-sdks-java-nexmark:assemble}}
> # Fix each ErrorProne warning from the {{sdks/java/nexmark}} project.
> # In {{sdks/java/nexmark/build.gradle}}, add {{failOnWarning: true}} to the
> call the {{applyJavaNature()}}
> ([example|https://github.com/apache/beam/pull/5319/files#diff-9390c20635aed5f42f83b97506a87333R20]).
> This starter issue is sponsored by [~swegner]. Feel free to [reach
> out|https://beam.apache.org/community/contact-us/] with questions or code
> review:
> * JIRA: [~swegner]
> * GitHub: [@swegner|https://github.com/swegner]
> * Slack: [@Scott Wegner|https://s.apache.org/beam-slack-channel]
> * Email: swegner at google dot com
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)