From 5feb22981aeb0870c68e09d9f7c6fcdcf363ff42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E5=AE=87=E7=90=A6?= <465645774@qq.com>
Date: Sat, 6 Feb 2021 19:42:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dxml=E5=BD=A2=E5=BC=8F?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E7=AA=97=E4=BD=93=E5=85=83=E7=B4=A0=E6=97=B6?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  8 +--
 .../selenium/location/XmlLocation.java        | 51 ++++++++++---------
 2 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7aff44d..8a9ad31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,13 +55,7 @@
 			<version>3.17</version>
 		</dependency>
 
-		<!-- xml解析工具 
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-		</dependency>-->
-		<!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
+		<!-- xml解析工具 -->
 		<dependency>
 		    <groupId>org.dom4j</groupId>
 		    <artifactId>dom4j</artifactId>
diff --git a/src/main/java/com/auxiliary/selenium/location/XmlLocation.java b/src/main/java/com/auxiliary/selenium/location/XmlLocation.java
index be4e3d9..b16935f 100644
--- a/src/main/java/com/auxiliary/selenium/location/XmlLocation.java
+++ b/src/main/java/com/auxiliary/selenium/location/XmlLocation.java
@@ -59,7 +59,7 @@ public class XmlLocation extends AbstractLocation {
 		try {
 			dom = new SAXReader().read(xmlFile);
 		} catch (DocumentException e) {
-			throw new IncorrectFileException("xml文件异常，文件位置：" + xmlFile.getAbsolutePath());
+			throw new IncorrectFileException("xml文件异常，文件位置：" + xmlFile.getAbsolutePath(), e);
 		}
 		
 	}
@@ -76,12 +76,9 @@ public class XmlLocation extends AbstractLocation {
 	public ArrayList<ByType> findElementByTypeList(String name) {
 		ArrayList<ByType> byTypeList = new ArrayList<ByType>();
 		//查询并存储元素下的子元素
-		@SuppressWarnings("unchecked")
-		ArrayList<Object> lableElementList = new ArrayList<>(getElementLabelElement(name).elements());
+		ArrayList<Element> lableElementList = new ArrayList<>(getElementLabelElement(name).elements());
 		
 		lableElementList.stream()
-				//强转为Element类型
-				.map(lable -> (Element)lable)
 				//获取标签名称
 				.map(lable -> lable.getName())
 				//将名称转换为ByType枚举
@@ -90,7 +87,6 @@ public class XmlLocation extends AbstractLocation {
 				.filter(lable -> lable != null)
 				//存储标签
 				.forEach(byTypeList::add);
-				;
 		
 		return byTypeList;
 	}
@@ -98,25 +94,32 @@ public class XmlLocation extends AbstractLocation {
 	@Override
 	public ArrayList<String> findValueList(String name) {
 		ArrayList<String> valueList = new ArrayList<>();
-		//查询元素
-		Element element = getElementLabelElement(name);
 		
-		//遍历元素下所有的定位标签，并将其转换为相应的ByType枚举，存储至byTypeList中
-		for (Object byElement : element.elements()) {
-			//判断元素是否启用，若元素未启用，则下一个循环
-			String isUserText = ((Element) byElement).attributeValue("is_user");
-			if (isUserText != null && !Boolean.valueOf(isUserText)) {
-				continue;
-			}
-			
-			//判断元素是否启用模板，若启用模板，则获取模板内容，并将定位内容进行转换
-			String tempId = ((Element) byElement).attributeValue("temp_id");
-			String value = tempId != null ? 
-					getTemplateValue(tempId, toByType(((Element) byElement).getName())) :
-					((Element)byElement).getText();
-			
-			valueList.add(replaceValue(((Element) byElement), value));
-		}
+		//查询元素，遍历元素下所有的定位标签，并过滤掉元素标签
+		getElementLabelElement(name).elements().stream().filter(ele -> !"element".equals(ele.getName()))
+				//过滤不启用的标签
+				.filter(ele -> {
+					return Optional.ofNullable(ele.attributeValue("is_user"))
+							.filter(t -> !t.isEmpty())
+							.map(t -> {
+								try {
+									return Boolean.valueOf(t).booleanValue();
+								} catch (Exception e) {
+									return true;
+								}
+							}).orElse(true);
+				//根据值或模板，将定位内容转译，并存储至valueList
+				}).forEach(ele -> {
+					String value = "";
+					String tempId = Optional.ofNullable(ele.attributeValue("temp_id")).orElse("");
+					if (tempId.isEmpty()) {
+						value = ele.getText();
+					} else {
+						value = getTemplateValue(tempId, toByType(ele.getName()));
+					}
+					
+					valueList.add(replaceValue(ele, value));
+				});
 		
 		return valueList;
 	}