Update to Java 17

ChannelFinder · Nov 24, 2023 · 40a8ac6 · 40a8ac6
1 parent 9b7751d
commit 40a8ac6
Show file tree

Hide file tree

Showing 20 changed files with 49 additions and 104 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -22,10 +22,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - uses: ankane/setup-elasticsearch@v1

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
@@ -39,10 +39,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - name: Test with Maven
@@ -59,10 +59,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: maven
     - uses: ankane/setup-elasticsearch@v1

diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,3 @@
-FROM openjdk:11-jre
+FROM openjdk:17-jre
 WORKDIR /channelfinder
 ADD https://repo1.maven.org/maven2/org/phoebus/app-channel-channelfinder/4.7.2/app-channel-channelfinder-4.7.2.jar .
diff --git a/Dockerfile.integrationtest b/Dockerfile.integrationtest
@@ -16,7 +16,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 # ------------------------------------------------------------------------------
 
-FROM openjdk:11
+FROM openjdk:17
 
 # deployment unit
 COPY target/ChannelFinder-*.jar /channelfinder/ChannelFinder-*.jar

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Collected installation recipes and notes may be found on [wiki pages](https://gi
 
 * Prerequisites
 
-  * JDK 11
+  * JDK 17
   * Elastic version 8.2.x
   * <For authN/authZ using LDAP:> LDAP server, e.g. OpenLDAP
 
@@ -45,7 +45,7 @@ Collected installation recipes and notes may be found on [wiki pages](https://gi
 * Build 
 ```
 # Debian 10
-sudo apt-get install openjdk-11-jdk maven git curl wget
+sudo apt-get install openjdk-17-jdk maven git curl wget
 wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.2.0-amd64.deb
 sudo dpkg -i elasticsearch-8.2.0-amd64.deb
 sudo systemctl start elasticsearch

diff --git a/pom.xml b/pom.xml
@@ -55,24 +55,6 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <!-- The following 3 dependencies are temporarily added for java 11 compatibility
-            TODO They should be removed as soon as possible. -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-core</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.0</version>
-        </dependency>
-        <!-- The above 3 dependencies are temporarily added for java 11 compatibility -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
@@ -85,11 +67,6 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <!--JUnit Jupiter Engine to depend on the JUnit5 engine and JUnit 5 API -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -345,8 +322,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
 				<version>3.11.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>17</source>
+                    <target>17</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
@@ -422,7 +399,7 @@
                                     <additionalOptions>
                                         <additionalOption>-Xdoclint:none</additionalOption>
                                     </additionalOptions>
-                                    <source>11</source>
+                                    <source>17</source>
                                 </configuration>
                             </execution>
                         </executions>

diff --git a/src/main/java/org/phoebus/channelfinder/ChannelManager.java b/src/main/java/org/phoebus/channelfinder/ChannelManager.java
@@ -76,7 +76,7 @@ public class ChannelManager {
      */
     @GetMapping
     public List<Channel> query(@RequestParam MultiValueMap<String, String> allRequestParams) {
-        return channelRepository.search(allRequestParams).getChannels();
+        return channelRepository.search(allRequestParams).channels();
     }
 
     @GetMapping("/combined")

diff --git a/src/main/java/org/phoebus/channelfinder/PropertyRepository.java b/src/main/java/org/phoebus/channelfinder/PropertyRepository.java
@@ -225,7 +225,7 @@ public Optional<Property> findById(String propertyName, boolean withChannels) {
                 if(withChannels) {
                     MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
                     params.add(property.getName(), "*");
-                    property.setChannels(channelRepository.search(params).getChannels());
+                    property.setChannels(channelRepository.search(params).channels());
                 }
                 return Optional.of(property);
             } else {
@@ -330,7 +330,7 @@ public void deleteById(String propertyName) {
             BulkRequest.Builder br = new BulkRequest.Builder().refresh(Refresh.True);
             MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
             params.add(propertyName, "*");
-            List<Channel> channels = channelRepository.search(params).getChannels();
+            List<Channel> channels = channelRepository.search(params).channels();
             while (channels.size() > 0) {
                 for (Channel channel : channels) {
                     channel.removeProperty(
@@ -360,7 +360,7 @@ public void deleteById(String propertyName) {
 
                 }
                 params.set("~search_after", channels.get(channels.size() - 1).getName());
-                channels = channelRepository.search(params).getChannels();
+                channels = channelRepository.search(params).channels();
             }
         } catch (ElasticsearchException | IOException e) {
             String message = MessageFormat.format(TextUtil.FAILED_TO_DELETE_PROPERTY, propertyName);

diff --git a/src/main/java/org/phoebus/channelfinder/TagRepository.java b/src/main/java/org/phoebus/channelfinder/TagRepository.java
@@ -226,7 +226,7 @@ public Optional<Tag> findById(String tagId, boolean withChannels) {
                 if(withChannels) {
                     MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
                     params.add("~tag", tag.getName());
-                    tag.setChannels(channelRepository.search(params).getChannels());
+                    tag.setChannels(channelRepository.search(params).channels());
                 }
                 return Optional.of(tag);
             } else {
@@ -329,7 +329,7 @@ public void deleteById(String tagName) {
             BulkRequest.Builder br = new BulkRequest.Builder().refresh(Refresh.True);
             MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
             params.add("~tag", tagName);
-            List<Channel> channels = channelRepository.search(params).getChannels();
+            List<Channel> channels = channelRepository.search(params).channels();
             while (channels.size() > 0) {
 
                 for (Channel channel : channels) {
@@ -366,7 +366,7 @@ public void deleteById(String tagName) {
 
                 }
                 params.set("~search_after", channels.get(channels.size() - 1).getName());
-                channels = channelRepository.search(params).getChannels();
+                channels = channelRepository.search(params).channels();
             }
 
         } catch (ElasticsearchException | IOException e) {

diff --git a/src/main/java/org/phoebus/channelfinder/entity/Channel.java b/src/main/java/org/phoebus/channelfinder/entity/Channel.java
@@ -9,9 +9,6 @@
  * All rights reserved. Use is subject to license terms.
  * #L%
  */
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -22,8 +19,6 @@
  * @author Ralph Lange {@literal <ralph.lange@gmx.de>}
  */
 
-@XmlRootElement(name="channel")
-@XmlType (propOrder={"name","owner","properties","tags"})
 public class Channel {
     private String name;
     private String owner;

diff --git a/src/main/java/org/phoebus/channelfinder/entity/Property.java b/src/main/java/org/phoebus/channelfinder/entity/Property.java
@@ -12,8 +12,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,8 +20,6 @@
  *
  * @author Ralph Lange {@literal <ralph.lange@gmx.de>}
  */
-@XmlRootElement(name="property")
-@XmlType (propOrder={"name","owner","value","channels"})
 public class Property {
     private String name;
     private String owner;

diff --git a/src/main/java/org/phoebus/channelfinder/entity/Scroll.java b/src/main/java/org/phoebus/channelfinder/entity/Scroll.java
@@ -3,11 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-@XmlRootElement(name="scroll")
-@XmlType (propOrder={"id","channels"})
 public class Scroll {
     private String id;
     private List<Channel> channels = new ArrayList<>();

diff --git a/src/main/java/org/phoebus/channelfinder/entity/SearchResult.java b/src/main/java/org/phoebus/channelfinder/entity/SearchResult.java
@@ -4,13 +4,7 @@
 
 import java.util.List;
 
-public class SearchResult {
-        private final long count;
-        private final List<Channel> channels;
-        public SearchResult(List<Channel> channels, long count) {
-            this.channels = channels;
-            this.count = count;
-        }
+public record SearchResult(List<Channel> channels, long count) {
 
     @Override
     public String toString() {
@@ -21,25 +15,17 @@ public String toString() {
     }
 
     @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            SearchResult that = (SearchResult) o;
-            return count == that.count && Objects.equal(channels, that.channels);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hashCode(count, channels);
-        }
-
-        public long getCount() {
-            return count;
-        }
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SearchResult that = (SearchResult) o;
+        return count == that.count && Objects.equal(channels, that.channels);
+    }
 
-        public List<Channel> getChannels() {
-            return channels;
-        }
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(count, channels);
+    }
 
 
-    }
+}
diff --git a/src/main/java/org/phoebus/channelfinder/entity/Tag.java b/src/main/java/org/phoebus/channelfinder/entity/Tag.java
@@ -12,8 +12,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -23,8 +21,6 @@
  *
  * @author Ralph Lange {@literal <ralph.lange@gmx.de>}
  */
-@XmlRootElement(name="tag")
-@XmlType (propOrder={"name","owner","channels"})
 public class Tag {
     private String name;
     private String owner;

diff --git a/src/main/java/org/phoebus/channelfinder/epics/ChannelFinderEpicsService.java b/src/main/java/org/phoebus/channelfinder/epics/ChannelFinderEpicsService.java
@@ -164,7 +164,7 @@ public void run() {
                     }
                 }
 
-                List<Channel> result = channelRepository.search(searchParameters).getChannels();
+                List<Channel> result = channelRepository.search(searchParameters).channels();
 
                 final Map<String, List<String>> channelTable = new HashMap<>();
                 final Map<String, List<String>> channelPropertyTable = new HashMap<>();

diff --git a/src/test/java/org/phoebus/channelfinder/ChannelRepositorySearchIT.java b/src/test/java/org/phoebus/channelfinder/ChannelRepositorySearchIT.java
@@ -82,10 +82,10 @@ void searchTest() {
         searchParameters.add("~name", channelNames.get(0));
         SearchResult result = channelRepository.search(searchParameters);
         long countResult = channelRepository.count(searchParameters);
-        Assertions.assertEquals(1, result.getCount());
-        Assertions.assertEquals(1, result.getChannels().size());
+        Assertions.assertEquals(1, result.count());
+        Assertions.assertEquals(1, result.channels().size());
         Assertions.assertEquals(1, countResult);
-        Assertions.assertEquals(result.getChannels().get(0).getName(), channelNames.get(0));
+        Assertions.assertEquals(result.channels().get(0).getName(), channelNames.get(0));
 
         logger.log(Level.INFO, "Search for all channels via wildcards");
         searchName(2, "BR:C001-BI:2{BLA}Pos:?-RB");
@@ -142,8 +142,8 @@ private void assertSearchCount(long expectedResultCount, int expectedChannelsCou
         long countResult = channelRepository.count(searchParameters);
 
         // Assert
-        Assertions.assertEquals(expectedResultCount, result.getCount());
-        Assertions.assertEquals(expectedChannelsCount, result.getChannels().size());
+        Assertions.assertEquals(expectedResultCount, result.count());
+        Assertions.assertEquals(expectedChannelsCount, result.channels().size());
         Assertions.assertEquals(expectedQueryCount, countResult);
     }
 
@@ -156,7 +156,7 @@ private void checkGroup(int bucket, String key, String value) {
         SearchResult result = channelRepository.search(searchParameters);
         long countResult = channelRepository.count(searchParameters);
         Integer expectedCount = CELLS * bucket;
-        Assertions.assertEquals(expectedCount, Integer.valueOf(result.getChannels().size()), "Search: " + maptoString(searchParameters));
+        Assertions.assertEquals(expectedCount, Integer.valueOf(result.channels().size()), "Search: " + maptoString(searchParameters));
         Assertions.assertEquals(expectedCount, Integer.valueOf((int) countResult));
     }
 

diff --git a/src/test/java/org/phoebus/channelfinder/PropertyManagerIT.java b/src/test/java/org/phoebus/channelfinder/PropertyManagerIT.java
@@ -330,7 +330,7 @@ void createXmlPropertiesWithOverride() {
         MultiValueMap<String, String> params = new LinkedMultiValueMap<String, String>();
         params.add("testProperty0WithChannels", "*");
         // verify the property was removed from the old channels
-        Assertions.assertEquals(Arrays.asList(testChannels.get(1)), channelRepository.search(params).getChannels(), "Failed to delete the property from channels");
+        Assertions.assertEquals(Arrays.asList(testChannels.get(1)), channelRepository.search(params).channels(), "Failed to delete the property from channels");
     }
 
     /**
@@ -736,7 +736,7 @@ void deleteXmlProperty() {
         params.add("testProperty0WithChannels", "*");
         // verify the property was deleted and removed from all associated channels
         Assertions.assertFalse(propertyRepository.existsById(testProperty0WithChannels.getName()), "Failed to delete the property");
-        Assertions.assertEquals(new ArrayList<Channel>(), channelRepository.search(params).getChannels(), "Failed to delete the property from channels");
+        Assertions.assertEquals(new ArrayList<Channel>(), channelRepository.search(params).channels(), "Failed to delete the property from channels");
     }
 
     /**
@@ -757,7 +757,7 @@ void deleteXmlPropertyFromChannel() {
         // Verify the property is removed from the testChannel0
         MultiValueMap<String, String> searchParameters = new LinkedMultiValueMap<String, String>();
         searchParameters.add("testProperty0WithChannels", "*");
-        Assertions.assertFalse(channelRepository.search(searchParameters).getChannels().stream().anyMatch(ch -> {
+        Assertions.assertFalse(channelRepository.search(searchParameters).channels().stream().anyMatch(ch -> {
             return ch.getName().equals(testChannel0.getName());
         }), "Failed to delete the property from channel");
     }