Skip to content

The Unified and Autonomous Development Platform

fix: upgrade breaks emoji in issue titles (10.3.3 -> 10.5.2, builtin DB (#1877)

Robin Shen7065bcf7b415
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java b/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java
index 84eb652de7..d1c9f6bb72 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/VersionedXmlDoc.java
@@ -430,7 +430,8 @@ public final class VersionedXmlDoc implements Document, Externalizable {
|| ch == 0xD
|| (ch >= 0x20 && ch <= 0xD7FF)
|| (ch >= 0xE000 && ch <= 0xFFFD)
- || (ch >= 0x10000 && ch <= 0x10FFFF)) {
+ || (ch >= 0x10000 && ch <= 0x10FFFF)
+ || Character.isSurrogate(ch)) {
builder.append(ch);
} else {
builder.append('?');
diff --git a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
index a15ec64bdf..f137260b8e 100644
--- a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
+++ b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
@@ -1,7 +1,6 @@
package io.onedev.server.model;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import io.onedev.server.entityreference.EntityReference;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.util.facade.EntityFacade;
@@ -146,10 +145,5 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac
public EntityFacade getFacade() {
return null;
}
-
- @Nullable
- public EntityReference getReference() {
- return null;
- }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index cefe174c0e..28fc7eff72 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -497,7 +497,6 @@ public class Build extends ProjectBelonging
this.description = StringUtils.abbreviate(description, MAX_DESCRIPTION_LEN);
}
- @Override
public EntityReference getReference() {
return new BuildReference(getProject(), getNumber());
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index c614e8a1ad..ce407f3a0f 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -398,7 +398,6 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
return threadingReferences;
}
- @Override
public EntityReference getReference() {
return new IssueReference(getProject(), getNumber());
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 720f58d005..25bfbefdbe 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -919,7 +919,6 @@ public class PullRequest extends ProjectBelonging
return getTargetProject();
}
- @Override
public EntityReference getReference() {
return new PullRequestReference(getProject(), getNumber());
}
diff --git a/server-core/src/test/java/io/onedev/server/data/migration/VersionedXmlDocTest.java b/server-core/src/test/java/io/onedev/server/data/migration/VersionedXmlDocTest.java
new file mode 100644
index 0000000000..6dd0fce606
--- /dev/null
+++ b/server-core/src/test/java/io/onedev/server/data/migration/VersionedXmlDocTest.java
@@ -0,0 +1,48 @@
+package io.onedev.server.data.migration;
+
+import com.thoughtworks.xstream.XStream;
+import io.onedev.commons.loader.AppLoader;
+import io.onedev.commons.loader.AppLoaderMocker;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.junit.Assert.assertEquals;
+
+public class VersionedXmlDocTest extends AppLoaderMocker {
+
+ @Test
+ public void test() {
+ var xstream = new XStream();
+ xstream.allowTypes(new Class<?>[]{Bean.class});
+ Mockito.when(AppLoader.getInstance(XStream.class)).thenReturn(xstream);
+
+ var bean = new Bean();
+ bean.setName("\uD83E\uDD8A✅\uD83D\uDDC4️\uffffreplaceme");
+ var xml = VersionedXmlDoc.fromBean(bean).toXML().replace("replaceme", "&#27;");
+ Bean beanClone = (Bean) VersionedXmlDoc.fromXML(xml).toBean();
+ assertEquals("\uD83E\uDD8A✅\uD83D\uDDC4️?", beanClone.getName());
+ }
+
+ @Override
+ protected void setup() {
+
+ }
+
+ @Override
+ protected void teardown() {
+
+ }
+
+ public static class Bean {
+
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ }
+}
\ No newline at end of file