resolve conflict

Author: guowl3

server/odc-server/src/main/java/com/oceanbase/odc/server/web/controller/v2/ScheduleController.java

@@ -306,16 +306,17 @@ public SuccessResponse<List<ScheduleTerminateResult>> getTerminateScheduleResult
     public SuccessResponse<String> getTerminateScheduleLog(String terminateId) {
         return Responses.ok(scheduleService.getTerminateLog(terminateId));
     }
+
     @RequestMapping(value = "/schedules/stats", method = RequestMethod.GET)
     public ListResponse<ScheduleStat> getScheduleStats(
-        @RequestParam(required = false, name = "types") Set<ScheduleType> types,
-        @RequestParam(required = false, name = "startTime") Date startTime,
-        @RequestParam(required = false, name = "endTime") Date endTime) {
+            @RequestParam(required = false, name = "types") Set<ScheduleType> types,
+            @RequestParam(required = false, name = "startTime") Date startTime,
+            @RequestParam(required = false, name = "endTime") Date endTime) {
         QueryScheduleStatParams req = QueryScheduleStatParams.builder()
-            .scheduleTypes(types)
-            .startTime(startTime)
-            .endTime(endTime)
-            .build();
+                .scheduleTypes(types)
+                .startTime(startTime)
+                .endTime(endTime)
+                .build();
         return Responses.list(scheduleService.listScheduleStat(req));
     }
 }

server/odc-service/src/main/java/com/oceanbase/odc/service/connection/database/DatabaseService.java

@@ -38,7 +38,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.locks.Lock;
-import java.util.function.Function;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1128,7 +1127,7 @@ private Page<Database> entitiesToModels(Page<DatabaseEntity> entities, boolean i
             return Page.empty();
         }
         Map<Long, Project> projectId2Project = projectService.mapByIdIn(entities.stream()
-            .map(DatabaseEntity::getProjectId).collect(Collectors.toSet()));
+                .map(DatabaseEntity::getProjectId).collect(Collectors.toSet()));
         Map<Long, List<ConnectionConfig>> connectionId2Connections = connectionService.mapByIdIn(entities.stream()
                 .map(DatabaseEntity::getConnectionId).collect(Collectors.toSet()));
         Map<Long, Set<DatabasePermissionType>> databaseId2PermittedActions = new HashMap<>();

server/odc-service/src/main/java/com/oceanbase/odc/service/flow/FlowInstanceService.java

@@ -195,8 +195,8 @@
 import com.oceanbase.odc.service.schedule.model.ScheduleStatus;
 import com.oceanbase.odc.service.state.StatefulUuidStateIdGenerator;
 import com.oceanbase.odc.service.task.TaskService;
-import com.oceanbase.odc.service.task.executor.logger.LogUtils;
 import com.oceanbase.odc.service.task.base.precheck.PreCheckRiskLevel;
+import com.oceanbase.odc.service.task.executor.logger.LogUtils;
 import com.oceanbase.odc.service.task.model.ExecutorInfo;
 import com.oceanbase.odc.service.task.service.SpringTransactionManager;
 import com.oceanbase.tools.loaddump.common.enums.ObjectType;

server/odc-service/src/main/java/com/oceanbase/odc/service/flow/factory/FlowResponseMapperFactory.java

@@ -296,11 +296,9 @@ private FlowInstanceMapper generateMapper(@NonNull Collection<Long> flowInstance
         Map<Long, TaskEntity> taskId2TaskEntity = getTaskEntityMap(serviceEntities);
         populateTaskMappings(serviceEntities, flowInstanceId2Tasks, taskId2TaskEntity);
 
-        Set<Long> databaseIds = getDatabaseIds(taskId2TaskEntity);
         /**
          * Get Database associated with each TaskEntity
          */
-        Map<Long, Database> id2Database = new HashMap<>();
         Set<Long> databaseIds = taskId2TaskEntity.values().stream()
                 .map(TaskEntity::getDatabaseId)
                 .filter(Objects::nonNull).collect(Collectors.toSet());

server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/export/ScheduleExportService.java

@@ -29,14 +29,10 @@
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
-import com.oceanbase.odc.common.security.PasswordUtils;
+import com.oceanbase.odc.common.task.RouteLogCallable;
 import com.oceanbase.odc.core.authority.util.SkipAuthorize;
-import com.oceanbase.odc.core.shared.PreConditions;
 import com.oceanbase.odc.core.shared.SingleOrganizationResource;
-import com.oceanbase.odc.core.shared.constant.OrganizationType;
-import com.oceanbase.odc.core.shared.constant.ResourceRoleName;
 import com.oceanbase.odc.core.shared.constant.ResourceType;
-import com.oceanbase.odc.common.task.RouteLogCallable;
 import com.oceanbase.odc.metadb.flow.FlowInstanceEntity;
 import com.oceanbase.odc.metadb.schedule.ScheduleEntity;
 import com.oceanbase.odc.metadb.schedule.ScheduleRepository;
@@ -180,8 +176,8 @@ public FileExportResponse getExportResult(String exportId) {
     public String getExportLog(String exportId) {
         statefulUuidStateIdGenerator.checkCurrentUserId(exportId);
         String filePath = String.format(RouteLogCallable.LOG_PATH_PATTERN, logPath,
-            ScheduleTaskExportCallable.WORK_SPACE, exportId,
-            ScheduleTaskExportCallable.LOG_NAME);
+                ScheduleTaskExportCallable.WORK_SPACE, exportId,
+                ScheduleTaskExportCallable.LOG_NAME);
         File logFile = new File(filePath);
         return LogUtils.getLatestLogContent(logFile, 10000L, 1048576L);
     }

server/odc-service/src/main/java/com/oceanbase/odc/service/schedule/util/BatchSchedulePermissionValidator.java

@@ -24,7 +24,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-import com.oceanbase.odc.core.shared.OrganizationIsolated;
+import com.oceanbase.odc.core.shared.SingleOrganizationResource;
 import com.oceanbase.odc.core.shared.constant.OrganizationType;
 import com.oceanbase.odc.core.shared.constant.ResourceRoleName;
 import com.oceanbase.odc.core.shared.constant.ResourceType;
@@ -86,7 +86,7 @@ public void checkScheduleIdsPermission(ScheduleType scheduleType, Collection<Lon
 
     @Data
     @AllArgsConstructor
-    private final static class FlowOrganizationIsolated implements OrganizationIsolated {
+    private final static class FlowOrganizationIsolated implements SingleOrganizationResource {
 
         private Long organizationId;
         private Long id;