You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2013/02/14 02:24:23 UTC
svn commit: r1446013 - in /accumulo/trunk/core/src:
main/java/org/apache/accumulo/core/security/Authorizations.java
test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
Author: ctubbsii
Date: Thu Feb 14 01:24:23 2013
New Revision: 1446013
URL: http://svn.apache.org/r1446013
Log:
ACCUMULO-1051 reverted previous change, which broke unit tests. Awaiting updated patch based on test failures and ticket discussions.
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java?rev=1446013&r1=1446012&r2=1446013&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java Thu Feb 14 01:24:23 2013
@@ -23,10 +23,9 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
import org.apache.accumulo.core.data.ArrayByteSequence;
import org.apache.accumulo.core.data.ByteSequence;
@@ -38,14 +37,14 @@ public class Authorizations implements I
private static final long serialVersionUID = 1L;
- private Set<ByteSequence> auths = new TreeSet<ByteSequence>();
+ private HashSet<ByteSequence> auths = new HashSet<ByteSequence>();
private List<byte[]> authsList = new ArrayList<byte[]>();
private List<byte[]> immutableList = Collections.unmodifiableList(authsList);
private static final boolean[] validAuthChars = new boolean[256];
public static final String HEADER = "!AUTH1:";
-
+
static {
for (int i = 0; i < 256; i++) {
validAuthChars[i] = false;
@@ -104,11 +103,11 @@ public class Authorizations implements I
* @param authorizations
* a serialized authorizations string produced by {@link #getAuthorizationsArray()} or {@link #serialize()}
*/
-
+
public Authorizations(byte[] authorizations) {
ArgumentChecker.notNull(authorizations);
-
+
String authsString = new String(authorizations);
if (authsString.startsWith(HEADER)) {
// its the new format
@@ -141,7 +140,7 @@ public class Authorizations implements I
public Authorizations(Charset charset, String... authorizations) {
setAuthorizations(charset, authorizations);
}
-
+
public Authorizations(String... authorizations) {
setAuthorizations(authorizations);
}
@@ -177,7 +176,6 @@ public class Authorizations implements I
return ByteBufferUtil.toByteBuffers(immutableList);
}
- @Override
public String toString() {
StringBuilder sb = new StringBuilder();
String sep = "";
@@ -198,7 +196,6 @@ public class Authorizations implements I
return auths.contains(auth);
}
- @Override
public boolean equals(Object o) {
if (o == null) {
return false;
@@ -213,7 +210,6 @@ public class Authorizations implements I
return false;
}
- @Override
public int hashCode() {
int result = 0;
for (ByteSequence b : auths)
Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java?rev=1446013&r1=1446012&r2=1446013&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java Thu Feb 14 01:24:23 2013
@@ -43,12 +43,4 @@ public class AuthorizationsTest {
assertEquals(a, b);
}
- @Test
- public void testSerialization() {
- Authorizations a1 = new Authorizations("a", "b");
- Authorizations a2 = new Authorizations("b", "a");
-
- assertEquals(a1, a2);
- assertEquals(a1.serialize(), a2.serialize());
- }
}