diff --git a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java index e57c58b2a..5b105e535 100644 --- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java @@ -114,38 +114,38 @@ public class AppMultiFeatureCfgService extends BaseService { String keyword = ""; if(cfg.getHeaderType().equals("IP_header")){ if(StringUtils.isNoneBlank(cfg.getVer())){ - keyword += "0-3:"+cfg.getVer()+"***and***"; + keyword += "0-3:"+cfg.getVer()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getIhl())){ - keyword += "4-7:"+cfg.getIhl()+"***and***"; + keyword += "4-7:"+cfg.getIhl()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getTos())){ - keyword += "8-15:"+cfg.getTos()+"***and***"; + keyword += "8-15:"+cfg.getTos()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getTotalLength())){ - keyword += "16-31:"+cfg.getTotalLength()+"***and***"; + keyword += "16-31:"+cfg.getTotalLength()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getFlags())){ - keyword += "48-50:"+cfg.getFlags()+"***and***"; + keyword += "48-50:"+cfg.getFlags()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getFragmentOffset())){ - keyword += "56-63:"+cfg.getFragmentOffset()+"***and***"; + keyword += "56-63:"+cfg.getFragmentOffset()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getProtocol())){ - keyword += "72-79:"+cfg.getProtocol()+"***and***"; + keyword += "72-79:"+cfg.getProtocol()+Constants.KEYWORD_EXPR; } }else{ if(StringUtils.isNoneBlank(cfg.getIcmpType())){ - keyword += "0-7:"+cfg.getIcmpType()+"***and***"; + keyword += "0-7:"+cfg.getIcmpType()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getIcmpCode())){ - keyword += "8-15:"+cfg.getIcmpCode()+"***and***"; + keyword += "8-15:"+cfg.getIcmpCode()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getIcmpIdentifier())){ - keyword += "32-47:"+cfg.getIcmpIdentifier()+"***and***"; + keyword += "32-47:"+cfg.getIcmpIdentifier()+Constants.KEYWORD_EXPR; } } - keyword=keyword.substring(0,keyword.lastIndexOf("***and***")); + keyword=keyword.substring(0,keyword.lastIndexOf(Constants.KEYWORD_EXPR)); cfg.setCfgKeywords(keyword); appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg); }else if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ @@ -208,38 +208,38 @@ public class AppMultiFeatureCfgService extends BaseService { String keyword = ""; if(cfg.getHeaderType().equals("IP_header")){ if(StringUtils.isNoneBlank(cfg.getVer())){ - keyword += "0-3:"+cfg.getVer()+"***and***"; + keyword += "0-3:"+cfg.getVer()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getIhl())){ - keyword += "4-7:"+cfg.getIhl()+"***and***"; + keyword += "4-7:"+cfg.getIhl()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getTos())){ - keyword += "8-15:"+cfg.getTos()+"***and***"; + keyword += "8-15:"+cfg.getTos()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getTotalLength())){ - keyword += "16-31:"+cfg.getTotalLength()+"***and***"; + keyword += "16-31:"+cfg.getTotalLength()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getFlags())){ - keyword += "48-50:"+cfg.getFlags()+"***and***"; + keyword += "48-50:"+cfg.getFlags()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getFragmentOffset())){ - keyword += "56-63:"+cfg.getFragmentOffset()+"***and***"; + keyword += "56-63:"+cfg.getFragmentOffset()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getProtocol())){ - keyword += "72-79:"+cfg.getProtocol()+"***and***"; + keyword += "72-79:"+cfg.getProtocol()+Constants.KEYWORD_EXPR; } }else{ if(StringUtils.isNoneBlank(cfg.getIcmpType())){ - keyword += "0-7:"+cfg.getIcmpType()+"***and***"; + keyword += "0-7:"+cfg.getIcmpType()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getIcmpCode())){ - keyword += "8-15:"+cfg.getIcmpCode()+"***and***"; + keyword += "8-15:"+cfg.getIcmpCode()+Constants.KEYWORD_EXPR; } if(StringUtils.isNotBlank(cfg.getIcmpIdentifier())){ - keyword += "32-47:"+cfg.getIcmpIdentifier()+"***and***"; + keyword += "32-47:"+cfg.getIcmpIdentifier()+Constants.KEYWORD_EXPR; } } - keyword=keyword.substring(0,keyword.lastIndexOf("***and***")); + keyword=keyword.substring(0,keyword.lastIndexOf(Constants.KEYWORD_EXPR)); cfg.setCfgKeywords(keyword); appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg); }else if(StringUtils.isNotBlank(cfg.getCfgKeywords())){