Author: mir
Date: Thu Feb 18 09:24:40 2010
New Revision: 911294
URL: http://svn.apache.org/viewvc?rev=911294&view=rev
Log:
CLEREZZA-107: Removed privileged block from getUserInSystemGraph. Methods no
longer use deprecated getUSerByName method.
Modified:
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
Modified:
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java?rev=911294&r1=911293&r2=911294&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
Thu Feb 18 09:24:40 2010
@@ -308,7 +308,7 @@
return;
}
- if (getUserByName(name) != null) {
+ if (getUserByUserName(name) != null) {
throw new UserAlreadyExistsException(name);
}
if (email != null) {
@@ -392,7 +392,7 @@
return;
}
- NonLiteral user = getUserByName(name);
+ NonLiteral user = getUserByUserName(name);
if (user == null) {
throw new UserNotExistsException(name);
}
@@ -455,12 +455,7 @@
@Override
public NonLiteral getUserByName( String name) {
- Iterator<Triple> triples = systemGraph.filter(null,
PLATFORM.userName,
- new PlainLiteralImpl(name));
- if (triples.hasNext()) {
- return triples.next().getSubject();
- }
- return null;
+ return getUserByUserName(name);
}
@Override
@@ -474,7 +469,7 @@
return;
}
- NonLiteral user = getUserByName(name);
+ NonLiteral user = getUserByUserName(name);
if (user != null) {
deleteTriplesOfASubject(user);
}
@@ -489,7 +484,7 @@
}
addPermissionEntriesForARole(
- getUserByName(name), name,
+ getUserByUserName(name), name,
permissionEntries);
}
@@ -507,7 +502,7 @@
}
deletePermissionEntriesOfARole(
- getUserByName(name), name,
+ getUserByUserName(name), name,
permissionEntries);
}
@@ -518,7 +513,7 @@
}
deleteAllPermissionEntriesOfARole(
- getUserByName(name));
+ getUserByUserName(name));
}
/**
@@ -540,18 +535,12 @@
@Override
public GraphNode getUserInSystemGraph(final String name) {
- return AccessController.doPrivileged(new
PrivilegedAction<GraphNode>() {
-
- @Override
- public GraphNode run() {
- NonLiteral user = getUserByName(name);
- if (user != null) {
- return new GraphNode(user, systemGraph);
- } else {
- return null;
- }
- }
- });
+ NonLiteral user = getUserByUserName(name);
+ if (user != null) {
+ return new GraphNode(user, systemGraph);
+ } else {
+ return null;
+ }
}
@Override
@@ -568,7 +557,7 @@
@Override
public NonLiteral run() {
- return
getUserByName(name);
+ return
getUserByUserName(name);
}
});
if (user != null) {
@@ -582,10 +571,10 @@
@Override
public GraphNode getUserGraphNode(final String name) {
- NonLiteral user = getUserByName(name);
+ NonLiteral user = getUserByUserName(name);
if (user != null) {
GraphNode userNodeInSystemGraph =
- new GraphNode(getUserByName(name),
systemGraph);
+ new GraphNode(getUserByUserName(name),
systemGraph);
MGraph copiedUserContext = new
SimpleMGraph(userNodeInSystemGraph.getNodeContext());
return new GraphNode(userNodeInSystemGraph.getNode(),
copiedUserContext);
@@ -593,4 +582,13 @@
return null;
}
}
+
+ private NonLiteral getUserByUserName(String name) {
+ Iterator<Triple> triples = systemGraph.filter(null,
PLATFORM.userName,
+ new PlainLiteralImpl(name));
+ if (triples.hasNext()) {
+ return triples.next().getSubject();
+ }
+ return null;
+ }
}
