Merge pull request #56 from ChannelFinder/updates_and_integrationtests_adjust

Updates and integrationtests adjust

Author: shroffk

.gitignore

@@ -5,4 +5,10 @@
 /.classpath
 .pydevproject
 *.iml
-**/site/sphinx/build/*
+**/site/sphinx/build/*
+
+### Eclipse ###
+.settings/org.eclipse.jdt.core.prefs
+
+### Docker ###
+docker-compose-local*

Dockerfile.integrationtest

@@ -0,0 +1,24 @@
+# ------------------------------------------------------------------------------
+# Copyright (C) 2021 European Spallation Source ERIC.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# ------------------------------------------------------------------------------
+
+FROM openjdk:11
+
+# deployment unit
+COPY target/ChannelFinder-*.jar /channelfinder/ChannelFinder-*.jar
+
+CMD ["java", "-jar", "/channelfinder/ChannelFinder-*.jar", "--spring.config.name=application"]

docker-compose-integrationtest.yml

@@ -0,0 +1,69 @@
+# ------------------------------------------------------------------------------
+# Copyright (C) 2021 European Spallation Source ERIC.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# ------------------------------------------------------------------------------
+
+version: "3.7"
+services:
+  channelfinder:
+    build: 
+      context: .
+      dockerfile: Dockerfile.integrationtest
+    hostname: channelfinder
+    networks:
+      - channelfinder-net
+    ports:
+      - 8080:8080
+      - 8443:8443
+    depends_on:
+      - elasticsearch
+    environment:
+      elasticsearch.network.host: elasticsearch-cf
+      ldap.enabled: "false"
+      embedded_ldap.enabled: "false"
+      demo_auth.enabled: "true"
+    command: >
+      /bin/bash -c "
+        until curl -s -f http://elasticsearch-cf:9200/_cluster/health; do
+          echo Waiting for Elasticsearch;
+          sleep 1;
+        done;
+        java -jar /channelfinder/ChannelFinder-*.jar --spring.config.name=application"
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.2.0
+    hostname: elasticsearch-cf
+    networks:
+      - channelfinder-net
+    ports:
+      - 9200:9200
+      - 9300:9300
+    environment:
+      cluster.name: channelfinder
+      bootstrap.memory_lock: "true"
+      discovery.type: single-node
+      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
+      xpack.security.enabled: "false"
+    volumes:
+      - channelfinder-es-data:/usr/share/elasticsearch/data
+
+volumes:
+  channelfinder-es-data:
+   driver: local
+
+networks:
+  channelfinder-net:
+    driver: bridge

pom.xml

@@ -37,7 +37,7 @@
 	</developers>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.boot-version>2.6.7</spring.boot-version>
+		<spring.boot-version>2.7.3</spring.boot-version>
 		<elasticsearch.version>8.2.0</elasticsearch.version>
 	</properties>
 	<dependencyManagement>
@@ -159,6 +159,18 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>testcontainers</artifactId>
+			<version>1.17.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>1.17.3</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

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

@@ -25,7 +25,6 @@
 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/AuthorizationService.java

@@ -10,7 +10,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -23,27 +22,27 @@ public class AuthorizationService {
 
     @Value("${admin-groups:cf-admins}")
     void initializeAdminRoles(String groups) {
-        this.admin_groups = Arrays.asList(groups.split(",")).stream().map(g -> {
-            return "ROLE_" + g.trim().toUpperCase();
-        }).collect(Collectors.toList());
+        AuthorizationService.admin_groups = Arrays.asList(groups.split(",")).stream().map(g ->
+            "ROLE_" + g.trim().toUpperCase()
+        ).collect(Collectors.toList());
     }
     @Value("${channel-groups:cf-channels}")
     void initializeChannelModRoles(String groups) {
-        this.channel_groups = Arrays.asList(groups.split(",")).stream().map(g -> {
-            return "ROLE_" + g.trim().toUpperCase();
-        }).collect(Collectors.toList());
+        AuthorizationService.channel_groups = Arrays.asList(groups.split(",")).stream().map(g ->
+            "ROLE_" + g.trim().toUpperCase()
+        ).collect(Collectors.toList());
     }
     @Value("${property-groups:cf-properties}")
     void initializePropertyRoles(String groups) {
-        this.property_groups = Arrays.asList(groups.split(",")).stream().map(g -> {
-            return "ROLE_" + g.trim().toUpperCase();
-        }).collect(Collectors.toList());
+        AuthorizationService.property_groups = Arrays.asList(groups.split(",")).stream().map(g ->
+            "ROLE_" + g.trim().toUpperCase()
+        ).collect(Collectors.toList());
     }
     @Value("${tag-groups:cf-tags}")
     void initializeTagRoles(String groups) {
-        this.tag_groups = Arrays.asList(groups.split(",")).stream().map(g -> {
-            return "ROLE_" + g.trim().toUpperCase();
-        }).collect(Collectors.toList());
+        AuthorizationService.tag_groups = Arrays.asList(groups.split(",")).stream().map(g ->
+            "ROLE_" + g.trim().toUpperCase()
+        ).collect(Collectors.toList());
     }
 
     public enum ROLES {
@@ -57,11 +56,10 @@ public enum ROLES {
         private ROLES(List<String> groups) {
             this.groups = groups;
         }
-
-    };
+    }
 
     public boolean isAuthorizedOwner(Authentication authentication, XmlTag data) {
-        ArrayList<String> auth = new ArrayList<String>();
+        ArrayList<String> auth = new ArrayList<>();
         Collection<? extends GrantedAuthority> auths = authentication.getAuthorities();
         for(GrantedAuthority a: auths)
             auth.add(a.getAuthority());
@@ -74,7 +72,7 @@ public boolean isAuthorizedOwner(Authentication authentication, XmlTag data) {
     }
 
     public boolean isAuthorizedOwner(Authentication authentication, XmlProperty data) {
-        ArrayList<String> auth = new ArrayList<String>();
+        ArrayList<String> auth = new ArrayList<>();
         Collection<? extends GrantedAuthority> auths = authentication.getAuthorities();
         for(GrantedAuthority a: auths)
             auth.add(a.getAuthority());
@@ -87,7 +85,7 @@ public boolean isAuthorizedOwner(Authentication authentication, XmlProperty data
     }
 
     public boolean isAuthorizedOwner(Authentication authentication, XmlChannel data) {
-        ArrayList<String> auth = new ArrayList<String>();
+        ArrayList<String> auth = new ArrayList<>();
         Collection<? extends GrantedAuthority> auths = authentication.getAuthorities();
         for(GrantedAuthority a: auths)
             auth.add(a.getAuthority());
@@ -100,7 +98,7 @@ public boolean isAuthorizedOwner(Authentication authentication, XmlChannel data)
     }
 
     public boolean isAuthorizedRole(Authentication authentication, ROLES expectedRole) {
-        ArrayList<String> auth = new ArrayList<String>();
+        ArrayList<String> auth = new ArrayList<>();
         Collection<? extends GrantedAuthority> auths = authentication.getAuthorities();
         for(GrantedAuthority a: auths)
             auth.add(a.getAuthority());

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

@@ -10,7 +10,6 @@
 
 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;
@@ -184,9 +183,9 @@ public Iterable<XmlChannel> create(@RequestBody Iterable<XmlChannel> channels) {
                 channel.getTags().forEach(tag -> tag.setOwner(tagRepository.findById(tag.getName()).get().getOwner()));
             }
 
-            channels.forEach(log -> {
-                channelManagerAudit.info("PUT" + log.toLog());
-            });
+            channels.forEach(log ->
+                channelManagerAudit.info("PUT" + log.toLog())
+            );
 
             // create new channels
             return channelRepository.indexAll(Lists.newArrayList(channels));

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

@@ -8,16 +8,13 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
 import co.elastic.clients.elasticsearch._types.*;
 import co.elastic.clients.elasticsearch._types.query_dsl.*;
 import co.elastic.clients.elasticsearch.core.*;
 import co.elastic.clients.elasticsearch.core.bulk.BulkResponseItem;
-import co.elastic.clients.elasticsearch.core.bulk.UpdateOperation;
 import co.elastic.clients.elasticsearch.core.search.Hit;
-import co.elastic.clients.elasticsearch.core.search.ScoreMode;
 import co.elastic.clients.json.JsonData;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,7 +82,6 @@ public XmlChannel index(XmlChannel channel) {
      * @param channels - channels to be created
      * @return the created channels
      */
-    @SuppressWarnings("unchecked")
     public List<XmlChannel> indexAll(List<XmlChannel> channels) {
         BulkRequest.Builder br = new BulkRequest.Builder();
 
@@ -129,7 +125,6 @@ public List<XmlChannel> indexAll(List<XmlChannel> channels) {
      * @param channel - channel to be saved
      * @return the updated/saved channel
      */
-    @SuppressWarnings("unchecked")
     public XmlChannel save(String channelName, XmlChannel channel) {
         try {
             IndexResponse response = client.index(i -> i.index(ES_CHANNEL_INDEX)

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

@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.http.HttpStatus;
-import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,7 +37,7 @@
 @RequestMapping(SCROLL_RESOURCE_URI)
 @EnableAutoConfiguration
 public class ChannelScroll {
-    static Logger log = Logger.getLogger(ChannelRepository.class.getName());
+    static Logger log = Logger.getLogger(ChannelScroll.class.getName());
 
     @Value("${elasticsearch.channel.index:channelfinder}")
     private String ES_CHANNEL_INDEX;

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

@@ -35,7 +35,7 @@ public class InfoManager {
     @Autowired
     private ElasticConfig esService;
 
-    private final static ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT);
+    private static final ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT);
 
     /**
      * 
@@ -44,11 +44,11 @@ public class InfoManager {
     @GetMapping
     public String info() {
 
-        Map<String, Object> cfServiceInfo = new LinkedHashMap<String, Object>();
+        Map<String, Object> cfServiceInfo = new LinkedHashMap<>();
         cfServiceInfo.put("name", "ChannelFinder Service");
         cfServiceInfo.put("version", version);
 
-        Map<String, String> elasticInfo = new LinkedHashMap<String, String>();
+        Map<String, String> elasticInfo = new LinkedHashMap<>();
         try {
 
             ElasticsearchClient client = esService.getSearchClient();