fixing javadocs (#3536)

joshfischer1108 · nicknezis · web-flow · commit d03c1122f63f · 2020-06-07T07:56:36.000-05:00
* fixing javadocs

* Adding back Pulsar Streamlet example

* Excluding examples folder from javadocs

* clean up

Co-authored-by: Nicholas Nezis &lt;nicholas.nezis@gmail.com&gt;
diff --git a/WORKSPACE b/WORKSPACE
@@ -73,15 +73,14 @@ maven_install(
         "org.apache.mesos:mesos:0.22.0",
         "com.hashicorp.nomad:nomad-sdk:0.7.0",
         "org.apache.hadoop:hadoop-core:0.20.2",
-        "org.apache.pulsar:pulsar-client:shaded:1.19.0-incubating",
+        "org.apache.pulsar:pulsar-client:1.19.0-incubating",
         "org.apache.kafka:kafka-clients:2.2.0",
         "com.google.apis:google-api-services-storage:v1-rev108-" + google_client_version,
         "org.apache.reef:reef-runtime-yarn:" + reef_version,
         "org.apache.reef:reef-runtime-local:" + reef_version,
         "org.apache.httpcomponents:httpclient:" + http_client_version,
         "org.apache.httpcomponents:httpmime:" + http_client_version,
         "com.google.apis:google-api-services-storage:v1-rev108-1.22.0",
-        "org.apache.pulsar:pulsar-client:jar:shaded:1.19.0-incubating",
         "io.kubernetes:client-java:7.0.0",
         "com.microsoft.dhalion:dhalion:0.2.3",
         "org.objenesis:objenesis:2.1",
diff --git a/examples/src/java/BUILD b/examples/src/java/BUILD
@@ -29,7 +29,7 @@ java_binary(
         "//heron/common/src/java:basics-java",
         "//heron/simulator/src/java:simulator-java",
         "//third_party/java:kryo",
-        "@maven//:org_apache_pulsar_pulsar_client_shaded",
+        "@maven//:org_apache_pulsar_pulsar_client",
     ],
 )
 
diff --git a/maven_install.json b/maven_install.json
@@ -1,6 +1,6 @@
 {
     "dependency_tree": {
-        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 607867898,
+        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -512671146,
         "conflict_resolution": {},
         "dependencies": [
             {
@@ -5020,47 +5020,6 @@
                 "sha256": "7175f2fcdef0dd30d3149f2e96ba55134fa490f36ae12795139a30f8d507dc46",
                 "url": "https://jcenter.bintray.com/org/apache/pulsar/pulsar-client/1.19.0-incubating/pulsar-client-1.19.0-incubating.jar"
             },
-            {
-                "coord": "org.apache.pulsar:pulsar-client:jar:shaded:1.19.0-incubating",
-                "dependencies": [
-                    "com.fasterxml.jackson.core:jackson-annotations:2.8.8",
-                    "org.apache.pulsar:pulsar-checksum:1.19.0-incubating",
-                    "org.asynchttpclient:netty-codec-dns:2.0.31",
-                    "org.asynchttpclient:netty-resolver:2.0.31",
-                    "org.slf4j:slf4j-api:1.7.30",
-                    "commons-codec:commons-codec:1.11",
-                    "org.reactivestreams:reactive-streams:1.0.0",
-                    "org.apache.commons:commons-lang3:3.7",
-                    "com.typesafe.netty:netty-reactive-streams:1.0.8",
-                    "com.google.protobuf:protobuf-java:3.4.0",
-                    "com.google.guava:guava:18.0",
-                    "org.asynchttpclient:netty-resolver-dns:2.0.31",
-                    "org.apache.pulsar:pulsar-common:1.19.0-incubating",
-                    "com.fasterxml.jackson.core:jackson-databind:2.8.8",
-                    "com.yahoo.datasketches:sketches-core:0.6.0",
-                    "org.asynchttpclient:async-http-client:2.0.31",
-                    "org.asynchttpclient:async-http-client-netty-utils:2.0.31",
-                    "com.fasterxml.jackson.core:jackson-core:2.8.8",
-                    "io.netty:netty-all:4.1.22.Final",
-                    "net.jpountz.lz4:lz4:1.3.0"
-                ],
-                "directDependencies": [
-                    "org.slf4j:slf4j-api:1.7.30",
-                    "commons-codec:commons-codec:1.11",
-                    "org.apache.commons:commons-lang3:3.7",
-                    "org.apache.pulsar:pulsar-common:1.19.0-incubating",
-                    "com.yahoo.datasketches:sketches-core:0.6.0",
-                    "org.asynchttpclient:async-http-client:2.0.31"
-                ],
-                "file": "v1/https/jcenter.bintray.com/org/apache/pulsar/pulsar-client/1.19.0-incubating/pulsar-client-1.19.0-incubating-shaded.jar",
-                "mirror_urls": [
-                    "https://jcenter.bintray.com/org/apache/pulsar/pulsar-client/1.19.0-incubating/pulsar-client-1.19.0-incubating-shaded.jar",
-                    "https://maven.google.com/org/apache/pulsar/pulsar-client/1.19.0-incubating/pulsar-client-1.19.0-incubating-shaded.jar",
-                    "https://repo1.maven.org/maven2/org/apache/pulsar/pulsar-client/1.19.0-incubating/pulsar-client-1.19.0-incubating-shaded.jar"
-                ],
-                "sha256": "7f740effec8dbce3f16e4081ee08f3d16a6419899520495933facdc9c8d5f5c1",
-                "url": "https://jcenter.bintray.com/org/apache/pulsar/pulsar-client/1.19.0-incubating/pulsar-client-1.19.0-incubating-shaded.jar"
-            },
             {
                 "coord": "org.apache.pulsar:pulsar-client:jar:sources:1.19.0-incubating",
                 "dependencies": [
diff --git a/website2/website/scripts/javadocs.sh b/website2/website/scripts/javadocs.sh
@@ -38,26 +38,26 @@ else
 fi
 
 (cd $HERON_ROOT_DIR && $BAZEL_CMD \
-  `bazel query 'kind("java_library", "heron/...")'`\
+  `bazel query 'kind("java_library", "heron/...")'` \
+  `bazel query 'kind("java_library", "contrib/...")'` \
   `bazel query 'kind("java_test", "heron/...")'` \
   `bazel query 'kind("java_library", "integration_test/...")'`)
 
-HERON_SRC_FILES=`find $HERON_ROOT_DIR -path "*/org/apache/*" -name "*.java" -not -path "$HERON_ROOT_DIR/tools/*"`
+HERON_SRC_FILES=`find $HERON_ROOT_DIR -path "*/org/apache/*" -name "*.java" -not -path "$HERON_ROOT_DIR/tools/*" -not -path "$HERON_ROOT_DIR/examples/*"`
 BACKTYPE_SRC_FILES=`find $HERON_ROOT_DIR -path "*/backtype/storm/*" -name "*.java"`
 APACHE_SRC_FILES=`find $HERON_ROOT_DIR -path "*/org/apache/storm/*" -name "*.java"`
 GEN_FILES=`find $GEN_PROTO_DIR -name "*.java"`
 
 rm -rf $JAVADOC_OUTPUT_DIR
 mkdir -p $JAVADOC_OUTPUT_DIR
 
-BIN_JARS=`find $HERON_ROOT_DIR/bazel-incubator-heron/_bin/. -name "*\.jar" | tr '\n' ':'`
 GEN_JARS=`find $HERON_ROOT_DIR/bazel-bin/external/. -name "*\.jar" | tr '\n' ':'`
 SCRIBE_JARS=`find $HERON_ROOT_DIR/bazel-bin/. -name "libthrift_scribe_java.jar" | tr '\n' ':'`
 PROTO_JARS=`find $HERON_ROOT_DIR/bazel-bin/heron/proto/. -name "*\.jar" | tr '\n' ':'`
 CLOSURE_CLASSES="$HERON_ROOT_DIR/bazel-bin/storm-compatibility/src/java/_javac/storm-compatibility-java/libstorm-compatibility-java_classes/."
 CONTRIB_JARS=`find $HERON_ROOT_DIR/bazel-bin/contrib/. -name "*\.jar" | tr '\n' ':'`
 
-export CLASSPATH=$BIN_JARS:$GEN_JARS:$SCRIBE_JARS:$PROTO_JARS:$CLOSURE_CLASSES:$CONTRIB_JARS
+export CLASSPATH=$GEN_JARS:$SCRIBE_JARS:$PROTO_JARS:$CLOSURE_CLASSES:$CONTRIB_JARS
 
 $JAVADOC $FLAGS \
   -encoding "UTF-8" \
@@ -74,7 +74,8 @@ $JAVADOC $FLAGS \
 # 2. ``wget`` needs to verify if links to Java API doc are valid when we are
 #    serving the website locally. This means that Hugo should be able to display
 #    Java API doc properly.
-cp -r $JAVADOC_OUTPUT_DIR $JAVADOC_OUTPUT_LOCAL_DIR
 
-echo "Javdocs generated at $JAVADOC_OUTPUT_DIR"
+cp -r $JAVADOC_OUTPUT_DIR $JAVADOC_OUTPUT_LOCAL_DIR
+echo "Javadocs generated at $JAVADOC_OUTPUT_DIR"
+echo "Javadocs copied to: $JAVADOC_OUTPUT_LOCAL_DIR"
 exit 0

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ java_binary(`
`29`	`29`	`"//heron/common/src/java:basics-java",`
`30`	`30`	`"//heron/simulator/src/java:simulator-java",`
`31`	`31`	`"//third_party/java:kryo",`
`32`		`- "@maven//:org_apache_pulsar_pulsar_client_shaded",`
	`32`	`+ "@maven//:org_apache_pulsar_pulsar_client",`
`33`	`33`	`],`
`34`	`34`	`)`
`35`	`35`