Issue #2477 - Updates after review comments

Signed-off-by: Troy Biesterfeld <[email protected]>
LinuxForHealth · Feb 10, 2022 · 8780adb · 8780adb
1 parent 7705c86
commit 8780adb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/docs/src/pages/guides/FHIRServerUsersGuide.md b/docs/src/pages/guides/FHIRServerUsersGuide.md
@@ -44,7 +44,7 @@ This FHIR server is intended to be a common component for providing FHIR capabil
 # 2 Installation
 
 ## 2.1 Installing a new server
-0.  Prereqs: The IBM FHIR Server requires Java 11 or higher, and has been tested with OpenJDK 11. To install Java on your system, we recommend downloading and installing OpenJDK 11 from https://adoptopenjdk.net/.
+0.  Prereqs: The IBM FHIR Server requires Java 11 and has been tested with OpenJDK 11. To install Java on your system, we recommend downloading and installing OpenJDK 11 from https://adoptopenjdk.net/.
 
 1.  To install the IBM FHIR Server, build or download the `fhir-install` zip installer (e.g. `fhir-server-distribution.zip` or `fhir-install-4.0.0-rc1-20191014-1610`).
 The Maven build creates the zip package under `fhir-install/target`. Alternatively, releases will be made available from the [Releases tab](https://github.com/ibm/fhir/releases).

diff --git a/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/streams/Streamer.java b/fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/streams/Streamer.java
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019
+ * (C) Copyright IBM Corp. 2019, 2022
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -19,7 +19,7 @@
 
 /**
  * Simple implementation taking a JDBC ResultSet and rendering it using
- * the Java 11 Streams API.
+ * the Java Streams API.
  * <br>
  * The JDBC API is really starting to show its age here
  */
@@ -45,16 +45,16 @@ public Row(ResultSet rs, String[] columnNames) throws SQLException {
                 cols[i] = rs.getObject(i+1);
             }
         }
-        
+
         public String[] getColumnNames() {
             return this.columnNames;
         }
-        
+
         public Object[] getCols() {
             return this.cols;
         }
     }
-    
+
 
     /**
      * Wrap the JDBC {@link ResultSet} as a stream object. Note that the stream has to be consumed within
@@ -68,7 +68,7 @@ public Stream<Row> wrap(final ResultSet rs) throws SQLException {
         for (int i=0; i<columnNames.length; i++) {
             columnNames[i] = md.getColumnName(i+1);
         }
-        
+
         Spliterator<Row> s = new Spliterators.AbstractSpliterator<Row>(Long.MAX_VALUE, Spliterator.NONNULL | Spliterator.IMMUTABLE) {
 
             @Override
@@ -77,7 +77,7 @@ public boolean tryAdvance(Consumer<? super Row> action) {
                     if (!rs.next()) {
                         return false;
                     }
-                    
+
                     // wrap the current result record as a Row which is then handed
                     // off to the stream
                     action.accept(new Row(rs, columnNames));
@@ -90,9 +90,9 @@ public boolean tryAdvance(Consumer<? super Row> action) {
                 }
             }
         };
-        
+
         // Create a sequential stream of the rows from the result set
         return StreamSupport.stream(s, false);
     }
-    
+
 }
diff --git a/fhir-examples/pom.xml b/fhir-examples/pom.xml
@@ -197,8 +197,8 @@
                             <!-- speed up the build -->
                             <isOffline>true</isOffline>
                             <!-- no matter the JDK running the javadoc, it's 
-                                important this be at the minimum level we support, which is 8. -->
-                            <source>8</source>
+                                important this be at the minimum level we support, which is 11. -->
+                            <source>11</source>
                             <!-- we don't need package -->
                             <show>package</show>
                             <!-- verbose if you are debugging -->
@@ -423,8 +423,8 @@
                             <!-- speed up the build -->
                             <isOffline>true</isOffline>
                             <!-- no matter the JDK running the javadoc, it's 
-                                important this be at the minimum level we support, which is 8. -->
-                            <source>8</source>
+                                important this be at the minimum level we support, which is 11. -->
+                            <source>11</source>
                             <!-- we don't need package -->
                             <show>package</show>
                             <!-- verbose if you are debugging -->

diff --git a/fhir-parent/pom.xml b/fhir-parent/pom.xml
@@ -865,8 +865,8 @@
                         <!-- speed up the build -->
                         <isOffline>true</isOffline>
                         <!-- no matter the JDK running the javadoc, it's
-                            important this be at the minimum level we support, which is 8. -->
-                        <source>8</source>
+                            important this be at the minimum level we support, which is 11. -->
+                        <source>11</source>
                         <!-- we don't need package -->
                         <show>package</show>
                         <!-- verbose if you are debugging -->
@@ -1143,7 +1143,7 @@
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <inherited>false</inherited>
                         <configuration>
-                            <source>8</source>
+                            <source>11</source>
                             <verbose>true</verbose>
                             <doclint>none</doclint>
                             <minmemory>2g</minmemory>
@@ -1439,8 +1439,8 @@
                     <!-- speed up the build -->
                     <isOffline>true</isOffline>
                     <!-- no matter the JDK running the javadoc, it's important
-                        this be at the minimum level we support, which is 8. -->
-                    <source>8</source>
+                        this be at the minimum level we support, which is 11. -->
+                    <source>11</source>
                     <!-- we don't need package -->
                     <show>package</show>
                     <!-- verbose if you are debugging -->

diff --git a/fhir-tools/pom.xml b/fhir-tools/pom.xml
@@ -497,8 +497,8 @@
                             <!-- speed up the build -->
                             <isOffline>true</isOffline>
                             <!-- no matter the JDK running the javadoc, it's
-                                important this be at the minimum level we support, which is 8. -->
-                            <source>8</source>
+                                important this be at the minimum level we support, which is 11. -->
+                            <source>11</source>
                             <!-- we don't need package -->
                             <show>package</show>
                             <!-- verbose if you are debugging -->