рефакторинг взаимодействия с бд сервера. был индийский код при альтернативной базе на сервере компонент
This commit is contained in:
21
.idea/workspace.xml
generated
21
.idea/workspace.xml
generated
@@ -7,15 +7,22 @@
|
|||||||
</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/Passes/All/SPF_RemoveSpfDirectives.java" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java" afterDir="false" />
|
||||||
<change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_RemoveSpfDirectives.png" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroupsDBTable.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/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphLoops.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteUserAccount.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditUserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditUserAccount.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Sapfor/SapforPass.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishUserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishUserAccount.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/PublishServerObject.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ServerObjectPass.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.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/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Test.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" />
|
||||||
</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" />
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
package _VisualDVM.ComponentsServer;
|
package _VisualDVM.ComponentsServer;
|
||||||
|
import Common.Database.Database;
|
||||||
import Common.Database.Objects.DBObject;
|
import Common.Database.Objects.DBObject;
|
||||||
import Common.Database.RepositoryRefuseException;
|
import Common.Database.RepositoryRefuseException;
|
||||||
import Common.Utils.Utils_;
|
import Common.Utils.Utils_;
|
||||||
@@ -48,6 +49,12 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
zip.Do("Bugs", new File(todayBackUp, "Bugs.zip").getAbsolutePath());
|
zip.Do("Bugs", new File(todayBackUp, "Bugs.zip").getAbsolutePath());
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
public Database getDb() {
|
||||||
|
if (request.arg.equals("credentials"))
|
||||||
|
return credentials_db;
|
||||||
|
return super.getDb();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
protected void beforePublishAction(DBObject object) throws Exception {
|
protected void beforePublishAction(DBObject object) throws Exception {
|
||||||
if (object instanceof BugReport) {
|
if (object instanceof BugReport) {
|
||||||
BugReport bugReport = (BugReport) object;
|
BugReport bugReport = (BugReport) object;
|
||||||
@@ -287,32 +294,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
void ReceiveCredentialsDatabase() throws Exception {
|
void ReceiveCredentialsDatabase() throws Exception {
|
||||||
response.object = Utils_.fileToBytes(credentials_db.getFile());
|
response.object = Utils_.fileToBytes(credentials_db.getFile());
|
||||||
}
|
}
|
||||||
void PublishUserAccount() throws Exception {
|
|
||||||
DBObject dbObject = (DBObject) request.object;
|
|
||||||
response.object = (Serializable) credentials_db.InsertS(dbObject).getPK();
|
|
||||||
credentials_db.userAccounts.get(response.object).generateKey();
|
|
||||||
}
|
|
||||||
void EditUserAccount() throws Exception {
|
|
||||||
UserAccount new_object = (UserAccount) request.object;
|
|
||||||
credentials_db.UpdateWithCheck(new_object);
|
|
||||||
afterEditAction(new_object);
|
|
||||||
}
|
|
||||||
void DeleteUserAccount() throws Exception {
|
|
||||||
Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
|
|
||||||
afterDeleteAction(credentials_db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
|
|
||||||
}
|
|
||||||
void PublishSubscriberWorkspace() throws Exception {
|
|
||||||
DBObject dbObject = (DBObject) request.object;
|
|
||||||
response.object = (Serializable) credentials_db.InsertS(dbObject).getPK();
|
|
||||||
}
|
|
||||||
void EditSubcriberWorkpace() throws Exception {
|
|
||||||
SubscriberWorkspace new_object = (SubscriberWorkspace) request.object;
|
|
||||||
credentials_db.UpdateWithCheck(new_object);
|
|
||||||
}
|
|
||||||
void DeleteSubscriberWorkspace() throws Exception {
|
|
||||||
Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
|
|
||||||
afterDeleteAction(credentials_db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
|
|
||||||
}
|
|
||||||
//--
|
//--
|
||||||
@Override
|
@Override
|
||||||
protected void UnsafeSession() throws Exception {
|
protected void UnsafeSession() throws Exception {
|
||||||
@@ -346,21 +327,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
@Override
|
@Override
|
||||||
protected void Session() throws Exception {
|
protected void Session() throws Exception {
|
||||||
switch (code) {
|
switch (code) {
|
||||||
case PublishUserAccount:
|
|
||||||
PublishUserAccount();
|
|
||||||
break;
|
|
||||||
case EditUserAccount:
|
|
||||||
EditUserAccount();
|
|
||||||
break;
|
|
||||||
case PublishSubscriberWorkspace:
|
|
||||||
PublishSubscriberWorkspace();
|
|
||||||
break;
|
|
||||||
case EditSubcriberWorkpace:
|
|
||||||
EditSubcriberWorkpace();
|
|
||||||
break;
|
|
||||||
case DeleteSubscriberWorkspace:
|
|
||||||
DeleteSubscriberWorkspace();
|
|
||||||
break;
|
|
||||||
case ReceiveCredentialsDatabase:
|
case ReceiveCredentialsDatabase:
|
||||||
ReceiveCredentialsDatabase();
|
ReceiveCredentialsDatabase();
|
||||||
break;
|
break;
|
||||||
@@ -382,9 +348,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
|||||||
case DVMConvertProject:
|
case DVMConvertProject:
|
||||||
DVMConvertProject();
|
DVMConvertProject();
|
||||||
break;
|
break;
|
||||||
case DeleteUserAccount:
|
|
||||||
DeleteUserAccount();
|
|
||||||
break;
|
|
||||||
case CheckURLRegistered:
|
case CheckURLRegistered:
|
||||||
CheckURLRegistered();
|
CheckURLRegistered();
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ public class DeleteRemoteWorkspace extends ComponentsServerPass<SubscriberWorksp
|
|||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
if (Global.componentsServer.credentials_db.workspaces.getUI().CheckCurrent(Log)) {
|
if (Global.componentsServer.credentials_db.workspaces.getUI().CheckCurrent(Log)) {
|
||||||
target = Global.componentsServer.credentials_db.workspaces.getUI().getCurrent();
|
target = Global.componentsServer.credentials_db.workspaces.getUI().getCurrent();
|
||||||
return SendRequest(ServerCode.DeleteSubscriberWorkspace, "",
|
return SendRequest(ServerCode.DeleteObjectByPK, "credentials",
|
||||||
new Pair<>(target.getClass(), target.getPK()));
|
new Pair<>(target.getClass(), target.getPK()));
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -16,8 +16,7 @@ public class DeleteUserAccount extends DeleteServerObject<ComponentsServer, User
|
|||||||
return server.credentials_db;
|
return server.credentials_db;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void ServerAction() throws Exception {
|
protected String getDBName() {
|
||||||
Command(new SafeServerExchangeUnit(ServerCode.DeleteUserAccount, "",
|
return "credentials";
|
||||||
new Pair<>(target.getClass(), target.getPK())));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class EditUserAccount extends EditServerObject<ComponentsServer, UserAcco
|
|||||||
return Global.componentsServer.credentials_db;
|
return Global.componentsServer.credentials_db;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void ServerAction() throws Exception {
|
protected String getDBName() {
|
||||||
Command(new SafeServerExchangeUnit(ServerCode.EditUserAccount, "", target));
|
return "credentials";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,6 @@ public class PublishRemoteWorkspace extends ComponentsServerPass<SubscriberWorks
|
|||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
target = (SubscriberWorkspace) args[0];
|
target = (SubscriberWorkspace) args[0];
|
||||||
return SendRequest(ServerCode.PublishSubscriberWorkspace, "", target);
|
return SendRequest(ServerCode.PublishObject, "credentials", target);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,8 +15,7 @@ public class PublishUserAccount extends PublishServerObject<ComponentsServer, Us
|
|||||||
return server.credentials_db;
|
return server.credentials_db;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void ServerAction() throws Exception {
|
protected String getDBName() {
|
||||||
Command(new SafeServerExchangeUnit(ServerCode.PublishUserAccount, "", target));
|
return "credentials";
|
||||||
pk = server_response.object;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void ServerAction() throws Exception {
|
protected void ServerAction() throws Exception {
|
||||||
Command(new SafeServerExchangeUnit(ServerCode.DeleteObjectByPK, "",
|
Command(new SafeServerExchangeUnit(ServerCode.DeleteObjectByPK, getDBName(),
|
||||||
new Pair<>(target.getClass(), target.getPK())));
|
new Pair<>(target.getClass(), target.getPK())));
|
||||||
VisualCaches.DeleteCache(target);
|
VisualCaches.DeleteCache(target);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
|
|||||||
//--
|
//--
|
||||||
@Override
|
@Override
|
||||||
protected void ServerAction() throws Exception {
|
protected void ServerAction() throws Exception {
|
||||||
Command(new SafeServerExchangeUnit(ServerCode.EditObject, "", target));
|
Command(new SafeServerExchangeUnit(ServerCode.EditObject, getDBName(), target));
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected void showDone() throws Exception {
|
protected void showDone() throws Exception {
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ public class PublishServerObject<S extends RepositoryServer, D extends DBObject>
|
|||||||
//--
|
//--
|
||||||
@Override
|
@Override
|
||||||
protected void ServerAction() throws Exception {
|
protected void ServerAction() throws Exception {
|
||||||
Command(new SafeServerExchangeUnit(ServerCode.PublishObject, "", target));
|
Command(new SafeServerExchangeUnit(ServerCode.PublishObject, getDBName(), target));
|
||||||
pk = server_response.object;
|
pk = server_response.object;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ public abstract class ServerObjectPass<S extends RepositoryServer, D extends DBO
|
|||||||
protected Database getDb() {
|
protected Database getDb() {
|
||||||
return server.db;
|
return server.db;
|
||||||
}
|
}
|
||||||
|
protected String getDBName(){return "";}
|
||||||
@Override
|
@Override
|
||||||
protected void performFinish() throws Exception {
|
protected void performFinish() throws Exception {
|
||||||
super.performFinish();
|
super.performFinish();
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ public abstract class RepositoryServer<D extends Database> {
|
|||||||
DeleteObjectsByPK();
|
DeleteObjectsByPK();
|
||||||
break;
|
break;
|
||||||
case CloneObjectByPK:
|
case CloneObjectByPK:
|
||||||
CloneObject();
|
CloneRObject();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
Session();
|
Session();
|
||||||
@@ -373,26 +373,41 @@ public abstract class RepositoryServer<D extends Database> {
|
|||||||
}
|
}
|
||||||
protected void extraBackup(File todayBackUp) {
|
protected void extraBackup(File todayBackUp) {
|
||||||
}
|
}
|
||||||
//----
|
//--
|
||||||
void PublishObject() throws Exception {
|
public Database getDb() {
|
||||||
DBObject dbObject = (DBObject) request.object;
|
return db;
|
||||||
|
}
|
||||||
|
//-------------
|
||||||
|
void publishObject_(Database database, DBObject dbObject) throws Exception {
|
||||||
beforePublishAction(dbObject);
|
beforePublishAction(dbObject);
|
||||||
response.object = (Serializable) db.InsertS(dbObject).getPK();
|
response.object = (Serializable) database.InsertS(dbObject).getPK();
|
||||||
afterPublishAction(dbObject);
|
afterPublishAction(dbObject);
|
||||||
}
|
}
|
||||||
void PublishObjects() throws Exception {
|
void editObject_(Database database, DBObject dbObject) throws Exception {
|
||||||
Vector<DBObject> objects = (Vector<DBObject>) request.object;
|
database.UpdateWithCheck(dbObject);
|
||||||
for (DBObject dbObject : objects) {
|
afterEditAction(dbObject);
|
||||||
beforePublishAction(dbObject);
|
|
||||||
response.object = (Serializable) db.InsertS(dbObject).getPK();
|
|
||||||
afterPublishAction(dbObject);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
void CloneObject() throws Exception {
|
void deleteObject_(Database database, Pair<Class, Object> to_delete) throws Exception {
|
||||||
|
DBObject dbObject = database.DeleteByPK(to_delete.getKey(), to_delete.getValue());
|
||||||
|
afterDeleteAction(dbObject);
|
||||||
|
database.DeleteDependencies(dbObject);
|
||||||
|
}
|
||||||
|
//--
|
||||||
|
void PublishObject() throws Exception {
|
||||||
|
publishObject_(getDb(), (DBObject) request.object);
|
||||||
|
}
|
||||||
|
void PublishObjects() throws Exception {
|
||||||
|
Database database = getDb();
|
||||||
|
for (DBObject dbObject : (Vector<DBObject>) request.object)
|
||||||
|
publishObject_(database, dbObject);
|
||||||
|
}
|
||||||
|
void CloneRObject() throws Exception {
|
||||||
|
Database database = getDb();
|
||||||
Pair<Class, Object> to_clone = (Pair<Class, Object>) request.object;
|
Pair<Class, Object> to_clone = (Pair<Class, Object>) request.object;
|
||||||
Object pk = to_clone.getValue();
|
Object pk = to_clone.getValue();
|
||||||
if (db.getTable(to_clone.getKey()).containsKey(to_clone.getValue())) {
|
//--
|
||||||
riDBObject src = (riDBObject) db.getTable(to_clone.getKey()).get(to_clone.getValue());
|
if (database.getTable(to_clone.getKey()).containsKey(to_clone.getValue())) {
|
||||||
|
riDBObject src = (riDBObject) database.getTable(to_clone.getKey()).get(to_clone.getValue());
|
||||||
riDBObject dst = (riDBObject) to_clone.getKey().newInstance();
|
riDBObject dst = (riDBObject) to_clone.getKey().newInstance();
|
||||||
dst.SynchronizeFields(src);
|
dst.SynchronizeFields(src);
|
||||||
//единственное отличие клона - текущий автор
|
//единственное отличие клона - текущий автор
|
||||||
@@ -400,34 +415,31 @@ public abstract class RepositoryServer<D extends Database> {
|
|||||||
String[] packed = request.arg.split("\n");
|
String[] packed = request.arg.split("\n");
|
||||||
dst.sender_name = packed[0];
|
dst.sender_name = packed[0];
|
||||||
dst.sender_address = packed[1];
|
dst.sender_address = packed[1];
|
||||||
db.Insert(dst);
|
database.Insert(dst);
|
||||||
afterCloneAction(src, dst);
|
afterCloneAction(src, dst);
|
||||||
response.object = (Serializable) dst.getPK();
|
response.object = (Serializable) dst.getPK();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void GetObjectCopyByPK() throws Exception {
|
void GetObjectCopyByPK() throws Exception {
|
||||||
Pair<Class, Object> p = (Pair<Class, Object>) request.object;
|
Pair<Class, Object> p = (Pair<Class, Object>) request.object;
|
||||||
DBObject dbObject = db.getObjectCopyByPK(p.getKey(), p.getValue());
|
DBObject dbObject = getDb().getObjectCopyByPK(p.getKey(), p.getValue());
|
||||||
response.object = dbObject;
|
response.object = dbObject;
|
||||||
}
|
}
|
||||||
void GetObjectsCopiesByPK() throws Exception {
|
void GetObjectsCopiesByPK() throws Exception {
|
||||||
Pair<Class, Object> p = (Pair<Class, Object>) request.object;
|
Pair<Class, Object> p = (Pair<Class, Object>) request.object;
|
||||||
response.object = db.getObjectsCopies(p.getKey(), (Vector<Object>) p.getValue());
|
response.object = getDb().getObjectsCopies(p.getKey(), (Vector<Object>) p.getValue());
|
||||||
}
|
}
|
||||||
void EditObject() throws Exception {
|
void EditObject() throws Exception {
|
||||||
DBObject new_object = (DBObject) request.object;
|
editObject_(getDb(), (DBObject) request.object);
|
||||||
db.UpdateWithCheck(new_object);
|
|
||||||
afterEditAction(new_object);
|
|
||||||
}
|
}
|
||||||
void DeleteObjectByPK() throws Exception {
|
void DeleteObjectByPK() throws Exception {
|
||||||
Pair<Class, Object> to_delete = (Pair<Class, Object>) request.object;
|
deleteObject_(getDb(),(Pair<Class, Object>) request.object );
|
||||||
afterDeleteAction(db.DeleteByPK(to_delete.getKey(), to_delete.getValue()));
|
|
||||||
}
|
}
|
||||||
void DeleteObjectsByPK() throws Exception {
|
void DeleteObjectsByPK() throws Exception {
|
||||||
|
Database database = getDb();
|
||||||
Pair<Class, Vector<Object>> to_delete = (Pair<Class, Vector<Object>>) request.object;
|
Pair<Class, Vector<Object>> to_delete = (Pair<Class, Vector<Object>>) request.object;
|
||||||
for (Object object : to_delete.getValue()) {
|
for (Object object : to_delete.getValue())
|
||||||
afterDeleteAction(db.DeleteByPK(to_delete.getKey(), object));
|
deleteObject_(database,new Pair<>(to_delete.getKey(),object));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
void Email() throws Exception {
|
void Email() throws Exception {
|
||||||
|
|||||||
@@ -65,25 +65,12 @@ public enum ServerCode {
|
|||||||
DetectTestsMinMaxDim,
|
DetectTestsMinMaxDim,
|
||||||
GetUserAccountByKey,
|
GetUserAccountByKey,
|
||||||
GetUserAccountByEmail,
|
GetUserAccountByEmail,
|
||||||
EditUserAccount,
|
|
||||||
PublishUserAccount,
|
|
||||||
DeleteUserAccount,
|
|
||||||
GetDVMPackageCredentials,
|
GetDVMPackageCredentials,
|
||||||
CreateBackUp,
|
CreateBackUp,
|
||||||
GetFirstEmailToSend,
|
GetFirstEmailToSend,
|
||||||
SynchronizeSapforRepoitory,
|
SynchronizeSapforRepoitory;
|
||||||
PublishSubscriberWorkspace,
|
|
||||||
EditSubcriberWorkpace,
|
|
||||||
DeleteSubscriberWorkspace
|
|
||||||
;
|
|
||||||
public String getDescription() {
|
public String getDescription() {
|
||||||
switch (this) {
|
switch (this) {
|
||||||
case PublishSubscriberWorkspace:
|
|
||||||
return "Публикация рабочего пространства пользователя на сервере";
|
|
||||||
case EditSubcriberWorkpace:
|
|
||||||
return "Редактировние рабочего пространства пользователя на сервере";
|
|
||||||
case DeleteSubscriberWorkspace:
|
|
||||||
return "Удаление рабочего пространства пользователя на сервере";
|
|
||||||
case SynchronizeSapforRepoitory:
|
case SynchronizeSapforRepoitory:
|
||||||
return "Синхронизация репозитория SAPFOR на сервере";
|
return "Синхронизация репозитория SAPFOR на сервере";
|
||||||
case Email:
|
case Email:
|
||||||
@@ -98,12 +85,6 @@ public enum ServerCode {
|
|||||||
return "Создание резервной копии данных сервера";
|
return "Создание резервной копии данных сервера";
|
||||||
case GetDVMPackageCredentials:
|
case GetDVMPackageCredentials:
|
||||||
return "Получение входных данных пакета тестирования DVM на сервере";
|
return "Получение входных данных пакета тестирования DVM на сервере";
|
||||||
case DeleteUserAccount:
|
|
||||||
return "Удаление учётной записи на сервере";
|
|
||||||
case PublishUserAccount:
|
|
||||||
return "Создание учётной записи на сервере";
|
|
||||||
case EditUserAccount:
|
|
||||||
return "Редактирование учётной записи на сервере";
|
|
||||||
case ReceiveCredentialsDatabase:
|
case ReceiveCredentialsDatabase:
|
||||||
return "Скачивание базы учётных записей с сервера";
|
return "Скачивание базы учётных записей с сервера";
|
||||||
case GetUserAccountByEmail:
|
case GetUserAccountByEmail:
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ public class Test extends riDBObject {
|
|||||||
public byte[] project_archive_bytes = null;
|
public byte[] project_archive_bytes = null;
|
||||||
@Description("IGNORE")
|
@Description("IGNORE")
|
||||||
public Vector<TestFile> files = null;
|
public Vector<TestFile> files = null;
|
||||||
//public String packedFilesJson; //вывести!
|
|
||||||
//--------------------------------------------->>>
|
//--------------------------------------------->>>
|
||||||
public Test(Test test) {
|
public Test(Test test) {
|
||||||
this.SynchronizeFields(test);
|
this.SynchronizeFields(test);
|
||||||
|
|||||||
@@ -101,6 +101,17 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
|
zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
protected void beforePublishAction(DBObject object) throws Exception {
|
||||||
|
if (object instanceof ServerSapfor) {
|
||||||
|
int current_version = getSapforActualVersion();
|
||||||
|
int max_installed_version = db.getInstalledSapforMaxVersion();
|
||||||
|
if (max_installed_version == current_version)
|
||||||
|
throw new RepositoryRefuseException("Актуальная версия SAPFOR " + max_installed_version + " уже установлена");
|
||||||
|
ServerSapfor serverSapfor = (ServerSapfor) object;
|
||||||
|
serverSapfor.version = String.valueOf(current_version);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Override
|
||||||
public void afterPublishAction(DBObject object) throws Exception {
|
public void afterPublishAction(DBObject object) throws Exception {
|
||||||
if (object instanceof Test) {
|
if (object instanceof Test) {
|
||||||
Test test = (Test) object;
|
Test test = (Test) object;
|
||||||
@@ -181,7 +192,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
if (object instanceof Test) {
|
if (object instanceof Test) {
|
||||||
Test test = (Test) object;
|
Test test = (Test) object;
|
||||||
Utils_.forceDeleteWithCheck(test.getServerPath());
|
Utils_.forceDeleteWithCheck(test.getServerPath());
|
||||||
db.DeleteTestFiles(test);
|
|
||||||
//--
|
//--
|
||||||
for (DVMConfiguration dvmConfiguration : db.dvmConfigurations.Data.values()) {
|
for (DVMConfiguration dvmConfiguration : db.dvmConfigurations.Data.values()) {
|
||||||
if (dvmConfiguration.tryDeleteTest(test)) {
|
if (dvmConfiguration.tryDeleteTest(test)) {
|
||||||
@@ -193,7 +203,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
db.Update(sapforConfiguration);
|
db.Update(sapforConfiguration);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//--
|
//-
|
||||||
} else if (object instanceof Group) {
|
} else if (object instanceof Group) {
|
||||||
Group group = (Group) object;
|
Group group = (Group) object;
|
||||||
LinkedHashMap<Integer, Test> groupTests = db.getMapByFKi(group, Test.class);
|
LinkedHashMap<Integer, Test> groupTests = db.getMapByFKi(group, Test.class);
|
||||||
@@ -212,17 +222,12 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
for (Test group_test : groupTests.values()) {
|
for (Test group_test : groupTests.values()) {
|
||||||
db.Delete(group_test);
|
|
||||||
Utils_.forceDeleteWithCheck(group_test.getServerPath());
|
Utils_.forceDeleteWithCheck(group_test.getServerPath());
|
||||||
db.DeleteTestFiles(group_test);
|
db.DeleteDependencies(group_test);
|
||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
} else if (object instanceof ServerSapfor) {
|
} else if (object instanceof ServerSapfor) {
|
||||||
Utils_.forceDeleteWithCheck(
|
Utils_.forceDeleteWithCheck(new File(((ServerSapfor) object).home_path));
|
||||||
new File(
|
|
||||||
((ServerSapfor) object).home_path
|
|
||||||
)
|
|
||||||
);
|
|
||||||
} else if (object instanceof DVMPackage) {
|
} else if (object instanceof DVMPackage) {
|
||||||
DVMPackage dvmPackage = (DVMPackage) object;
|
DVMPackage dvmPackage = (DVMPackage) object;
|
||||||
File workspace = dvmPackage.getLocalWorkspace();
|
File workspace = dvmPackage.getLocalWorkspace();
|
||||||
@@ -260,14 +265,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
//--
|
//--
|
||||||
Vector<SapforSettingsCommand> commands = new Vector<>();
|
|
||||||
for (SapforSettingsCommand command : db.sapforSettingsCommands.Data.values()) {
|
|
||||||
if (command.sapforsettings_id == sapforSettings.id)
|
|
||||||
commands.add(command);
|
|
||||||
}
|
|
||||||
for (SapforSettingsCommand command : commands) {
|
|
||||||
db.Delete(command);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//-
|
//-
|
||||||
}
|
}
|
||||||
@@ -277,17 +274,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
}
|
}
|
||||||
//-->>>
|
//-->>>
|
||||||
@Override
|
@Override
|
||||||
protected void beforePublishAction(DBObject object) throws Exception {
|
|
||||||
if (object instanceof ServerSapfor) {
|
|
||||||
int current_version = getSapforActualVersion();
|
|
||||||
int max_installed_version = db.getInstalledSapforMaxVersion();
|
|
||||||
if (max_installed_version == current_version)
|
|
||||||
throw new RepositoryRefuseException("Актуальная версия SAPFOR " + max_installed_version + " уже установлена");
|
|
||||||
ServerSapfor serverSapfor = (ServerSapfor) object;
|
|
||||||
serverSapfor.version = String.valueOf(current_version);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public int getPort() {
|
public int getPort() {
|
||||||
return Constants.TestingServerPort;
|
return Constants.TestingServerPort;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
package _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup;
|
||||||
|
import Common.Database.Objects.iDBObject;
|
||||||
|
public class DVMConfigurationGroup extends iDBObject {
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
package _VisualDVM.TestingSystem.DVM.DVMConfigurationGroup;
|
||||||
|
public class DVMConfigurationGroupsDBTable {
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user