Fix javadoc errors introduced in Netflix#699

genie-common/src/main/java/com/netflix/genie/common/dto/v4/Criterion.java

@@ -60,7 +60,7 @@ public class Criterion {
     /**
      * Get the id of the resource desired if it exists.
      *
-     * @return {@link Optional<String>} wrapping the id
+     * @return {@link Optional} wrapping the id
      */
     public Optional<String> getId() {
         return Optional.ofNullable(this.id);
@@ -69,7 +69,7 @@ public Optional<String> getId() {
     /**
      * Get the name of the resource desired if it exists.
      *
-     * @return {@link Optional<String>} wrapping the name
+     * @return {@link Optional} wrapping the name
      */
     public Optional<String> getName() {
         return Optional.ofNullable(this.name);
@@ -78,7 +78,7 @@ public Optional<String> getName() {
     /**
      * Get the desired status of the resource if it has been set by the creator.
      *
-     * @return {@link Optional<String>} wrapping the status
+     * @return {@link Optional} wrapping the status
      */
     public Optional<String> getStatus() {
         return Optional.ofNullable(this.status);

genie-common/src/main/java/com/netflix/genie/common/dto/v4/JobRequest.java

@@ -153,7 +153,7 @@ public Builder withCommandArgs(@Nullable final List<String> commandArgs) {
         /**
          * Set the timeout (in seconds) that the job should be killed after by the service after it has started.
          *
-         * @param timeout The timeout. Must be greater >= 1 but preferably much higher
+         * @param timeout The timeout. Must be greater greater than or equal to 1 but preferably much higher
          * @return The builder
          */
         public Builder withTimeout(@Nullable final Integer timeout) {