Merge pull request #55 from ChannelFinder/elastic8

Elastic8

Author: shroffk

docker-compose.yml

@@ -21,7 +21,7 @@ services:
         java -jar ChannelFinder-4.0.0.jar
       "
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.4.3
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.2.0
     hostname: elasticsearch-cf
     networks:
       - channelfinder-net

pom.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>ChannelFinder</artifactId>
@@ -35,8 +37,8 @@
 	</developers>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.boot-version>2.1.1.RELEASE</spring.boot-version>
-		<elasticsearch.version>6.8.4</elasticsearch.version>
+		<spring.boot-version>2.6.7</spring.boot-version>
+		<elasticsearch.version>8.2.0</elasticsearch.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -91,8 +93,24 @@
 			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>elasticsearch-rest-high-level-client</artifactId>
+			<groupId>co.elastic.clients</groupId>
+			<artifactId>elasticsearch-java</artifactId>
+			<version>8.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.12.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.12.3</version>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.json</groupId>
+			<artifactId>jakarta.json-api</artifactId>
+			<version>2.0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>

src/main/java/org/phoebus/channelfinder/Application.java

@@ -25,6 +25,7 @@
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.util.FileCopyUtils;
 
 @EnableAutoConfiguration

src/main/java/org/phoebus/channelfinder/ChannelManager.java

@@ -10,6 +10,8 @@
 
 import javax.servlet.ServletContext;
 
+import co.elastic.clients.elasticsearch._types.Refresh;
+import com.google.common.collect.Lists;
 import org.phoebus.channelfinder.AuthorizationService.ROLES;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -187,7 +189,7 @@ public Iterable<XmlChannel> create(@RequestBody Iterable<XmlChannel> channels) {
             });
 
             // create new channels
-            return channelRepository.indexAll(channels);
+            return channelRepository.indexAll(Lists.newArrayList(channels));
         } else {
             log.log(Level.SEVERE, "User does not have the proper authorization to perform an operation on this channel: " + channels, new ResponseStatusException(HttpStatus.UNAUTHORIZED));
             throw new ResponseStatusException(HttpStatus.UNAUTHORIZED,
@@ -220,20 +222,34 @@ public XmlChannel update(@PathVariable("channelName") String channelName, @Reque
             }
             Optional<XmlChannel> existingChannel = channelRepository.findById(channelName);
             boolean present = existingChannel.isPresent();
+
+            XmlChannel newChannel;
             if(present) {
                 if(!authorizationService.isAuthorizedOwner(SecurityContextHolder.getContext().getAuthentication(), existingChannel.get())) {
                     log.log(Level.SEVERE, "User does not have the proper authorization to perform an operation on this channel: " + existingChannel.get().toLog(), new ResponseStatusException(HttpStatus.UNAUTHORIZED));
                     throw new ResponseStatusException(HttpStatus.UNAUTHORIZED,
                             "User does not have the proper authorization to perform an operation on this channel: " + existingChannel.get(), null);
                 }
-            } 
+                newChannel = existingChannel.get();
+                newChannel.setOwner(channel.getOwner());
+                newChannel.addProperties(channel.getProperties());
+                newChannel.addTags(channel.getTags());
+                // Is an existing channel being renamed
+                if (!channel.getName().equalsIgnoreCase(existingChannel.get().getName())) {
+                    // Since this is a rename operation we will need to remove the old channel.
+                    channelRepository.deleteById(existingChannel.get().getName());
+                    newChannel.setName(channel.getName());
+                }
+            } else {
+                newChannel = channel;
+            }
 
             // reset owners of attached tags/props back to existing owners
             channel.getProperties().forEach(prop -> prop.setOwner(propertyRepository.findById(prop.getName()).get().getOwner()));
             channel.getTags().forEach(tag -> tag.setOwner(tagRepository.findById(tag.getName()).get().getOwner()));
 
             // update channel
-            return channelRepository.save(channelName,channel);
+            return channelRepository.save(newChannel);
         } else {
             log.log(Level.SEVERE, "User does not have the proper authorization to perform an operation on this channel: " + channelName, new ResponseStatusException(HttpStatus.UNAUTHORIZED));
             throw new ResponseStatusException(HttpStatus.UNAUTHORIZED,