From f07f7864938b8613c1cb17c2cd4c7fa33f7c6476 Mon Sep 17 00:00:00 2001
From: looly <loolly@gmail.com>
Date: Tue, 30 Nov 2021 17:36:45 +0800
Subject: [PATCH] change to private

---
 CHANGELOG.md                                                | 1 +
 .../src/main/java/cn/hutool/core/math/Calculator.java       | 4 ++--
 hutool-db/pom.xml                                           | 2 +-
 hutool-extra/pom.xml                                        | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 134d92018..1ef6c0716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 * 【core   】     CopyOptions增加override配置（issue#I4JQ1N@Gitee）
 * 【poi    】     SheetRidReader可以获取所有sheet名（issue#I4JA3M@Gitee）
 * 【core   】     AsyncUtil.waitAny增加返回值（pr#473@Gitee）
+* 【core   】     Calculator.compare改为private（issue#1982@Github）
 * 
 ### 🐞Bug修复
 * 【core   】     修复FileResource构造fileName参数无效问题（issue#1942@Github）
diff --git a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java b/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
index 2117d47ee..a6c6a09d1 100644
--- a/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
+++ b/hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
@@ -154,7 +154,7 @@ public class Calculator {
 	 * @param peek peek
 	 * @return 优先级
 	 */
-	public boolean compare(char cur, char peek) {// 如果是peek优先级高于cur，返回true，默认都是peek优先级要低
+	private boolean compare(char cur, char peek) {// 如果是peek优先级高于cur，返回true，默认都是peek优先级要低
 		final int offset = 40;
 		if(cur  == '%'){
 			// %优先级最高
@@ -165,7 +165,7 @@ public class Calculator {
 			peek = 47;
 		}
 
-		return operatPriority[(peek) - offset] >= operatPriority[(cur) - offset];
+		return operatPriority[peek - offset] >= operatPriority[cur - offset];
 	}
 
 	/**
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index 835eede43..779270085 100644
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -81,7 +81,7 @@
 		<dependency>
 			<groupId>com.github.chris2018998</groupId>
 			<artifactId>beecp</artifactId>
-			<version>3.2.9</version>
+			<version>3.3.0</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>slf4j-api</artifactId>
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 9f32ccf43..bbc362788 100644
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -241,7 +241,7 @@
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analyzers-smartcn</artifactId>
-			<version>8.10.1</version>
+			<version>8.11.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -384,7 +384,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.6</version>
+			<version>1.2.7</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -432,7 +432,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>5.3.12</version>
+			<version>5.3.13</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>