src/java.base/share/classes/jdk/Version.java

rev 14279 : [mq]: 8140281-deprecation-optional.get

*** 457,468 ****
              if (oPre.isPresent())
                  return 1;
          } else {
              if (!oPre.isPresent())
                  return -1;
!             String val = pre.get();
!             String oVal = oPre.get();
              if (val.matches("\\d+")) {
                  return (oVal.matches("\\d+")
                          ? (new BigInteger(val)).compareTo(new BigInteger(oVal))
                          : -1);
              } else {
--- 457,468 ----
              if (oPre.isPresent())
                  return 1;
          } else {
              if (!oPre.isPresent())
                  return -1;
!             String val = pre.getWhenPresent();
!             String oVal = oPre.getWhenPresent();
              if (val.matches("\\d+")) {
                  return (oVal.matches("\\d+")
                          ? (new BigInteger(val)).compareTo(new BigInteger(oVal))
                          : -1);
              } else {
*** 476,486 ****
  
      private int compareBuild(Version ob) {
          Optional<Integer> oBuild = ob.build();
          if (oBuild.isPresent()) {
              return (build.isPresent()
!                    ? build.get().compareTo(oBuild.get())
                     : 1);
          } else if (build.isPresent()) {
              return -1;
          }
          return 0;
--- 476,486 ----
  
      private int compareBuild(Version ob) {
          Optional<Integer> oBuild = ob.build();
          if (oBuild.isPresent()) {
              return (build.isPresent()
!                    ? build.getWhenPresent().compareTo(oBuild.getWhenPresent())
                     : 1);
          } else if (build.isPresent()) {
              return -1;
          }
          return 0;
*** 492,502 ****
              if (oOpt.isPresent())
                  return -1;
          } else {
              if (!oOpt.isPresent())
                  return 1;
!             return optional.get().compareTo(oOpt.get());
          }
          return 0;
      }
  
      /**
--- 492,502 ----
              if (oOpt.isPresent())
                  return -1;
          } else {
              if (!oOpt.isPresent())
                  return 1;
!             return optional.getWhenPresent().compareTo(oOpt.getWhenPresent());
          }
          return 0;
      }
  
      /**
*** 511,527 ****
                                  .map(Object::toString)
                                  .collect(Collectors.joining(".")));
          pre.ifPresent(v -> sb.append("-").append(v));
  
          if (build.isPresent()) {
!             sb.append("+").append(build.get());
              if (optional.isPresent())
!                 sb.append("-").append(optional.get());
          } else {
              if (optional.isPresent()) {
                  sb.append(pre.isPresent() ? "-" : "+-");
!                 sb.append(optional.get());
              }
          }
  
          return sb.toString();
      }
--- 511,527 ----
                                  .map(Object::toString)
                                  .collect(Collectors.joining(".")));
          pre.ifPresent(v -> sb.append("-").append(v));
  
          if (build.isPresent()) {
!             sb.append("+").append(build.getWhenPresent());
              if (optional.isPresent())
!                 sb.append("-").append(optional.getWhenPresent());
          } else {
              if (optional.isPresent()) {
                  sb.append(pre.isPresent() ? "-" : "+-");
!                 sb.append(optional.getWhenPresent());
              }
          }
  
          return sb.toString();
      }