Use curly braces for if statements (typetools#5034)

eisop · Feb 1, 2022 · f4375d4 · f4375d4
1 parent 96ab685
commit f4375d4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/DisbarUseTest.java
@@ -26,7 +26,7 @@ public DisbarUseTest(List<File> testFiles) {
   @Parameters
   public static String[] getTestDirs() {
     // Check for JDK 16+ without using a library:
-    if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])")) {
+    if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) {
       return new String[] {"disbaruse-records"};
     } else {
       return new String[] {};

diff --git a/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java b/checker/src/test/java/org/checkerframework/checker/test/junit/LockTest.java
@@ -19,7 +19,7 @@ public LockTest(List<File> testFiles) {
   @Parameters
   public static String[] getTestDirs() {
     // Check for JDK 16+ without using a library:
-    if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])")) {
+    if (System.getProperty("java.version").matches("^(1[6-9]|[2-9][0-9])\\..*")) {
       return new String[] {"lock", "lock-records", "all-systems"};
     } else {
       return new String[] {"lock", "all-systems"};

diff --git a/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileElementTypes.java b/framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileElementTypes.java
@@ -464,8 +464,9 @@ public void injectRecordComponentType(
           // if there is no accessor in the stubs file:
           RecordComponentStub recordComponentStub =
               recordComponentType.componentsByName.get(elt.getSimpleName().toString());
-          if (recordComponentStub != null && !recordComponentStub.hasAccessorInStubs())
+          if (recordComponentStub != null && !recordComponentStub.hasAccessorInStubs()) {
             replaceAnnotations(memberType.getReturnType(), recordComponentStub.type);
+          }
         }
       }
     } else if (elt.getKind() == ElementKind.CONSTRUCTOR) {