Intermediate changes

2 files changed, 16 insertions, 18 deletions

diff --git a/yt/yt/client/driver/scheduler_commands.cpp b/yt/yt/client/driver/scheduler_commands.cpp
index ce7e07d67c..be52ea9770 100644
--- a/yt/yt/client/driver/scheduler_commands.cpp
+++ b/yt/yt/client/driver/scheduler_commands.cpp
@@ -632,9 +632,7 @@ void TAbortJobCommand::DoExecute(ICommandContextPtr context)
 void TDumpJobProxyLogCommand::Register(TRegistrar registrar)
 {
     registrar.Parameter("job_id", &TThis::JobId);
-
     registrar.Parameter("operation_id", &TThis::OperationId);
-
     registrar.Parameter("path", &TThis::Path);
 }
 
diff --git a/yt/yt/client/driver/scheduler_commands.h b/yt/yt/client/driver/scheduler_commands.h
index 5b29f94ce5..349b16d750 100644
--- a/yt/yt/client/driver/scheduler_commands.h
+++ b/yt/yt/client/driver/scheduler_commands.h
@@ -16,14 +16,6 @@ template <class TOptions>
 class TSimpleOperationCommandBase
     : public virtual TTypedCommandBase<TOptions>
 {
-private:
-    NScheduler::TOperationId OperationId;
-    std::optional<TString> OperationAlias;
-
-protected:
-    // Is calculated by two fields above.
-    NScheduler::TOperationIdOrAlias OperationIdOrAlias;
-
 public:
     REGISTER_YSON_STRUCT_LITE(TSimpleOperationCommandBase);
 
@@ -51,6 +43,14 @@ public:
             }
         });
     }
+
+protected:
+    // Is calculated by OperationId and OperationAlias.
+    NScheduler::TOperationIdOrAlias OperationIdOrAlias;
+
+private:
+    NScheduler::TOperationId OperationId;
+    std::optional<TString> OperationAlias;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -237,15 +237,15 @@ private:
 class TAbortJobCommand
     : public TTypedCommand<NApi::TAbortJobOptions>
 {
-private:
-    NJobTrackerClient::TJobId JobId;
-
 public:
     REGISTER_YSON_STRUCT_LITE(TAbortJobCommand);
 
     static void Register(TRegistrar registrar);
 
     void DoExecute(ICommandContextPtr context) override;
+
+private:
+    NJobTrackerClient::TJobId JobId;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -253,17 +253,17 @@ public:
 class TDumpJobProxyLogCommand
     : public TTypedCommand<NApi::TDumpJobProxyLogOptions>
 {
-private:
-    NJobTrackerClient::TJobId JobId;
-    NJobTrackerClient::TOperationId OperationId;
-    NYPath::TYPath Path;
-
 public:
     REGISTER_YSON_STRUCT_LITE(TDumpJobProxyLogCommand);
 
     static void Register(TRegistrar registrar);
 
     void DoExecute(ICommandContextPtr context) override;
+
+private:
+    NJobTrackerClient::TJobId JobId;
+    NJobTrackerClient::TOperationId OperationId;
+    NYPath::TYPath Path;
 };
 
 ////////////////////////////////////////////////////////////////////////////////