boots

Former-commit-id: 1e491293

docker-compose.yml

@@ -195,8 +195,7 @@ services:
     restart: always
     container_name: fda-search-service
     hostname: fda-search-service
-#    build: ./fda-search-service
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.13.4
+    image: elasticsearch:7.13.4
     networks:
       - fda-public
     environment:

fda-database-service/pom.xml

@@ -46,6 +46,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+        <!-- elasticsearch -->
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-elasticsearch</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
@@ -183,11 +188,6 @@
             <artifactId>reactor-spring</artifactId>
             <version>1.0.1.RELEASE</version>
         </dependency>
-        <!-- elasticsearch -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-elasticsearch</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

fda-database-service/rest-service/src/main/java/at/tuwien/FdaDatabaseManagingApplication.java

@@ -3,20 +3,18 @@ package at.tuwien;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import springfox.documentation.oas.annotations.EnableOpenApi;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableOpenApi
 @EnableTransactionManagement
-//@EnableJpaRepositories(basePackages = {"at.tuwien.repository.jpa"})
-@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.elasticsearch"})
+@EnableJpaRepositories(basePackages = {"at.tuwien.repository.jpa"})
+@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.elastic"})
 @EntityScan(basePackages = {"at.tuwien.entities"})
 public class FdaDatabaseManagingApplication {
 

fda-database-service/services/src/main/java/at/tuwien/config/ElasticsearchConfig.java

@@ -13,15 +13,12 @@ import org.springframework.data.elasticsearch.repository.config.EnableElasticsea
 import java.util.Properties;
 
 @Configuration
-//@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository"})
-//@ComponentScan(basePackages = {"at.tuwien.repository"})
 public class ElasticsearchConfig {
 
     @Bean
     public RestHighLevelClient client() {
-        ClientConfiguration clientConfiguration
-            = ClientConfiguration.builder()
-                .connectedTo("localhost:9200")
+        ClientConfiguration clientConfiguration = ClientConfiguration.builder()
+                .connectedTo("fda-search-service:9200")
                 .build();
 
         return RestClients.create(clientConfiguration).rest();

fda-database-service/services/src/main/java/at/tuwien/entities/Database.java

+package at.tuwien.entities;
+
+import org.springframework.data.elasticsearch.annotations.Document;
+
+@Document(indexName = "databaseindex")
+public class Database extends at.tuwien.entities.database.Database {
+}

fda-database-service/services/src/main/java/at/tuwien/repository/elasticsearch/DatabaseElasticsearchRepository.java → fda-database-service/services/src/main/java/at/tuwien/repository/elastic/DatabaseRepository.java

-package at.tuwien.repository.elasticsearch;
+package at.tuwien.repository.elastic;
 
 import at.tuwien.entities.database.Database;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.stereotype.Repository;
 
-public interface DatabaseElasticsearchRepository 
-    extends ElasticsearchRepository<Database, String> {
-
+@Repository(value = "ElasticDatabaseRepository")
+public interface DatabaseRepository extends ElasticsearchRepository<Database, Long> {
 }

fda-database-service/services/src/main/java/at/tuwien/repository/jpa/DatabaseRepository.java

@@ -2,9 +2,6 @@ package at.tuwien.repository.jpa;
 
 import at.tuwien.entities.database.Database;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository

fda-database-service/services/src/main/java/at/tuwien/repository/jpa/ImageRepository.java

 package at.tuwien.repository.jpa;
 
-import at.tuwien.entities.container.Container;
 import at.tuwien.entities.container.image.ContainerImage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

fda-database-service/services/src/main/java/at/tuwien/service/DatabaseService.java

@@ -8,7 +8,6 @@ import at.tuwien.exception.*;
 import at.tuwien.mapper.DatabaseMapper;
 import at.tuwien.mapper.ImageMapper;
 import at.tuwien.repository.jpa.ContainerRepository;
-import at.tuwien.repository.elasticsearch.DatabaseElasticsearchRepository;
 import at.tuwien.repository.jpa.DatabaseRepository;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
 
 
 @Log4j2
@@ -27,17 +28,14 @@ public class DatabaseService extends JdbcConnector {
 
     private final ContainerRepository containerRepository;
     private final DatabaseRepository databaseRepository;
-    private final DatabaseElasticsearchRepository databaseElasticsearchRepository;
     private final DatabaseMapper databaseMapper;
 
     @Autowired
     public DatabaseService(ContainerRepository containerRepository, DatabaseRepository databaseRepository,
-                           DatabaseElasticsearchRepository databaseElasticsearchRepository,
                            ImageMapper imageMapper, DatabaseMapper databaseMapper) {
         super(imageMapper, databaseMapper);
         this.containerRepository = containerRepository;
         this.databaseRepository = databaseRepository;
-        this.databaseElasticsearchRepository = databaseElasticsearchRepository;
         this.databaseMapper = databaseMapper;
     }
 
@@ -48,7 +46,9 @@ public class DatabaseService extends JdbcConnector {
      */
     @Transactional
     public List<Database> findAll() {
-        return databaseRepository.findAll();
+        return StreamSupport.stream(databaseRepository.findAll()
+                .spliterator(), false)
+                .collect(Collectors.toList());
     }
 
     /**
@@ -112,7 +112,6 @@ public class DatabaseService extends JdbcConnector {
         }
         // save in metadata database
         final Database out = databaseRepository.save(database);
-        databaseElasticsearchRepository.save(database);
         log.info("Created database {}", out.getId());
         log.debug("created database {}", out);
         return out;

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java

@@ -6,14 +6,12 @@ import lombok.*;
 import org.hibernate.annotations.GenericGenerator;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import java.time.Instant;
 import java.util.List;
 
-@Document(indexName = "databaseindex")
 @Data
 @Entity
 @Builder

fda-metadata-db/pom.xml

@@ -84,11 +84,6 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger.version}</version>
         </dependency>
-        <!-- elasticsearch -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-elasticsearch</artifactId>
-        </dependency>
     </dependencies>
 
     <!-- build at.tuwien.gateway.config in ./rest-service/pom.xml -->

fda-table-service/.gitignore

@@ -5,6 +5,7 @@ target/
 !**/src/test/**/target/
 
 ### Generated ###
+ready
 mapping.xml
 rest-service/src/main/java/at/tuwien/userdb/Table.java
 

fda-table-service/pom.xml

@@ -170,12 +170,6 @@
             <artifactId>springfox-boot-starter</artifactId>
             <version>${springfox.version}</version>
         </dependency>
-        <!-- Gateway -->
-        <dependency>
-            <groupId>org.projectreactor</groupId>
-            <artifactId>reactor-spring</artifactId>
-            <version>1.0.1.RELEASE</version>
-        </dependency>
     </dependencies>
 
     <build>