Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unneeded unit tests for unneeded UUID method 

getMojangUUID was a replacement for the regex conversion of UUIDs to
Mojang's format. I have removed this method and the associated unit
tests because it is nothing more than a wrapper around String#replace.
This new patch simply replaces the call to String#replaceAll with a
call to String#replace. Patch 0011 was affected by this change, and has
been fixed.

Merges #9
This commit is contained in:
phase 2016-05-31 10:37:52 -07:00 committed by Techcable
parent 3809083007
commit f160b2169e
3 changed files with 34 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
BungeeCord-Patches/0010-Clean-up-and-unit-test-the-UUID-code.patch
View File

@ -1,80 +0,0 @@
From c5c7f68d947f366fef739e0ac3a655baed507bfe Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 18:13:48 -0600
Subject: [PATCH] Clean up and unit test the UUID code.
Also optimizes conversion to mojang-style uuids (by avoiding regex).
diff --git a/api/src/main/java/net/md_5/bungee/Util.java b/api/src/main/java/net/md_5/bungee/Util.java
index 86a0055..37e12e9 100644
--- a/api/src/main/java/net/md_5/bungee/Util.java
+++ b/api/src/main/java/net/md_5/bungee/Util.java
@@ -80,4 +80,8 @@ public class Util
{
return UUID.fromString( uuid.substring( 0, 8 ) + "-" + uuid.substring( 8, 12 ) + "-" + uuid.substring( 12, 16 ) + "-" + uuid.substring( 16, 20 ) + "-" + uuid.substring( 20, 32 ) );
}
+
+ public static String getMojangUUID(UUID uuid) {
+ return uuid.toString().replace( "-", "" );
+ }
}
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
index 314a1d2..6804ad9 100644
--- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java
+++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
@@ -73,7 +73,7 @@ public class ServerPing
public String getId()
{
- return uniqueId.toString().replaceAll( "-", "" );
+ return Util.getMojangUUID(uniqueId);
}
}
diff --git a/api/src/test/java/net/md_5/bungee/util/UtilTest.java b/api/src/test/java/net/md_5/bungee/util/UtilTest.java
new file mode 100644
index 0000000..030b5cd
--- /dev/null
+++ b/api/src/test/java/net/md_5/bungee/util/UtilTest.java
@@ -0,0 +1,25 @@
+package net.md_5.bungee.util;
+
+import net.md_5.bungee.Util;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.UUID;
+
+import static org.junit.Assert.*;
+
+public class UtilTest {
+
+ private static final String FULL_UUID = "982709b9-6fd8-4627-929d-e7d3b91166ea";
+ private static final String MOJANG_UUID = "982709b96fd84627929de7d3b91166ea";
+
+ @Test
+ public void testGetUUID() throws Exception {
+ Assert.assertEquals(FULL_UUID, Util.getUUID(MOJANG_UUID).toString());
+ }
+
+ @Test
+ public void testGetMojangUUID() throws Exception {
+ assertEquals(MOJANG_UUID, Util.getMojangUUID(UUID.fromString(FULL_UUID)));
+ }
+}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index dab6ef2..ad19168 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -603,7 +603,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
- return uniqueId.toString().replaceAll( "-", "" );
+ return Util.getMojangUUID(uniqueId);
}
@Override
--
2.8.3

33
BungeeCord-Patches/0010-Optimize-conversion-to-Mojang-style-UUIDs-by-avoiding-regex.patch Normal file
View File

@ -0,0 +1,33 @@
From c5c7f68d947f366fef739e0ac3a655baed507bfe Mon Sep 17 00:00:00 2001
From: Jadon Fowler <jadonflower@gmail.com>
Date: Tue, 31 May 2016 00:36:01 -0600
Subject: [PATCH] Optimize conversion to Mojang-style UUIDs by avoiding regex
diff --git a/api/src/main/java/net/md_5/bungee/api/ServerPing.java b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
index 314a1d2..6804ad9 100644
--- a/api/src/main/java/net/md_5/bungee/api/ServerPing.java
+++ b/api/src/main/java/net/md_5/bungee/api/ServerPing.java
@@ -73,7 +73,7 @@ public class ServerPing
public String getId()
{
- return uniqueId.toString().replaceAll( "-", "" );
+ return uniqueId.toString().replace( "-", "" );
}
}
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
index dab6ef2..ad19168 100644
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
@@ -603,7 +603,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@Override
public String getUUID()
{
- return uniqueId.toString().replaceAll( "-", "" );
+ return uniqueId.toString().replace( "-", "" );
}
@Override
--
2.8.3

16
BungeeCord-Patches/0011-Optimize-uuid-conversions.patch
View File

@ -232,27 +232,13 @@ index 37e12e9..b268bef 100644
}
/**
@@ -78,10 +82,17 @@ public class Util
@@ -78,5 +82,5 @@ public class Util
*/
public static UUID getUUID(String uuid)
{
- return UUID.fromString( uuid.substring( 0, 8 ) + "-" + uuid.substring( 8, 12 ) + "-" + uuid.substring( 12, 16 ) + "-" + uuid.substring( 16, 20 ) + "-" + uuid.substring( 20, 32 ) );
+ return UUIDUtils.fromString(uuid);
}
- public static String getMojangUUID(UUID uuid) {
- return uuid.toString().replace( "-", "" );
+ /**
+ * Converts a UUID to a Mojang UUID
+ *
+ * @param uuid The string to be converted
+ * @return The result
+ */
+ public static String getMojangUUID(UUID uuid)
+ {
+ return UUIDUtils.toMojangString(uuid);
}
}
--
2.8.3