Set spring configs into app data.

Signed-off-by: yichen88 <[email protected]>

afs-postgres/src/main/java/com/powsybl/afs/postgres/PostgresAppFileSystemAppProvider.java

@@ -10,19 +10,41 @@
 import com.powsybl.afs.AppFileSystem;
 import com.powsybl.afs.AppFileSystemProvider;
 import com.powsybl.afs.AppFileSystemProviderContext;
+import com.powsybl.afs.storage.EventsBus;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author Yichen TANG <yichen.tang at rte-france.com>
  */
 @AutoService(AppFileSystemProvider.class)
 public class PostgresAppFileSystemAppProvider implements AppFileSystemProvider {
 
+    private final List<PostgresAppFileSystemConfig> configs;
+
+    public PostgresAppFileSystemAppProvider() {
+        this(PostgresAppFileSystemConfig.load());
+    }
+
+    public PostgresAppFileSystemAppProvider(List<PostgresAppFileSystemConfig> configs) {
+        this.configs = Objects.requireNonNull(configs);
+    }
+
     @Override
     public List<AppFileSystem> getFileSystems(AppFileSystemProviderContext context) {
-        return Collections.emptyList();
-//        return Collections.singletonList(new PostgresAppFileSystem("test", true, new PostgresAppStorage()));
+        final PostgresAppFileSystemConfig postgresAppFileSystemConfig = configs.get(0);
+        AnnotationConfigApplicationContext springContext
+                = new AnnotationConfigApplicationContext();
+        springContext.getEnvironment().setActiveProfiles("production");
+        springContext.scan("com.powsybl.afs.postgres");
+        springContext.register(PostgresAppStorage.class);
+        springContext.getBeanFactory().registerSingleton(EventsBus.class.toString(), context.getEventsBus());
+        springContext.getBeanFactory().registerSingleton(String.class.toString(), postgresAppFileSystemConfig.getDriveName());
+        springContext.refresh();
+        final PostgresAppStorage bean = springContext.getBean(PostgresAppStorage.class);
+        return Collections.singletonList(new PostgresAppFileSystem(postgresAppFileSystemConfig.getDriveName(), true, bean));
     }
 }

afs-postgres/src/main/java/com/powsybl/afs/postgres/PostgresAppStorage.java

@@ -30,17 +30,21 @@ public class PostgresAppStorage extends AbstractAppStorage {
     private final NodeDataRepository nodeDataRepository;
     private final TimeSeriesService tsService;
 
+    private final String fileSystemName;
+
     private static final int ROOT_NODE_VERSION = 0;
 
     @Autowired
-    public PostgresAppStorage(NodeService nodeService,
+    public PostgresAppStorage(String fileSystemName,
+                              NodeService nodeService,
                               NodeDataRepository nodeDataRepository,
-                              TimeSeriesService tsService) {
-        // TODO here
-        this.eventsBus = new InMemoryEventsBus();
+                              TimeSeriesService tsService,
+                              EventsBus eventsBus) {
+        this.fileSystemName = Objects.requireNonNull(fileSystemName);
         this.nodeService = Objects.requireNonNull(nodeService);
         this.nodeDataRepository = Objects.requireNonNull(nodeDataRepository);
         this.tsService = Objects.requireNonNull(tsService);
+        this.eventsBus = Objects.requireNonNull(eventsBus);
         bindListener();
     }
 
@@ -63,8 +67,7 @@ private void bindListener() {
 
     @Override
     public String getFileSystemName() {
-        // TODO here
-        return "postgres-test";
+        return fileSystemName;
     }
 
     @Override
@@ -100,7 +103,6 @@ public boolean isRemote() {
     @Override
     public NodeInfo createRootNodeIfNotExists(String name, String nodePseudoClass) {
         final NodeInfo info = nodeService.createRootNodeIfNotExists(name, nodePseudoClass);
-//        pushEvent(new NodeCreated("test", null), "APPSTORAGE_NODE_TOPIC");
         return info;
     }
 

afs-postgres/src/main/resources/persistence.properties

@@ -1 +1 @@
-spring.jpa.hibernate.ddl-auto=create
+spring.jpa.hibernate.ddl-auto=update

afs-postgres/src/test/java/com/powsybl/afs/postgres/PostgresAppStorageTest.java

@@ -8,10 +8,7 @@
 
 import com.google.common.collect.Sets;
 import com.powsybl.afs.postgres.jpa.NodeDataRepository;
-import com.powsybl.afs.storage.AbstractAppStorageTest;
-import com.powsybl.afs.storage.AppStorage;
-import com.powsybl.afs.storage.NodeGenericMetadata;
-import com.powsybl.afs.storage.NodeInfo;
+import com.powsybl.afs.storage.*;
 import com.powsybl.afs.storage.events.TimeSeriesCreated;
 import com.powsybl.afs.storage.events.TimeSeriesDataUpdated;
 import com.powsybl.timeseries.*;
@@ -44,10 +41,14 @@ public class PostgresAppStorageTest extends AbstractAppStorageTest {
     private TimeSeriesService tsService;
     @Autowired
     private NodeDataRepository nodeDataRepository;
+    @Autowired
+    private EventsBus eventsBus;
+    @Autowired
+    private String fileSystemName;
 
     @Override
     protected AppStorage createStorage() {
-        return new PostgresAppStorage(nodeService, nodeDataRepository, tsService);
+        return new PostgresAppStorage(fileSystemName, nodeService, nodeDataRepository, tsService, eventsBus);
     }
 
     @Override

afs-postgres/src/test/java/com/powsybl/afs/postgres/TestConfig.java

@@ -6,6 +6,9 @@
  */
 package com.powsybl.afs.postgres;
 
+import com.powsybl.afs.storage.EventsBus;
+import com.powsybl.afs.storage.InMemoryEventsBus;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 import org.springframework.context.annotation.PropertySource;
@@ -15,6 +18,16 @@
  */
 @Configuration
 @PropertySource("classpath:application.properties")
-@Profile({ "test" })
+@Profile({"test"})
 public class TestConfig {
+
+    @Bean
+    public EventsBus imMemory() {
+        return new InMemoryEventsBus();
+    }
+
+    @Bean(name = "fileSystemName")
+    public String getFileSystemName() {
+        return "postgres-afs";
+    }
 }