Juan Hernandez has uploaded a new change for review.
Change subject: core: Move toByteArray() from GuidUtils to Guid
......................................................................
core: Move toByteArray() from GuidUtils to Guid
This method will soon be needed from classes that are in the common
module.
Change-Id: Ib8e1b69107c042ff16a404fa1bf365a5f3f4a688
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java
M
backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java
M
backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/GuidUtils.java
M
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/GuidUtilsTest.java
5 files changed, 33 insertions(+), 38 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/17101/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java
index 91a0586..459c96e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/ADLdapGuidEncoder.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.bll.adbroker;
import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.utils.GuidUtils;
public class ADLdapGuidEncoder implements LdapGuidEncoder {
private static final ADLdapGuidEncoder instance = new ADLdapGuidEncoder();
@@ -16,7 +15,7 @@
@Override
public String encodeGuid(Guid guid) {
- byte[] ba = GuidUtils.toByteArray(guid.getUuid());
+ byte[] ba = guid.toByteArray();
// AD guid is stored in reversed order than MS-SQL guid -
// Since it is important for us to work with GUIDs which are MS-SQL
@@ -24,7 +23,7 @@
// for each GUID -before using with AD we will change its byte order to
// support AD
Guid adGuid = new Guid(ba, false);
- ba = GuidUtils.toByteArray(adGuid.getUuid());
+ ba = adGuid.toByteArray();
StringBuilder sb = new StringBuilder();
for (int idx = 0; idx < ba.length; idx++) {
sb.append("\\" + String.format("%02X", ba[idx]));
diff --git
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java
index b0dd1b7..c4517ae 100644
---
a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java
+++
b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java
@@ -123,4 +123,19 @@
public String toString() {
return uuid.toString();
}
+
+ public byte[] toByteArray() {
+ byte[] data = new byte[16];
+ long msb = uuid.getMostSignificantBits();
+ for (int i = 7; i >= 0; i--) {
+ data[i] = (byte) (msb & 0xff);
+ msb >>= 8;
+ }
+ long lsb = uuid.getLeastSignificantBits();
+ for (int i = 15; i >= 8; i--) {
+ data[i] = (byte) (lsb & 0xff);
+ lsb >>= 8;
+ }
+ return data;
+ }
}
diff --git
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java
index f6c0ab7..a4d8b58 100644
---
a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java
+++
b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java
@@ -3,6 +3,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -36,4 +37,19 @@
assertEquals(guidFromString, Guid.Empty);
}
+ @Test
+ public void testToByteArray() {
+ final byte[] byteArray = Guid.newGuid().toByteArray();
+ Assert.assertNotNull(byteArray);
+ Assert.assertEquals(16, byteArray.length);
+ }
+
+ @Test
+ public void testToByteArrayAllNull() {
+ final byte[] allNullArray = Guid.Empty.toByteArray();
+ Assert.assertNotNull(allNullArray);
+ for (int i = 0; i < 16; i++) {
+ Assert.assertEquals(0, allNullArray[i]);
+ }
+ }
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/GuidUtils.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/GuidUtils.java
index f035bed..5f52bc1 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/GuidUtils.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/GuidUtils.java
@@ -3,28 +3,11 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.UUID;
import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.compat.Guid;
public class GuidUtils {
-
- public static byte[] toByteArray(UUID uuid) {
- byte[] data = new byte[16];
- long msb = uuid.getMostSignificantBits();
- for (int i = 7; i >= 0; i--) {
- data[i] = (byte) (msb & 0xff);
- msb >>= 8;
- }
- long lsb = uuid.getLeastSignificantBits();
- for (int i = 15; i >= 8; i--) {
- data[i] = (byte) (lsb & 0xff);
- lsb >>= 8;
- }
- return data;
- }
-
private static final String SEPARATOR = ",";
/**
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/GuidUtilsTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/GuidUtilsTest.java
index 3750364..bbf02ad 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/GuidUtilsTest.java
+++
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/GuidUtilsTest.java
@@ -4,29 +4,11 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.UUID;
-import org.junit.Assert;
import org.junit.Test;
import org.ovirt.engine.core.compat.Guid;
public class GuidUtilsTest {
- @Test
- public void toByteArray() {
- final byte[] byteArray = GuidUtils.toByteArray(UUID.randomUUID());
- Assert.assertNotNull(byteArray);
- Assert.assertEquals(16, byteArray.length);
- }
-
- @Test
- public void toByteArrayAllNoll() {
- final byte[] allNullArray =
GuidUtils.toByteArray(UUID.fromString("00000000-0000-0000-0000-000000000000"));
- Assert.assertNotNull(allNullArray);
- for (int i = 0; i < 16; i++) {
- Assert.assertEquals(0, allNullArray[i]);
- }
- }
-
@Test
public void testGuidListValues() {
String listValues =
"e61f7070-cd52-46ca-88c2-686e1c70fe44,1eaa381a-fbf9-4ef5-bec2-6e4337f85d66";
--
To view, visit http://gerrit.ovirt.org/17101
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8e1b69107c042ff16a404fa1bf365a5f3f4a688
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
