++

упразднение джсон в описании конфигураций

.idea/workspace.xml

@@ -7,25 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/SapforPackageCache.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMPackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMPackageCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/PackageCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.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/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfigurationsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfigurationsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

properties

@@ -26,7 +26,7 @@
   "Kernels": 8,
   "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
   "CheckTestingIntervalSeconds": 10,
-  "AutoCheckTesting": false,
+  "AutoCheckTesting": true,
   "EmailOnTestingProgress": true,
   "CompleteCompilationOptions": true,
   "CompleteRunEnvironments": true,

src/_VisualDVM/Constants.java

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1222;
+    public static final int version = 1223;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
@@ -48,7 +48,7 @@ public class Constants {
     //
     //7998 отладочный порт. теперь.
     public static final int ComponentsServerPort = 7995; //7795
-    public static final int TestingServerPort = 7998;    //7996
+    public static final int TestingServerPort = 7996;    //7996
     public static final int SocketTimeout = 0;
     //-
     public static final String ServerAddress = "alex-freenas.ddns.net";

src/_VisualDVM/ServerObjectsCache/DVMPackageCache.java

@@ -9,10 +9,10 @@ public class DVMPackageCache extends PackageCache {
     public DVMPackageCache(DVMPackage dvmPackage) {
         Vector<String> configurationsDescriptions = new Vector<>();
         Vector<DVMPackageConfiguration> package_configurations = Global.testingServer.db.getVectorByFK(dvmPackage, DVMPackageConfiguration.class);
-        for (DVMPackageConfiguration packageConfiguration: package_configurations){
+        for (DVMPackageConfiguration packageConfiguration : package_configurations) {
             String description = packageConfiguration.description;
-           if (!Global.testingServer.db.dvmConfigurations.containsKey(packageConfiguration.dvmconfiguration_id)){
+            if (!Global.testingServer.db.dvmConfigurations.containsKey(packageConfiguration.dvmconfiguration_id)) {
-               description= Utils_.strikeThrough(description);
+                description = Utils_.strikeThrough(description);
             }
             configurationsDescriptions.add(description);
         }

src/_VisualDVM/ServerObjectsCache/SapforPackageCache.java

@@ -1,7 +1,6 @@
 package _VisualDVM.ServerObjectsCache;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
 
@@ -10,10 +9,10 @@ public class SapforPackageCache extends PackageCache {
     public SapforPackageCache(SapforPackage sapforPackage) {
         Vector<String> configurationsDescriptions = new Vector<>();
         Vector<SapforPackageConfiguration> package_configurations = Global.testingServer.db.getVectorByFK(sapforPackage, SapforPackageConfiguration.class);
-        for (SapforPackageConfiguration packageConfiguration: package_configurations){
+        for (SapforPackageConfiguration packageConfiguration : package_configurations) {
             String description = packageConfiguration.description;
-            if (!Global.testingServer.db.sapforConfigurations.containsKey(packageConfiguration.sapforconfiguration_id)){
+            if (!Global.testingServer.db.sapforConfigurations.containsKey(packageConfiguration.sapforconfiguration_id)) {
-                description= Utils_.strikeThrough(description);
+                description = Utils_.strikeThrough(description);
             }
             configurationsDescriptions.add(description);
         }

src/_VisualDVM/TestingSystem/Common/Configuration/Json/ConfigurationJson.java

@@ -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() {
-    }
-}

src/_VisualDVM/TestingSystem/Common/Configuration/Json/ConfigurationsJson.java

@@ -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));
-    }
-}

src/_VisualDVM/TestingSystem/Common/TestingPackage/TestingPackage.java

@@ -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 {

src/_VisualDVM/TestingSystem/Common/TestingServer.java

@@ -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

src/_VisualDVM/TestingSystem/Common/TestsDatabase.java

@@ -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()) {

src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java

@@ -13,12 +13,14 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.ServerObjectsCache.DVMSettingsCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
+import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.Test.TestType;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
+import _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration.DVMPackageConfiguration;
 import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
@@ -47,13 +49,15 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
     @Description("DEFAULT 1")
     public int eraseWorkspace = 1; //удалять рабочее пространство пакета на целевой машине.(отключать для отладки)
     //---
+    @Description("IGNORE")
+    public Vector<DVMPackageConfiguration> configurations = null;
     public DVMPackage() {
     }
     public DVMPackage(UserAccount account,
                       Machine machine,
                       User user,
                       Compiler compiler,
-                      Vector<DVMConfiguration> configurations,
+                      Vector<DVMConfiguration> dvmConfigurations,
                       int neeedsEmail_in, int eraseWorkspace_in) {
         id = CommonConstants.Nan;
         //-
@@ -75,14 +79,14 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
         //--
         state = TasksPackageState.Queued;
         //--
-        for (DVMConfiguration configuration : configurations)
+        for (DVMConfiguration configuration : dvmConfigurations)
             kernels = Math.max(configuration.kernels, kernels);
         //-
         tasksCount = 0;
         Index index = new Index();
         //---
         Vector<DVMCompilationTask> compilationTasks = new Vector<DVMCompilationTask>();
-        for (DVMConfiguration configuration : configurations) {
+        for (DVMConfiguration configuration : dvmConfigurations) {
             //--
             LinkedHashMap<Integer, Vector<Integer>> groupsTestsIds = Global.testingServer.db.getDVMConfigurationGroupsTestsIds(configuration);
             Vector<Integer> settingsIds = Global.testingServer.db.getDVMConfigurationSettingsIds(configuration);
@@ -185,7 +189,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
             }
         }
         package_json = new DVMPackage_json(compilationTasks);
-        saveConfigurations(configurations);
+        saveConfigurations(dvmConfigurations);
     }
     public DVMPackage(DVMPackage p) {
         super(p);
@@ -380,5 +384,12 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
         description = "Выполнено на " + ((int) percent) + "%\n" +
                 "Всего задач: " + tasksCount + ", из них с ошибками " + (tasksCount - good);
     }
+    @Override
+    public void saveConfigurations(Vector<? extends Configuration> configurations_in) {
+        configurations = new Vector<>();
+        for (Configuration configuration : configurations_in) {
+            configurations.add(new DVMPackageConfiguration((DVMConfiguration) configuration));
+        }
+    }
 }
 

src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java

@@ -1,8 +1,15 @@
 package _VisualDVM.TestingSystem.DVM.DVMPackageConfiguration;
 import Common.CommonConstants;
 import Common.Database.Objects.iDBObject;
+import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
 public class DVMPackageConfiguration extends iDBObject {
     public int dvmpackage_id = CommonConstants.Nan;
     public int dvmconfiguration_id = CommonConstants.Nan;
-    public String description ="";
+    public String description = "";
+    public DVMPackageConfiguration() {
+    }
+    public DVMPackageConfiguration(DVMConfiguration configuration_in) {
+        dvmconfiguration_id = configuration_in.id;
+        description = configuration_in.description;
+    }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java

@@ -6,10 +6,12 @@ import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.TaskState;
+import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
 import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 import _VisualDVM.TestingSystem.SAPFOR.Json.SapforPackage_json;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import com.sun.org.glassfish.gmbal.Description;
@@ -24,6 +26,8 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
     @Description("DEFAULT 0")
     public int mismatchesCount = 0; //различия с эталоном
     //--
+    @Description("IGNORE")
+    public Vector<SapforPackageConfiguration> configurations = null;
     public SapforPackage() {
     }
     public SapforPackage(SapforPackage sapforPackage) {
@@ -121,4 +125,11 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
         }
         return log.isEmpty();
     }
+    @Override
+    public void saveConfigurations(Vector<? extends Configuration> configurations_in) {
+        configurations = new Vector<>();
+        for (Configuration configuration : configurations_in) {
+            configurations.add(new SapforPackageConfiguration((SapforConfiguration) configuration));
+        }
+    }
 }

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java

@@ -1,8 +1,15 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration;
 import Common.CommonConstants;
 import Common.Database.Objects.iDBObject;
+import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 public class SapforPackageConfiguration extends iDBObject {
     public int sapforpackage_id = CommonConstants.Nan;
     public int sapforconfiguration_id = CommonConstants.Nan;
-    public String description ="";
+    public String description = "";
+    public SapforPackageConfiguration() {
+    }
+    public SapforPackageConfiguration(SapforConfiguration configuration_in) {
+        sapforconfiguration_id = configuration_in.id;
+        description = configuration_in.description;
+    }
 }