Skip to content

Commit 192d433

Browse files
co63oczrlw
co63oc
and
zrlw
authored
Fix penName (#15573)
Co-authored-by: zrlw <zrlw@sina.com>
1 parent ce86a74 commit 192d433

9 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ static void assertEqualsBigPerson(BigPerson person, Object obj) {
540540
assertEqualsPrimitive(person.getLoginName(), descriptor.getProperty("loginName"));
541541
assertEqualsEnum(person.getStatus(), descriptor.getProperty("status"));
542542
assertEqualsPrimitive(person.getEmail(), descriptor.getProperty("email"));
543-
assertEqualsPrimitive(person.getPenName(), descriptor.getProperty("penName"));
543+
assertEqualsPrimitive(person.getPersonName(), descriptor.getProperty("personName"));
544544

545545
JavaBeanDescriptor infoProfile = (JavaBeanDescriptor) descriptor.getProperty("infoProfile");
546546
Assertions.assertTrue(infoProfile.isBeanType());
@@ -609,7 +609,7 @@ static BigPerson createBigPerson() {
609609
bigPerson.setLoginName("superman");
610610
bigPerson.setStatus(PersonStatus.ENABLED);
611611
bigPerson.setEmail("sm@1.com");
612-
bigPerson.setPenName("pname");
612+
bigPerson.setPersonName("pname");
613613

614614
ArrayList<Phone> phones = new ArrayList<Phone>();
615615
Phone phone1 = new Phone("86", "0571", "87654321", "001");

‎dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class BigPerson implements Serializable {
2929

3030
String email;
3131

32-
String penName;
32+
String personName;
3333

3434
PersonInfo infoProfile;
3535

@@ -79,12 +79,12 @@ public void setStatus(PersonStatus status) {
7979
this.status = status;
8080
}
8181

82-
public String getPenName() {
83-
return penName;
82+
public String getPersonName() {
83+
return personName;
8484
}
8585

86-
public void setPenName(String penName) {
87-
this.penName = penName;
86+
public void setPersonName(String personName) {
87+
this.personName = personName;
8888
}
8989

9090
@Override
@@ -94,7 +94,7 @@ public int hashCode() {
9494
result = prime * result + ((email == null) ? 0 : email.hashCode());
9595
result = prime * result + ((infoProfile == null) ? 0 : infoProfile.hashCode());
9696
result = prime * result + ((loginName == null) ? 0 : loginName.hashCode());
97-
result = prime * result + ((penName == null) ? 0 : penName.hashCode());
97+
result = prime * result + ((personName == null) ? 0 : personName.hashCode());
9898
result = prime * result + ((personId == null) ? 0 : personId.hashCode());
9999
result = prime * result + ((status == null) ? 0 : status.hashCode());
100100
return result;
@@ -115,9 +115,9 @@ public boolean equals(Object obj) {
115115
if (loginName == null) {
116116
if (other.loginName != null) return false;
117117
} else if (!loginName.equals(other.loginName)) return false;
118-
if (penName == null) {
119-
if (other.penName != null) return false;
120-
} else if (!penName.equals(other.penName)) return false;
118+
if (personName == null) {
119+
if (other.personName != null) return false;
120+
} else if (!personName.equals(other.personName)) return false;
121121
if (personId == null) {
122122
if (other.personId != null) return false;
123123
} else if (!personId.equals(other.personId)) return false;
@@ -128,7 +128,7 @@ public boolean equals(Object obj) {
128128
@Override
129129
public String toString() {
130130
return "BigPerson [personId=" + personId + ", loginName=" + loginName + ", status="
131-
+ status + ", email=" + email + ", penName=" + penName + ", infoProfile="
131+
+ status + ", email=" + email + ", personName=" + personName + ", infoProfile="
132132
+ infoProfile + "]";
133133
}
134134
}

‎dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class PojoUtilsTest {
7373
bigPerson.setLoginName("name1");
7474
bigPerson.setStatus(PersonStatus.ENABLED);
7575
bigPerson.setEmail("abc@123.com");
76-
bigPerson.setPenName("pname");
76+
bigPerson.setPersonName("pname");
7777

7878
ArrayList<Phone> phones = new ArrayList<Phone>();
7979
Phone phone1 = new Phone("86", "0571", "11223344", "001");

‎dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/BigPerson.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class BigPerson implements Serializable {
2929

3030
String email;
3131

32-
String penName;
32+
String personName;
3333

3434
PersonInfo infoProfile;
3535

@@ -79,12 +79,12 @@ public void setStatus(PersonStatus status) {
7979
this.status = status;
8080
}
8181

82-
public String getPenName() {
83-
return penName;
82+
public String getPersonName() {
83+
return personName;
8484
}
8585

86-
public void setPenName(String penName) {
87-
this.penName = penName;
86+
public void setPersonName(String personName) {
87+
this.personName = personName;
8888
}
8989

9090
@Override
@@ -94,7 +94,7 @@ public int hashCode() {
9494
result = prime * result + ((email == null) ? 0 : email.hashCode());
9595
result = prime * result + ((infoProfile == null) ? 0 : infoProfile.hashCode());
9696
result = prime * result + ((loginName == null) ? 0 : loginName.hashCode());
97-
result = prime * result + ((penName == null) ? 0 : penName.hashCode());
97+
result = prime * result + ((personName == null) ? 0 : personName.hashCode());
9898
result = prime * result + ((personId == null) ? 0 : personId.hashCode());
9999
result = prime * result + ((status == null) ? 0 : status.hashCode());
100100
return result;
@@ -115,9 +115,9 @@ public boolean equals(Object obj) {
115115
if (loginName == null) {
116116
if (other.loginName != null) return false;
117117
} else if (!loginName.equals(other.loginName)) return false;
118-
if (penName == null) {
119-
if (other.penName != null) return false;
120-
} else if (!penName.equals(other.penName)) return false;
118+
if (personName == null) {
119+
if (other.personName != null) return false;
120+
} else if (!personName.equals(other.personName)) return false;
121121
if (personId == null) {
122122
if (other.personId != null) return false;
123123
} else if (!personId.equals(other.personId)) return false;
@@ -128,7 +128,7 @@ public boolean equals(Object obj) {
128128
@Override
129129
public String toString() {
130130
return "BigPerson [personId=" + personId + ", loginName=" + loginName + ", status="
131-
+ status + ", email=" + email + ", penName=" + penName + ", infoProfile="
131+
+ status + ", email=" + email + ", personName=" + personName + ", infoProfile="
132132
+ infoProfile + "]";
133133
}
134134
}

‎dubbo-compatible/src/main/java/com/alibaba/dubbo/container/page/ResourceFilter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import com.alibaba.dubbo.common.Constants;
3939

4040
/**
41-
* ResourceServlet
41+
* ResourceFilter
4242
*/
4343
public class ResourceFilter implements Filter {
4444

‎dubbo-configcenter/dubbo-configcenter-nacos/src/main/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public NacosDynamicConfigurationFactory(ApplicationModel applicationModel) {
3939
protected DynamicConfiguration createDynamicConfiguration(URL url) {
4040
URL nacosURL = url;
4141
if (CommonConstants.DUBBO.equals(url.getParameter(PropertyKeyConst.NAMESPACE))) {
42-
// Nacos use empty string as default name space, replace default namespace "dubbo" to ""
42+
// Nacos use empty string as default namespace, replace default namespace "dubbo" to ""
4343
nacosURL = url.removeParameter(PropertyKeyConst.NAMESPACE);
4444
}
4545
return new NacosDynamicConfiguration(nacosURL, applicationModel);

‎dubbo-configcenter/dubbo-configcenter-nacos/src/test/java/org/apache/dubbo/configcenter/support/nacos/NacosDynamicConfigurationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
/**
4444
* Unit test for nacos config center support
4545
*/
46-
// FIXME: waiting for embedded Nacos suport, then we can open the switch.
46+
// FIXME: waiting for embedded Nacos support, then we can open the switch.
4747
@Disabled("https://github.com/alibaba/nacos/issues/1188")
4848
class NacosDynamicConfigurationTest {
4949
private static final Logger logger = LoggerFactory.getLogger(NacosDynamicConfigurationTest.class);

‎dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
public interface MetadataConstants {
2020
String KEY_SEPARATOR = ":";
2121
String DEFAULT_PATH_TAG = "metadata";
22-
String KEY_REVISON_PREFIX = "revision";
22+
String KEY_REVISION_PREFIX = "revision";
2323
String META_DATA_STORE_TAG = ".metaData";
2424
String METADATA_PUBLISH_DELAY_KEY = "dubbo.application.metadata.publish.delay";
2525
int DEFAULT_METADATA_PUBLISH_DELAY = 1000;

‎dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/identifier/ServiceMetadataIdentifier.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import org.apache.dubbo.common.URL;
2020

21-
import static org.apache.dubbo.metadata.MetadataConstants.KEY_REVISON_PREFIX;
21+
import static org.apache.dubbo.metadata.MetadataConstants.KEY_REVISION_PREFIX;
2222

2323
/**
2424
* The ServiceMetadataIdentifier is used to store the {@link org.apache.dubbo.common.URL}
@@ -52,11 +52,11 @@ public ServiceMetadataIdentifier(URL url) {
5252
}
5353

5454
public String getUniqueKey(KeyTypeEnum keyType) {
55-
return super.getUniqueKey(keyType, protocol, KEY_REVISON_PREFIX + revision);
55+
return super.getUniqueKey(keyType, protocol, KEY_REVISION_PREFIX + revision);
5656
}
5757

5858
public String getIdentifierKey() {
59-
return super.getIdentifierKey(protocol, KEY_REVISON_PREFIX + revision);
59+
return super.getIdentifierKey(protocol, KEY_REVISION_PREFIX + revision);
6060
}
6161

6262
public void setRevision(String revision) {

0 commit comments

Comments
 (0)