This is an automated email from the ASF dual-hosted git repository.
zrlw pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 192d43307c Fix penName (#15573)
192d43307c is described below
commit 192d43307c26b8884ac4b655e8a478985eb056ea
Author: co63oc <[email protected]>
AuthorDate: Mon Jul 21 18:13:28 2025 +0800
Fix penName (#15573)
Co-authored-by: zrlw <[email protected]>
---
.../common/beanutil/JavaBeanSerializeUtilTest.java | 4 ++--
.../apache/dubbo/common/model/person/BigPerson.java | 20 ++++++++++----------
.../org/apache/dubbo/common/utils/PojoUtilsTest.java | 2 +-
.../org/apache/dubbo/rpc/model/person/BigPerson.java | 20 ++++++++++----------
.../alibaba/dubbo/container/page/ResourceFilter.java | 2 +-
.../nacos/NacosDynamicConfigurationFactory.java | 2 +-
.../support/nacos/NacosDynamicConfigurationTest.java | 2 +-
.../org/apache/dubbo/metadata/MetadataConstants.java | 2 +-
.../report/identifier/ServiceMetadataIdentifier.java | 6 +++---
9 files changed, 30 insertions(+), 30 deletions(-)
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
index 65de6beb1c..602d7603fd 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
@@ -540,7 +540,7 @@ class JavaBeanSerializeUtilTest {
assertEqualsPrimitive(person.getLoginName(),
descriptor.getProperty("loginName"));
assertEqualsEnum(person.getStatus(), descriptor.getProperty("status"));
assertEqualsPrimitive(person.getEmail(),
descriptor.getProperty("email"));
- assertEqualsPrimitive(person.getPenName(),
descriptor.getProperty("penName"));
+ assertEqualsPrimitive(person.getPersonName(),
descriptor.getProperty("personName"));
JavaBeanDescriptor infoProfile = (JavaBeanDescriptor)
descriptor.getProperty("infoProfile");
Assertions.assertTrue(infoProfile.isBeanType());
@@ -609,7 +609,7 @@ class JavaBeanSerializeUtilTest {
bigPerson.setLoginName("superman");
bigPerson.setStatus(PersonStatus.ENABLED);
bigPerson.setEmail("[email protected]");
- bigPerson.setPenName("pname");
+ bigPerson.setPersonName("pname");
ArrayList<Phone> phones = new ArrayList<Phone>();
Phone phone1 = new Phone("86", "0571", "87654321", "001");
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java
index 15e84765f7..f8f0a1d799 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java
@@ -29,7 +29,7 @@ public class BigPerson implements Serializable {
String email;
- String penName;
+ String personName;
PersonInfo infoProfile;
@@ -79,12 +79,12 @@ public class BigPerson implements Serializable {
this.status = status;
}
- public String getPenName() {
- return penName;
+ public String getPersonName() {
+ return personName;
}
- public void setPenName(String penName) {
- this.penName = penName;
+ public void setPersonName(String personName) {
+ this.personName = personName;
}
@Override
@@ -94,7 +94,7 @@ public class BigPerson implements Serializable {
result = prime * result + ((email == null) ? 0 : email.hashCode());
result = prime * result + ((infoProfile == null) ? 0 :
infoProfile.hashCode());
result = prime * result + ((loginName == null) ? 0 :
loginName.hashCode());
- result = prime * result + ((penName == null) ? 0 : penName.hashCode());
+ result = prime * result + ((personName == null) ? 0 :
personName.hashCode());
result = prime * result + ((personId == null) ? 0 :
personId.hashCode());
result = prime * result + ((status == null) ? 0 : status.hashCode());
return result;
@@ -115,9 +115,9 @@ public class BigPerson implements Serializable {
if (loginName == null) {
if (other.loginName != null) return false;
} else if (!loginName.equals(other.loginName)) return false;
- if (penName == null) {
- if (other.penName != null) return false;
- } else if (!penName.equals(other.penName)) return false;
+ if (personName == null) {
+ if (other.personName != null) return false;
+ } else if (!personName.equals(other.personName)) return false;
if (personId == null) {
if (other.personId != null) return false;
} else if (!personId.equals(other.personId)) return false;
@@ -128,7 +128,7 @@ public class BigPerson implements Serializable {
@Override
public String toString() {
return "BigPerson [personId=" + personId + ", loginName=" + loginName
+ ", status="
- + status + ", email=" + email + ", penName=" + penName + ",
infoProfile="
+ + status + ", email=" + email + ", personName=" + personName +
", infoProfile="
+ infoProfile + "]";
}
}
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
index 2a1d28ce28..5cb48a25a7 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
@@ -73,7 +73,7 @@ class PojoUtilsTest {
bigPerson.setLoginName("name1");
bigPerson.setStatus(PersonStatus.ENABLED);
bigPerson.setEmail("[email protected]");
- bigPerson.setPenName("pname");
+ bigPerson.setPersonName("pname");
ArrayList<Phone> phones = new ArrayList<Phone>();
Phone phone1 = new Phone("86", "0571", "11223344", "001");
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/BigPerson.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/BigPerson.java
index b80e91ece3..7c08d11505 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/BigPerson.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/BigPerson.java
@@ -29,7 +29,7 @@ public class BigPerson implements Serializable {
String email;
- String penName;
+ String personName;
PersonInfo infoProfile;
@@ -79,12 +79,12 @@ public class BigPerson implements Serializable {
this.status = status;
}
- public String getPenName() {
- return penName;
+ public String getPersonName() {
+ return personName;
}
- public void setPenName(String penName) {
- this.penName = penName;
+ public void setPersonName(String personName) {
+ this.personName = personName;
}
@Override
@@ -94,7 +94,7 @@ public class BigPerson implements Serializable {
result = prime * result + ((email == null) ? 0 : email.hashCode());
result = prime * result + ((infoProfile == null) ? 0 :
infoProfile.hashCode());
result = prime * result + ((loginName == null) ? 0 :
loginName.hashCode());
- result = prime * result + ((penName == null) ? 0 : penName.hashCode());
+ result = prime * result + ((personName == null) ? 0 :
personName.hashCode());
result = prime * result + ((personId == null) ? 0 :
personId.hashCode());
result = prime * result + ((status == null) ? 0 : status.hashCode());
return result;
@@ -115,9 +115,9 @@ public class BigPerson implements Serializable {
if (loginName == null) {
if (other.loginName != null) return false;
} else if (!loginName.equals(other.loginName)) return false;
- if (penName == null) {
- if (other.penName != null) return false;
- } else if (!penName.equals(other.penName)) return false;
+ if (personName == null) {
+ if (other.personName != null) return false;
+ } else if (!personName.equals(other.personName)) return false;
if (personId == null) {
if (other.personId != null) return false;
} else if (!personId.equals(other.personId)) return false;
@@ -128,7 +128,7 @@ public class BigPerson implements Serializable {
@Override
public String toString() {
return "BigPerson [personId=" + personId + ", loginName=" + loginName
+ ", status="
- + status + ", email=" + email + ", penName=" + penName + ",
infoProfile="
+ + status + ", email=" + email + ", personName=" + personName +
", infoProfile="
+ infoProfile + "]";
}
}
diff --git
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/container/page/ResourceFilter.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/container/page/ResourceFilter.java
index 981508e4ae..5f387d37fc 100644
---
a/dubbo-compatible/src/main/java/com/alibaba/dubbo/container/page/ResourceFilter.java
+++
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/container/page/ResourceFilter.java
@@ -38,7 +38,7 @@ import java.util.List;
import com.alibaba.dubbo.common.Constants;
/**
- * ResourceServlet
+ * ResourceFilter
*/
public class ResourceFilter implements Filter {
diff --git
a/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationFactory.java
b/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationFactory.java
index 762b0161b3..099afd3dde 100644
---
a/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationFactory.java
+++
b/dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationFactory.java
@@ -39,7 +39,7 @@ public class NacosDynamicConfigurationFactory extends
AbstractDynamicConfigurati
protected DynamicConfiguration createDynamicConfiguration(URL url) {
URL nacosURL = url;
if
(CommonConstants.DUBBO.equals(url.getParameter(PropertyKeyConst.NAMESPACE))) {
- // Nacos use empty string as default name space, replace default
namespace "dubbo" to ""
+ // Nacos use empty string as default namespace, replace default
namespace "dubbo" to ""
nacosURL = url.removeParameter(PropertyKeyConst.NAMESPACE);
}
return new NacosDynamicConfiguration(nacosURL, applicationModel);
diff --git
a/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java
b/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java
index 39b6726f33..2abf3fdcab 100644
---
a/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java
+++
b/dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java
@@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit test for nacos config center support
*/
-// FIXME: waiting for embedded Nacos suport, then we can open the switch.
+// FIXME: waiting for embedded Nacos support, then we can open the switch.
@Disabled("https://github.com/alibaba/nacos/issues/1188";)
class NacosDynamicConfigurationTest {
private static final Logger logger =
LoggerFactory.getLogger(NacosDynamicConfigurationTest.class);
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataConstants.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataConstants.java
index d4e0f33e2d..66492fa5bf 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataConstants.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataConstants.java
@@ -19,7 +19,7 @@ package org.apache.dubbo.metadata;
public interface MetadataConstants {
String KEY_SEPARATOR = ":";
String DEFAULT_PATH_TAG = "metadata";
- String KEY_REVISON_PREFIX = "revision";
+ String KEY_REVISION_PREFIX = "revision";
String META_DATA_STORE_TAG = ".metaData";
String METADATA_PUBLISH_DELAY_KEY =
"dubbo.application.metadata.publish.delay";
int DEFAULT_METADATA_PUBLISH_DELAY = 1000;
diff --git
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/identifier/ServiceMetadataIdentifier.java
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/identifier/ServiceMetadataIdentifier.java
index 4fd036b97c..ce11a8abda 100644
---
a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/identifier/ServiceMetadataIdentifier.java
+++
b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/identifier/ServiceMetadataIdentifier.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.metadata.report.identifier;
import org.apache.dubbo.common.URL;
-import static org.apache.dubbo.metadata.MetadataConstants.KEY_REVISON_PREFIX;
+import static org.apache.dubbo.metadata.MetadataConstants.KEY_REVISION_PREFIX;
/**
* The ServiceMetadataIdentifier is used to store the {@link
org.apache.dubbo.common.URL}
@@ -52,11 +52,11 @@ public class ServiceMetadataIdentifier extends
BaseServiceMetadataIdentifier imp
}
public String getUniqueKey(KeyTypeEnum keyType) {
- return super.getUniqueKey(keyType, protocol, KEY_REVISON_PREFIX +
revision);
+ return super.getUniqueKey(keyType, protocol, KEY_REVISION_PREFIX +
revision);
}
public String getIdentifierKey() {
- return super.getIdentifierKey(protocol, KEY_REVISON_PREFIX + revision);
+ return super.getIdentifierKey(protocol, KEY_REVISION_PREFIX +
revision);
}
public void setRevision(String revision) {
