fix: Update code

dhis2 · Dec 16, 2024 · 791ec72 · 791ec72
1 parent 604469b
commit 791ec72
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...rvice-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java b/...rvice-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java
@@ -236,7 +236,7 @@ public void swapTable(AnalyticsTableUpdateParams params, AnalyticsTable table) {
 
     List<Table> swapPartitions = new UniqueArrayList<>();
     table.getTablePartitions().stream()
-        .forEach(p -> swapPartitions.add(swapTable(p, p.getMainName())));
+        .forEach(partition -> swapPartitions.add(swapTable(partition, partition.getMainName())));
 
     if (!skipMasterTable) {
       swapTable(table, table.getMainName());
@@ -296,7 +296,7 @@ private Table swapTable(Table stagingTable, String mainTableName) {
       executeSilently(sqlBuilder.dropTableIfExistsCascade(mainTableName));
       executeSilently(sqlBuilder.renameTable(stagingTable, mainTableName));
     }
-    return stagingTable.swapFromStaging();
+    return stagingTable.fromStaging();
   }
 
   /**

diff --git a/...-analytics/src/test/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManagerTest.java b/...-analytics/src/test/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManagerTest.java
@@ -314,7 +314,7 @@ void testSwapTable() {
 
     when(jdbcTemplate.queryForList(any())).thenReturn(List.of(Map.of("table_name", "analytic")));
 
-    Table swappedPartition = table.getTablePartitions().get(0).swapFromStaging();
+    Table swappedPartition = table.getTablePartitions().get(0).fromStaging();
     subject.swapTable(params, table);
     assertEquals("analytics_2023_temp", table.getTablePartitions().get(0).getName());
     assertEquals("analytics_2023", swappedPartition.getName());

diff --git a/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/model/Table.java b/dhis-2/dhis-support/dhis-support-sql/src/main/java/org/hisp/dhis/db/model/Table.java
@@ -254,7 +254,7 @@ public boolean hasPartitions() {
     return isNotEmpty(partitions);
   }
 
-  public Table swapFromStaging() {
+  public Table fromStaging() {
     return new Table(
         fromStaging(this.getName()),
         this.getColumns(),