Cleanup configuration

src/main/java/com/activeviam/apps/cfg/datastore/DatastoreConfig.java

@@ -1,28 +1,19 @@
 /*
- * Copyright (C) ActiveViam 2024
+ * Copyright (C) ActiveViam 2024-2025
  * ALL RIGHTS RESERVED. This material is the CONFIDENTIAL and PROPRIETARY
  * property of ActiveViam Limited. Any unauthorized use,
  * reproduction or transfer of this material is strictly prohibited
  */
 package com.activeviam.apps.cfg.datastore;
 
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
-import com.activeviam.activepivot.core.datastore.api.builder.ApplicationWithDatastore;
-import com.activeviam.activepivot.server.spring.api.config.IDatastoreConfig;
-import com.activeviam.database.datastore.api.IDatastore;
+import com.activeviam.apps.cfg.datastore.datamodel.StoreDefinitionsConfig;
 
 import lombok.RequiredArgsConstructor;
 
 @Configuration
+@Import({StoreDefinitionsConfig.class, DatastoreSchemaConfig.class, DatastoreSelectionConfig.class})
 @RequiredArgsConstructor
-public class DatastoreConfig implements IDatastoreConfig {
-    private final ApplicationWithDatastore applicationWithDatastore;
-
-    @Bean
-    @Override
-    public IDatastore database() {
-        return applicationWithDatastore.getDatastore();
-    }
-}
+public class DatastoreConfig {}

src/main/java/com/activeviam/apps/cfg/datastore/DatastoreSchemaConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) ActiveViam 2024
+ * Copyright (C) ActiveViam 2024-2025
  * ALL RIGHTS RESERVED. This material is the CONFIDENTIAL and PROPRIETARY
  * property of ActiveViam Limited. Any unauthorized use,
  * reproduction or transfer of this material is strictly prohibited
@@ -9,7 +9,6 @@
 import java.util.List;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import com.activeviam.activepivot.server.spring.api.config.IDatastoreSchemaDescriptionConfig;
 import com.activeviam.database.datastore.api.description.IDatastoreSchemaDescription;
@@ -19,7 +18,6 @@
 
 import lombok.RequiredArgsConstructor;
 
-@Configuration
 @RequiredArgsConstructor
 public class DatastoreSchemaConfig implements IDatastoreSchemaDescriptionConfig {
     private final List<? extends IStoreDescription> storeDescriptions;

src/main/java/com/activeviam/apps/cfg/datastore/DatastoreSelectionConfig.java

@@ -7,7 +7,6 @@
 package com.activeviam.apps.cfg.datastore;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import com.activeviam.activepivot.core.datastore.api.builder.StartBuilding;
 import com.activeviam.activepivot.core.intf.api.description.ISelectionDescription;
@@ -16,7 +15,6 @@
 
 import lombok.RequiredArgsConstructor;
 
-@Configuration
 @RequiredArgsConstructor
 public class DatastoreSelectionConfig {
     private final IDatastoreSchemaDescription datastoreSchemaDescription;

src/main/java/com/activeviam/apps/cfg/datastore/datamodel/StoresConfiguration.java → src/main/java/com/activeviam/apps/cfg/datastore/datamodel/StoreDefinitionsConfig.java

@@ -26,7 +26,7 @@
 import com.activeviam.database.datastore.api.description.impl.StoreDescription;
 
 @Configuration
-public class StoresConfiguration {
+public class StoreDefinitionsConfig {
 
     public static String referenceName(String from, String to) {
         return String.format("%s_to_%s", from, to);

src/main/java/com/activeviam/apps/cfg/pivot/ActivePivotManagerConfig.java

@@ -7,7 +7,6 @@
 package com.activeviam.apps.cfg.pivot;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import com.activeviam.activepivot.core.datastore.api.builder.StartBuilding;
 import com.activeviam.activepivot.core.intf.api.description.IActivePivotInstanceDescription;
@@ -17,7 +16,6 @@
 
 import lombok.RequiredArgsConstructor;
 
-@Configuration
 @RequiredArgsConstructor
 public class ActivePivotManagerConfig implements IActivePivotManagerDescriptionConfig {
     /* *********************/

src/main/java/com/activeviam/apps/cfg/pivot/ApplicationWithDatastoreConfig.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) ActiveViam 2024-2025
+ * ALL RIGHTS RESERVED. This material is the CONFIDENTIAL and PROPRIETARY
+ * property of ActiveViam Limited. Any unauthorized use,
+ * reproduction or transfer of this material is strictly prohibited
+ */
+package com.activeviam.apps.cfg.pivot;
+
+import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.event.EventListener;
+
+import com.activeviam.activepivot.core.datastore.api.builder.ApplicationWithDatastore;
+import com.activeviam.activepivot.core.datastore.api.builder.StartBuilding;
+import com.activeviam.activepivot.core.intf.api.cube.IActivePivotManager;
+import com.activeviam.activepivot.core.intf.api.description.IActivePivotManagerDescription;
+import com.activeviam.activepivot.server.spring.api.config.IActivePivotConfig;
+import com.activeviam.activepivot.server.spring.api.config.IDatastoreConfig;
+import com.activeviam.apps.cfg.datastore.DatastoreConfig;
+import com.activeviam.database.datastore.api.IDatastore;
+import com.activeviam.database.datastore.api.description.IDatastoreSchemaDescription;
+import com.activeviam.tech.core.api.agent.AgentException;
+import com.activeviam.tech.mvcc.api.policy.IEpochManagementPolicy;
+
+import lombok.RequiredArgsConstructor;
+
+@Configuration
+@Import({DatastoreConfig.class, ActivePivotManagerConfig.class, CubeConfig.class})
+@RequiredArgsConstructor
+public class ApplicationWithDatastoreConfig implements IActivePivotConfig, IDatastoreConfig {
+    private final IDatastoreSchemaDescription datastoreSchemaDescription;
+    private final IActivePivotManagerDescription activePivotManagerDescription;
+    private final IEpochManagementPolicy epochManagementPolicy;
+
+    @Bean
+    public ApplicationWithDatastore applicationWithDatastore() {
+        return StartBuilding.application()
+                .withDatastore(datastoreSchemaDescription)
+                .withManager(activePivotManagerDescription)
+                .withEpochPolicy(epochManagementPolicy)
+                .withoutBranchRestrictions()
+                .build();
+    }
+
+    @Bean
+    @Override
+    public IActivePivotManager activePivotManager() {
+        return applicationWithDatastore().getManager();
+    }
+
+    @Bean
+    @Override
+    public IDatastore database() {
+        return applicationWithDatastore().getDatastore();
+    }
+    /**
+     * Initialize and start the ActivePivot Manager, after performing all the injections into the ActivePivot plug-ins.
+     *
+     * @throws AgentException any exception that occurred during the injection, the initialization or the starting
+     */
+    @EventListener(ApplicationStartedEvent.class)
+    public void startManager() throws AgentException {
+        /* *********************************************** */
+        /* Initialize the ActivePivot Manager and start it */
+        /* *********************************************** */
+        activePivotManager().init(null);
+        activePivotManager().start();
+    }
+}

src/main/java/com/activeviam/apps/cfg/pivot/CubeConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) ActiveViam 2024
+ * Copyright (C) ActiveViam 2024-2025
  * ALL RIGHTS RESERVED. This material is the CONFIDENTIAL and PROPRIETARY
  * property of ActiveViam Limited. Any unauthorized use,
  * reproduction or transfer of this material is strictly prohibited
@@ -13,24 +13,21 @@
 import java.util.concurrent.TimeUnit;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 import com.activeviam.activepivot.core.datastore.api.builder.StartBuilding;
 import com.activeviam.activepivot.core.impl.api.contextvalues.QueriesTimeLimit;
 import com.activeviam.activepivot.core.intf.api.description.IActivePivotInstanceDescription;
 
 import lombok.RequiredArgsConstructor;
 
-@Configuration
+@Import({Measures.class, Dimensions.class})
 @RequiredArgsConstructor
 public class CubeConfig {
     public static final String CUBE_NAME = "Cube";
 
-    private final Measures measures;
-    private final Dimensions dimensions;
-
     @Bean
-    public IActivePivotInstanceDescription activePivotInstanceDescription() {
+    public IActivePivotInstanceDescription activePivotInstanceDescription(Dimensions dimensions, Measures measures) {
         return StartBuilding.cube(CUBE_NAME)
                 .withContributorsCount()
                 .withinFolder(NATIVE_MEASURES)

src/main/java/com/activeviam/apps/cfg/pivot/Dimensions.java

@@ -10,15 +10,12 @@
 import static com.activeviam.apps.constants.StoreAndFieldConstants.TRADE_DATE;
 import static com.activeviam.apps.constants.StoreAndFieldConstants.TRADE_ID;
 
-import org.springframework.stereotype.Component;
-
 import com.activeviam.activepivot.core.intf.api.cube.hierarchy.IDimension;
 import com.activeviam.activepivot.core.intf.api.cube.metadata.ILevelInfo;
 import com.activeviam.activepivot.core.intf.api.description.builder.dimension.ICanStartBuildingDimensions;
 import com.activeviam.apps.constants.StoreAndFieldConstants;
 import com.activeviam.tech.core.api.ordering.IComparator;
 
-@Component
 public class Dimensions {
 
     public static final String TRADE_ATTRIBUTES_DIMENSION = "Trade Attributes";

src/main/java/com/activeviam/apps/cfg/pivot/Measures.java

@@ -9,12 +9,9 @@
 import static com.activeviam.apps.cfg.pivot.ActivePivotManagerConfig.DOUBLE_FORMATTER;
 import static com.activeviam.apps.constants.StoreAndFieldConstants.NOTIONAL;
 
-import org.springframework.stereotype.Component;
-
 import com.activeviam.activepivot.copper.api.Copper;
 import com.activeviam.activepivot.core.intf.api.copper.ICopperContext;
 
-@Component
 public class Measures {
 
     public void build(ICopperContext context) {