M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

++

Browse Source 
упразднение джсон в описании конфигураций
This commit is contained in:
02090095
2025-03-23 22:03:17 +03:00
parent af644f8f04
commit 535053baca
14 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/_VisualDVM/TestingSystem/Common/Configuration/Json/ConfigurationJson.java
View File

@@ -1,17 +0,0 @@
package _VisualDVM.TestingSystem.Common.Configuration.Json;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
public class ConfigurationJson implements Serializable {
@Expose
public int id;
@Expose
public String description;
public ConfigurationJson(Configuration configuration) {
id = configuration.id;
description = configuration.description;
}
public ConfigurationJson() {
}
}

19
src/_VisualDVM/TestingSystem/Common/Configuration/Json/ConfigurationsJson.java
View File

@@ -1,19 +0,0 @@
package _VisualDVM.TestingSystem.Common.Configuration.Json;
import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
import com.google.gson.annotations.Expose;
import java.io.Serializable;
import java.util.List;
import java.util.Vector;
public class ConfigurationsJson implements Serializable {
@Expose
public List<ConfigurationJson> array = new Vector<>();
public ConfigurationsJson() {
}
//при создании пакета.
public ConfigurationsJson(Vector<? extends Configuration> configurations) {
array = new Vector<>();
for (Configuration configuration : configurations)
array.add(new ConfigurationJson(configuration));
}
}

3
src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java
View File

@@ -26,7 +26,6 @@ public abstract class TestingPackage<J> extends riDBObject {
@Description("DEFAULT 0")
public int connectionErrosCount = 0;
public TasksPackageState state = TasksPackageState.Draft;
public String packedConfigurationsJson = "";
//json где хранятся задачи----------------------------------
@Description("IGNORE")
public J package_json = null;
@@ -82,7 +81,7 @@ public abstract class TestingPackage<J> extends riDBObject {
package_json = null;
}
//----------------------------------------------------------
public void saveConfigurations(Vector<? extends Configuration> configurations) {
public void saveConfigurations(Vector<? extends Configuration> configurations_in) {
}
//определить завершен пакет с ошибками или нет.
public void checkFinishState() throws Exception {

5
src/_VisualDVM/TestingSystem/Common/TestingServer.java
View File

@@ -137,9 +137,12 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
//Занести учетные данные пакета в базу о машинах. это основной поток, нить не нужна. арг это пароль
DVMPackageCredentials credentials = new DVMPackageCredentials(dvmPackage, request.arg);
machines_db.Insert(credentials);
db.saveDVMPackageConfigurations(dvmPackage);
//--
} else if (object instanceof SapforPackage) {
((SapforPackage) object).init();
SapforPackage sapforPackage = (SapforPackage) object;
sapforPackage.init();
db.saveSapforPackageConfigurations(sapforPackage);
}
}
@Override

16
src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
View File

@@ -8,8 +8,6 @@ import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationsJson;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -527,6 +525,20 @@ public class TestsDatabase extends SQLiteDatabase {
//-
*/
}
public void saveDVMPackageConfigurations(DVMPackage dvmPackage) throws Exception {
for (DVMPackageConfiguration packageConfiguration : dvmPackage.configurations) {
packageConfiguration.dvmpackage_id = dvmPackage.id;
Insert(packageConfiguration);
}
dvmPackage.configurations = null;
}
public void saveSapforPackageConfigurations(SapforPackage dvmPackage) throws Exception {
for (SapforPackageConfiguration packageConfiguration : dvmPackage.configurations) {
packageConfiguration.sapforpackage_id = dvmPackage.id;
Insert(packageConfiguration);
}
dvmPackage.configurations = null;
}
public Vector<Integer> getDVMConfigurationGroupsIds(DVMConfiguration configuration) {
Vector<Integer> res = new Vector<>();
for (DVMConfigurationGroup dvmConfigurationGroup : dvmConfigurationGroups.Data.values()) {