удаление устаревших кодов для сервера
This commit is contained in:
15
.idea/workspace.xml
generated
15
.idea/workspace.xml
generated
@@ -7,19 +7,10 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
|
||||||
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerRequestUnit.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/NormalProperties.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishComponent.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/BugReport.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/RepositoryServer.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ComponentsServer.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/SynchronizationSettingsMenu.java" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@@ -118,11 +109,11 @@
|
|||||||
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
|
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
|
||||||
</key>
|
</key>
|
||||||
<key name="MoveMembersDialog.RECENTS_KEY">
|
<key name="MoveMembersDialog.RECENTS_KEY">
|
||||||
|
<recent name="_VisualDVM.Constants" />
|
||||||
<recent name="_VisualDVM.Global" />
|
<recent name="_VisualDVM.Global" />
|
||||||
<recent name="_VisualDVM.ProjectData.SapforData.Arrays.UI.ProjectArraysForm" />
|
<recent name="_VisualDVM.ProjectData.SapforData.Arrays.UI.ProjectArraysForm" />
|
||||||
<recent name="_VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm" />
|
<recent name="_VisualDVM.TestingSystem.SAPFOR.SapforPackage.UI.SapforPackagesForm" />
|
||||||
<recent name="_VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm" />
|
<recent name="_VisualDVM.TestingSystem.DVM.DVMPackage.UI.DVMPackagesForm" />
|
||||||
<recent name="_VisualDVM.TestingSystem.Common.Group.UI.GroupsForm" />
|
|
||||||
</key>
|
</key>
|
||||||
<key name="MoveFile.RECENT_KEYS">
|
<key name="MoveFile.RECENT_KEYS">
|
||||||
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\TestingSystem\SAPFOR\SapforSettingsCommand\UI" />
|
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\_VisualDVM\TestingSystem\SAPFOR\SapforSettingsCommand\UI" />
|
||||||
|
|||||||
@@ -62,8 +62,6 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
|
|||||||
switch (ExitCode = server_response.getCode()) {
|
switch (ExitCode = server_response.getCode()) {
|
||||||
case FAIL:
|
case FAIL:
|
||||||
throw (Exception) server_response.object;
|
throw (Exception) server_response.object;
|
||||||
case OLD:
|
|
||||||
throw new PassException("Сервер устарел.");
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -79,10 +77,6 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void CheckException(Exception ex) {
|
protected void CheckException(Exception ex) {
|
||||||
if (ExitCode.equals(ServerCode.OLD)) {
|
|
||||||
Log.Writeln_("Текущий сервер устарел. Доступны только обновления компонент!");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (ex instanceof RepositoryRefuseException) {
|
if (ex instanceof RepositoryRefuseException) {
|
||||||
Log.Writeln_(ex.getMessage());
|
Log.Writeln_(ex.getMessage());
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -1,57 +1,43 @@
|
|||||||
package _VisualDVM.Repository.Server;
|
package _VisualDVM.Repository.Server;
|
||||||
public enum ServerCode {
|
public enum ServerCode {
|
||||||
Undefined,
|
Undefined,
|
||||||
|
TestCode,
|
||||||
|
Ping,
|
||||||
ReadFile,
|
ReadFile,
|
||||||
SendFile,
|
SendFile,
|
||||||
ReceiveFile,
|
ReceiveFile,
|
||||||
//--
|
//--
|
||||||
RegisterSubscriber,
|
|
||||||
CheckSubscriberRole,
|
CheckSubscriberRole,
|
||||||
//-
|
//-
|
||||||
GetComponentsBackups,
|
GetComponentsBackups,
|
||||||
//-
|
//-
|
||||||
UpdateBugReportField,//todo выкинуть после обновления.
|
|
||||||
UpdateBugReport,
|
UpdateBugReport,
|
||||||
AppendBugReportTextField,
|
AppendBugReportTextField,
|
||||||
//-
|
//-
|
||||||
Email,
|
Email,
|
||||||
EmailBroadcast,
|
|
||||||
ReceiveAllArchives,
|
ReceiveAllArchives,
|
||||||
//-
|
//-
|
||||||
DownloadTest,
|
DownloadTest,
|
||||||
//-
|
//-
|
||||||
OK,
|
OK,
|
||||||
//-
|
//-
|
||||||
GetTestProject,
|
|
||||||
StartTests,
|
|
||||||
//-
|
|
||||||
RefreshDVMTests, //- для админа. получение тестов из репозитория.
|
RefreshDVMTests, //- для админа. получение тестов из репозитория.
|
||||||
//-
|
//-
|
||||||
EditObject,
|
EditObject,
|
||||||
DeleteObject, //--------------------УСТАРЕЛО. УБРАТЬ.
|
|
||||||
GetObjectCopyByPK,
|
GetObjectCopyByPK,
|
||||||
GetObjectsCopiesByPK,
|
GetObjectsCopiesByPK,
|
||||||
DeleteObjects,
|
|
||||||
DeleteObjectsByPK,
|
DeleteObjectsByPK,
|
||||||
CheckObjectExistense,
|
|
||||||
CloneObjectByPK,
|
CloneObjectByPK,
|
||||||
//
|
//
|
||||||
//--
|
//--
|
||||||
EXIT,
|
|
||||||
//--
|
|
||||||
FAIL,
|
FAIL,
|
||||||
//--
|
//--
|
||||||
ReceiveBugReportsDatabase,
|
ReceiveBugReportsDatabase,
|
||||||
ReceiveTestsDatabase,
|
ReceiveTestsDatabase,
|
||||||
ReceiveTestsTasksDatabase,
|
|
||||||
PublishComponent, //todo удалить устарел
|
|
||||||
UpdateComponent,
|
UpdateComponent,
|
||||||
UpdateComponentMinimalVersion, //возможно потом, слить воедино с публикацией?
|
|
||||||
ReceiveComponent,
|
ReceiveComponent,
|
||||||
ReceiveBugReport,
|
ReceiveBugReport,
|
||||||
SendBugReport,
|
SendBugReport,
|
||||||
GetComponentsVersions, //todo удалить устарел
|
|
||||||
GetComponentsMinimalVersions, //todo удалить устарел
|
|
||||||
GetComponentsVersionsInfo,
|
GetComponentsVersionsInfo,
|
||||||
GetComponentChangesLog,
|
GetComponentChangesLog,
|
||||||
//--
|
//--
|
||||||
@@ -60,31 +46,18 @@ public enum ServerCode {
|
|||||||
//-
|
//-
|
||||||
DeleteObjectByPK,
|
DeleteObjectByPK,
|
||||||
//-
|
//-
|
||||||
OLD,
|
|
||||||
//-
|
|
||||||
PublishAccount,
|
|
||||||
GetActualSapforPackageData,
|
|
||||||
//--
|
|
||||||
PublishObject,
|
PublishObject,
|
||||||
PublishObjects,
|
PublishObjects,
|
||||||
UpdateTestTasks,
|
|
||||||
ActualizeSAPFORPackages,
|
|
||||||
ActualizeDVMPackages,
|
ActualizeDVMPackages,
|
||||||
GetFirstActiveDVMPackage,
|
|
||||||
DVMPackageNeedsKill,
|
DVMPackageNeedsKill,
|
||||||
UpdateActiveDVMPackages,
|
UpdateActiveDVMPackages,
|
||||||
GetFirstActiveSapforPackages,
|
GetFirstActiveSapforPackages,
|
||||||
SapforPackageNeedsKill,
|
SapforPackageNeedsKill,
|
||||||
UpdateActiveSapforPackages,
|
UpdateActiveSapforPackages,
|
||||||
DownloadDVMPackage,
|
|
||||||
DownloadDVMPackages,
|
DownloadDVMPackages,
|
||||||
DownloadSapforPackage,
|
DownloadSapforPackage,
|
||||||
ReplaceTestCode,
|
ReplaceTestCode,
|
||||||
ReplaceTestsCodes,
|
ReplaceTestsCodes,
|
||||||
GetDVMPackagesJson,
|
|
||||||
GetSapforPackagesJson,
|
|
||||||
GetFirstsActiveDVMPackages,
|
|
||||||
Ping,
|
|
||||||
GetFirstActiveDVMPackageForMachineURL,
|
GetFirstActiveDVMPackageForMachineURL,
|
||||||
GetServerName,
|
GetServerName,
|
||||||
StartNecessaryMachines,
|
StartNecessaryMachines,
|
||||||
@@ -92,7 +65,8 @@ public enum ServerCode {
|
|||||||
GetMaxSapforVersion,
|
GetMaxSapforVersion,
|
||||||
PerformAutoSapforTesting,
|
PerformAutoSapforTesting,
|
||||||
JoinSapforVersionsToGroup,
|
JoinSapforVersionsToGroup,
|
||||||
TestCode, ReplaceDVMPackageResults, DetectTestsMinMaxDim;
|
ReplaceDVMPackageResults,
|
||||||
|
DetectTestsMinMaxDim;
|
||||||
public String getDescription(){
|
public String getDescription(){
|
||||||
switch (this){
|
switch (this){
|
||||||
case DetectTestsMinMaxDim:
|
case DetectTestsMinMaxDim:
|
||||||
@@ -121,8 +95,6 @@ public enum ServerCode {
|
|||||||
return "Получение журнала изменений компонента с сервера";
|
return "Получение журнала изменений компонента с сервера";
|
||||||
case CheckURLRegistered:
|
case CheckURLRegistered:
|
||||||
return "Проверка регистрации машины на сервере";
|
return "Проверка регистрации машины на сервере";
|
||||||
case EmailBroadcast:
|
|
||||||
return "Рассылка";
|
|
||||||
case PublishObjects:
|
case PublishObjects:
|
||||||
return "Публикация объектов на сервере";
|
return "Публикация объектов на сервере";
|
||||||
case ReplaceTestCode:
|
case ReplaceTestCode:
|
||||||
@@ -147,8 +119,6 @@ public enum ServerCode {
|
|||||||
return "Дублирование объекта на сервере";
|
return "Дублирование объекта на сервере";
|
||||||
case UpdateActiveDVMPackages:
|
case UpdateActiveDVMPackages:
|
||||||
return "Актуализация активных DVM пакетов на сервере";
|
return "Актуализация активных DVM пакетов на сервере";
|
||||||
case ActualizeSAPFORPackages:
|
|
||||||
return "Актуализация активных SAPFOR пакетов на сервере";
|
|
||||||
default:
|
default:
|
||||||
return this.toString();
|
return this.toString();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -332,10 +332,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
Print("Получить данные по пакетам Sapfor");
|
Print("Получить данные по пакетам Sapfor");
|
||||||
UpdateActiveSapforPackages();
|
UpdateActiveSapforPackages();
|
||||||
break;
|
break;
|
||||||
case DownloadDVMPackage:
|
|
||||||
Print("Загрузить пакет DVM");
|
|
||||||
DownloadDVMPackage();
|
|
||||||
break;
|
|
||||||
case DownloadDVMPackages:
|
case DownloadDVMPackages:
|
||||||
Print("Загрузить пакеты DVM");
|
Print("Загрузить пакеты DVM");
|
||||||
DownloadDVMPackages();
|
DownloadDVMPackages();
|
||||||
@@ -352,14 +348,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
Print("Заменить код тестов");
|
Print("Заменить код тестов");
|
||||||
ReplaceTestsCodes();
|
ReplaceTestsCodes();
|
||||||
break;
|
break;
|
||||||
case GetSapforPackagesJson:
|
|
||||||
Print("Получить информацию о задачах пакетов SAPFOR");
|
|
||||||
GetSapforPackagesJson();
|
|
||||||
break;
|
|
||||||
case GetDVMPackagesJson:
|
|
||||||
Print("Получить информацию о задачах пакетов DVM");
|
|
||||||
GetDVMPackagesJson();
|
|
||||||
break;
|
|
||||||
case GetFirstActiveDVMPackageForMachineURL:
|
case GetFirstActiveDVMPackageForMachineURL:
|
||||||
Print("Получить первый активный пакет задач DVM на машине с адресом");
|
Print("Получить первый активный пакет задач DVM на машине с адресом");
|
||||||
GetFirstActiveDVMPackageForMachineURL();
|
GetFirstActiveDVMPackageForMachineURL();
|
||||||
@@ -529,17 +517,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void DownloadDVMPackage() throws Exception {
|
|
||||||
int dvmPackage_id = (int) request.object;
|
|
||||||
if (!db.dvmPackages.containsKey(dvmPackage_id))
|
|
||||||
throw new RepositoryRefuseException("Не найдено пакета тестирования DVM с ключом " + dvmPackage_id);
|
|
||||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
|
||||||
DVMPackage dvmPackage = db.dvmPackages.get(dvmPackage_id);
|
|
||||||
File workspace = dvmPackage.getLocalWorkspace();
|
|
||||||
File results_zip = new File(workspace, "results.zip");
|
|
||||||
File package_json = dvmPackage.getJsonFile();
|
|
||||||
response.object = new Pair(Utils_.fileToBytes(results_zip), Utils_.fileToBytes(package_json));
|
|
||||||
}
|
|
||||||
private void DownloadDVMPackages() throws Exception {
|
private void DownloadDVMPackages() throws Exception {
|
||||||
Vector<Integer> ids = (Vector<Integer>) request.object;
|
Vector<Integer> ids = (Vector<Integer>) request.object;
|
||||||
Vector<Pair<Integer, Pair<byte[], byte[]>>> res = new Vector<>();
|
Vector<Pair<Integer, Pair<byte[], byte[]>>> res = new Vector<>();
|
||||||
|
|||||||
Reference in New Issue
Block a user