ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-20 15:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

add auto fill for vs create/update

Browse source
This commit is contained in:
Mengyi Zhou 2017-02-17 11:59:25 +08:00
parent 6262faef48
commit 976ea65afc
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/ctrip/zeus/service/model/impl/EntityFactoryImpl.java
View file

@ -5,7 +5,6 @@ import com.ctrip.zeus.executor.impl.ResultHandler;
import com.ctrip.zeus.model.entity.*; import com.ctrip.zeus.model.entity.*;
import com.ctrip.zeus.service.model.*; import com.ctrip.zeus.service.model.*;
import com.ctrip.zeus.service.model.handler.impl.ContentReaders; import com.ctrip.zeus.service.model.handler.impl.ContentReaders;
import com.ctrip.zeus.service.query.GroupCriteriaQuery;
import com.ctrip.zeus.service.query.SlbCriteriaQuery; import com.ctrip.zeus.service.query.SlbCriteriaQuery;
import com.ctrip.zeus.service.query.VirtualServerCriteriaQuery; import com.ctrip.zeus.service.query.VirtualServerCriteriaQuery;
import com.ctrip.zeus.service.query.filter.FilterSet; import com.ctrip.zeus.service.query.filter.FilterSet;
@ -44,8 +43,6 @@ public class EntityFactoryImpl implements EntityFactory {
@Resource @Resource
private AutoFiller autoFiller; private AutoFiller autoFiller;
@Resource @Resource
private GroupCriteriaQuery groupCriteriaQuery;
@Resource
private SlbCriteriaQuery slbCriteriaQuery; private SlbCriteriaQuery slbCriteriaQuery;
@Resource @Resource
private VirtualServerCriteriaQuery virtualServerCriteriaQuery; private VirtualServerCriteriaQuery virtualServerCriteriaQuery;
@ -89,6 +86,7 @@ public class EntityFactoryImpl implements EntityFactory {
for (MetaVsArchiveDo d : archiveVsDao.findAllBySlbId(slbId, ArchiveVsEntity.READSET_FULL)) { for (MetaVsArchiveDo d : archiveVsDao.findAllBySlbId(slbId, ArchiveVsEntity.READSET_FULL)) {
vsIds.add(d.getVsId()); vsIds.add(d.getVsId());
VirtualServer vs = ContentReaders.readVirtualServerContent(d.getContent()); VirtualServer vs = ContentReaders.readVirtualServerContent(d.getContent());
autoFiller.autofill(vs);
ref.put(vs.getId() + "," + d.getVersion(), vs); ref.put(vs.getId() + "," + d.getVersion(), vs);
} }
@ -111,6 +109,7 @@ public class EntityFactoryImpl implements EntityFactory {
Map<String, Slb> ref = new HashMap<>(); Map<String, Slb> ref = new HashMap<>();
for (ArchiveSlbDo d : archiveSlbDao.findVersionizedByIds(slbIds, ArchiveSlbEntity.READSET_FULL)) { for (ArchiveSlbDo d : archiveSlbDao.findVersionizedByIds(slbIds, ArchiveSlbEntity.READSET_FULL)) {
Slb slb = ContentReaders.readSlbContent(d.getContent()); Slb slb = ContentReaders.readSlbContent(d.getContent());
autoFiller.autofill(slb);
ref.put(slb.getId() + "," + slb.getVersion(), slb); ref.put(slb.getId() + "," + slb.getVersion(), slb);
} }
@ -131,6 +130,7 @@ public class EntityFactoryImpl implements EntityFactory {
Map<String, VirtualServer> ref = new HashMap<>(); Map<String, VirtualServer> ref = new HashMap<>();
for (MetaVsArchiveDo d : archiveVsDao.findVersionizedByIds(vsIds, ArchiveVsEntity.READSET_FULL)) { for (MetaVsArchiveDo d : archiveVsDao.findVersionizedByIds(vsIds, ArchiveVsEntity.READSET_FULL)) {
VirtualServer vs = ContentReaders.readVirtualServerContent(d.getContent()); VirtualServer vs = ContentReaders.readVirtualServerContent(d.getContent());
autoFiller.autofill(vs);
ref.put(vs.getId() + "," + d.getVersion(), vs); ref.put(vs.getId() + "," + d.getVersion(), vs);
} }

4
src/main/java/com/ctrip/zeus/service/model/impl/VirtualServerRepositoryImpl.java
View file

@ -106,8 +106,7 @@ public class VirtualServerRepositoryImpl implements VirtualServerRepository {
if (context.getErrorVses().contains(virtualServer.getId())) { if (context.getErrorVses().contains(virtualServer.getId())) {
throw new ValidationException(context.getVsErrorReason(virtualServer.getId())); throw new ValidationException(context.getVsErrorReason(virtualServer.getId()));
} }
autoFiller.autofill(virtualServer);
//TODO check slb exists
virtualServerEntityManager.add(virtualServer); virtualServerEntityManager.add(virtualServer);
if (virtualServer.isSsl()) { if (virtualServer.isSsl()) {
installCertificate(virtualServer); installCertificate(virtualServer);
@ -131,6 +130,7 @@ public class VirtualServerRepositoryImpl implements VirtualServerRepository {
if (context.getErrorVses().contains(virtualServer.getId())) { if (context.getErrorVses().contains(virtualServer.getId())) {
throw new ValidationException(context.getVsErrorReason(virtualServer.getId())); throw new ValidationException(context.getVsErrorReason(virtualServer.getId()));
} }
autoFiller.autofill(virtualServer);
virtualServerEntityManager.update(virtualServer); virtualServerEntityManager.update(virtualServer);
if (virtualServer.isSsl()) { if (virtualServer.isSsl()) {