unico 2004/08/05 08:44:59
Modified: src/share/org/apache/slide/security
SecurityImplAllGrant.java NodePermission.java
SecurityImpl.java ACLSecurityImpl.java
src/share/org/apache/slide/common XMLUnmarshaller.java
src/share/org/apache/slide/lock LockImpl.java
src/webdav/server/org/apache/slide/webdav/method/report
AclPrincipalPropSetReport.java
PrincipalMatchReport.java
src/share/org/apache/slide/content NodeProperty.java
ContentImpl.java
src/share/org/apache/slide/structure ObjectNode.java
SubjectNode.java
src/webdav/server/org/apache/slide/webdav/util
PropertyHelper.java
Log:
use equals instead of identity check (equals is already optimized for identical
objects)
Revision Changes Path
1.9 +9 -9
jakarta-slide/src/share/org/apache/slide/security/SecurityImplAllGrant.java
Index: SecurityImplAllGrant.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImplAllGrant.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SecurityImplAllGrant.java 28 Jul 2004 09:34:47 -0000 1.8
+++ SecurityImplAllGrant.java 5 Aug 2004 15:44:56 -0000 1.9
@@ -82,7 +82,7 @@
throws ServiceAccessException, ObjectNotFoundException {
// no check for default action (server intitialization)
- if (action == ActionNode.DEFAULT) {
+ if (action.equals(ActionNode.DEFAULT)) {
return true;
}
@@ -112,7 +112,7 @@
(NodePermission) permissions.nextElement();
String permissionSubject = permission.getSubjectUri();
- if (permissionSubject == SubjectNode.SELF_URI) {
+ if (permissionSubject.equals(SubjectNode.SELF_URI)) {
boolean check;
check = object.getUri().equals(subjectUri.toString());
if (permission.isInheritable()) {
@@ -136,13 +136,13 @@
} else if (permission.isInheritable()
|| permission.getObjectUri().equals(object.getUri())) {
- if (permissionSubject.startsWith("/") || permissionSubject ==
SubjectNode.ALL_URI) {
+ if (permissionSubject.startsWith("/") ||
permissionSubject.equals(SubjectNode.ALL_URI)) {
// Node permission
String permSubj = permission.getSubjectUri();
String permActn = permission.getActionUri();
boolean match = false;
- if (permSubj == SubjectNode.ALL_URI) {
+ if (permSubj.equals(SubjectNode.ALL_URI)) {
match = true;
}
else {
@@ -152,7 +152,7 @@
equals(permission.getSubjectUri()) ||
subjectUri.toString().startsWith(permSubj);
}
- if (permActn == ActionNode.ALL_URI) {
+ if (permActn.equals(ActionNode.ALL_URI)) {
match &= true;
}
else {
1.17 +5 -10
jakarta-slide/src/share/org/apache/slide/security/NodePermission.java
Index: NodePermission.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/NodePermission.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NodePermission.java 28 Jul 2004 09:34:48 -0000 1.16
+++ NodePermission.java 5 Aug 2004 15:44:56 -0000 1.17
@@ -466,12 +466,7 @@
* @param actionUri New action Uri
*/
void setAction(String actionUri) {
- if (ActionNode.ALL_URI != actionUri &&
ActionNode.ALL_URI.equals(actionUri)) {
- this.actionUri = ActionNode.ALL_URI;
- }
- else {
- this.actionUri = actionUri;
- }
+ this.actionUri = actionUri;
}
1.52 +8 -8
jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java
Index: SecurityImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- SecurityImpl.java 28 Jul 2004 09:34:47 -0000 1.51
+++ SecurityImpl.java 5 Aug 2004 15:44:56 -0000 1.52
@@ -41,7 +41,6 @@
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.common.SlideTokenWrapper;
import org.apache.slide.common.Uri;
import org.apache.slide.content.NodeProperty;
import org.apache.slide.content.NodeRevisionDescriptor;
@@ -70,6 +69,7 @@
public class SecurityImpl implements Security {
private static final String LOG_CHANNEL = SecurityImpl.class.getName();
+ private static final String PRIVILEGE_MEMBER_SET = "privilege-member-set";
protected Logger logger;
@@ -494,7 +494,7 @@
throws ServiceAccessException, ObjectNotFoundException {
// no check for default action (server intitialization)
- if (action == ActionNode.DEFAULT) {
+ if (action.equals(ActionNode.DEFAULT)) {
return true;
}
@@ -524,7 +524,7 @@
(NodePermission) permissions.nextElement();
String permissionSubject = permission.getSubjectUri();
- if (permissionSubject == SubjectNode.SELF_URI) {
+ if (permissionSubject.equals(SubjectNode.SELF_URI)) {
boolean check;
check = object.getUri().equals(subjectUri.toString());
@@ -1122,7 +1122,7 @@
Set result = new HashSet();
Uri aNodeUri = namespace.getUri(aNode.getUri());
NodeRevisionDescriptor aNrd =
aNodeUri.getStore().retrieveRevisionDescriptor(aNodeUri, new NodeRevisionNumber());
- NodeProperty membersProp = aNrd.getProperty("privilege-member-set");
+ NodeProperty membersProp = aNrd.getProperty(PRIVILEGE_MEMBER_SET);
if (membersProp != null && membersProp.getValue() != null) {
XMLValue membersVal;
if (membersProp.getValue() instanceof XMLValue) {
1.10 +11 -11
jakarta-slide/src/share/org/apache/slide/security/ACLSecurityImpl.java
Index: ACLSecurityImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/ACLSecurityImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ACLSecurityImpl.java 28 Jul 2004 09:34:48 -0000 1.9
+++ ACLSecurityImpl.java 5 Aug 2004 15:44:56 -0000 1.10
@@ -315,19 +315,19 @@
}
private boolean matchSubject(SlideToken token, ObjectNode objectNode,
SubjectNode checkSubject, SubjectNode permSubject) throws ServiceAccessException {
- if (permSubject == SubjectNode.ALL) {
+ if (permSubject.equals(SubjectNode.ALL)) {
return true;
}
- else if (permSubject == SubjectNode.AUTHENTICATED) {
- return checkSubject != SubjectNode.UNAUTHENTICATED;
+ else if (permSubject.equals(SubjectNode.AUTHENTICATED)) {
+ return !checkSubject.equals(SubjectNode.UNAUTHENTICATED);
}
- else if (permSubject == SubjectNode.UNAUTHENTICATED) {
- return checkSubject == SubjectNode.UNAUTHENTICATED;
+ else if (permSubject.equals(SubjectNode.UNAUTHENTICATED)) {
+ return checkSubject.equals(SubjectNode.UNAUTHENTICATED);
}
- else if (permSubject == SubjectNode.OWNER) {
+ else if (permSubject.equals(SubjectNode.OWNER)) {
return matchOwner(token, objectNode, checkSubject);
}
- else if (permSubject == SubjectNode.SELF) {
+ else if (permSubject.equals(SubjectNode.SELF)) {
return matchPrincipal(token, checkSubject, (SubjectNode)objectNode);
}
else {
1.31 +5 -35
jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java
Index: XMLUnmarshaller.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/XMLUnmarshaller.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XMLUnmarshaller.java 28 Jul 2004 09:38:08 -0000 1.30
+++ XMLUnmarshaller.java 5 Aug 2004 15:44:57 -0000 1.31
@@ -34,11 +34,11 @@
import org.apache.slide.content.NodeRevisionContent;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
-import org.apache.slide.content.NodeRevisionNumber;
import org.apache.slide.content.RevisionAlreadyExistException;
import org.apache.slide.content.RevisionContentNotFoundException;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
import org.apache.slide.content.RevisionNotFoundException;
+import org.apache.slide.event.VetoException;
import org.apache.slide.lock.ObjectLockedException;
import org.apache.slide.security.AccessDeniedException;
import org.apache.slide.security.NodePermission;
@@ -54,7 +54,6 @@
import org.apache.slide.util.conf.ConfigurationException;
import org.apache.slide.util.conf.Populate;
import org.apache.slide.util.logger.Logger;
-import org.apache.slide.event.VetoException;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -69,11 +68,6 @@
private final static String LOG_CHANNEL = XMLUnmarshaller.class.getName();
- private static UriPath
- usersPath,
- rolesPath,
- groupsPath;
-
// --------------------------------------------------------- Public Methods
@@ -192,21 +186,6 @@
if
(accessToken.getNamespaceConfig().getUsersPath().equals(subjectUri)) {
subjectUri = SubjectNode.ALL_URI;
}
- else if (SubjectNode.ALL_URI.equals(subjectUri)) {
- subjectUri = SubjectNode.ALL_URI;
- }
- else if (SubjectNode.OWNER_URI.equals(subjectUri)) {
- subjectUri = SubjectNode.OWNER_URI;
- }
- else if (SubjectNode.UNAUTHENTICATED_URI.equals(subjectUri)) {
- subjectUri = SubjectNode.UNAUTHENTICATED_URI;
- }
- else if (SubjectNode.AUTHENTICATED_URI.equals(subjectUri)) {
- subjectUri = SubjectNode.AUTHENTICATED_URI;
- }
- else if (SubjectNode.SELF_URI.equals(subjectUri)) {
- subjectUri = SubjectNode.SELF_URI;
- }
String actionUri =
permissionDefinition.getAttribute("action");
@@ -214,9 +193,6 @@
if
(accessToken.getNamespaceConfig().getActionsPath().equals(actionUri)) {
actionUri = ActionNode.ALL_URI;
}
- else if (ActionNode.ALL_URI.equals(actionUri)) {
- actionUri = ActionNode.ALL_URI;
- }
boolean inheritable = true;
@@ -362,9 +338,6 @@
Enumeration propertyDefinitions =
revisionDefinition.getConfigurations("property");
- // Retrieving the revision number, if any
- NodeRevisionNumber revisionNumber = null;
-
// Now creating the new revision descriptor object
NodeRevisionDescriptor revisionDescriptor = null;
@@ -385,9 +358,6 @@
} catch (ObjectLockedException e) {
// Ignore
}
- }
- if (revisionDescriptor == null) {
- revisionDescriptor = new NodeRevisionDescriptor(0);
}
while (propertyDefinitions.hasMoreElements()) {
1.47 +6 -6 jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java
Index: LockImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/lock/LockImpl.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- LockImpl.java 2 Aug 2004 16:36:04 -0000 1.46
+++ LockImpl.java 5 Aug 2004 15:44:57 -0000 1.47
@@ -415,7 +415,7 @@
ObjectLockedException {
// no check for default action (server intitialization)
- if (action == ActionNode.DEFAULT) {
+ if (action.equals(ActionNode.DEFAULT)) {
return;
}
@@ -542,7 +542,7 @@
catch (SlideException e) {}
if (Configuration.usePrincipalIdentifiedLocks() &&
ownerNode != null &&
- ownerNode != SubjectNode.UNAUTHENTICATED &&
+ !ownerNode.equals(SubjectNode.UNAUTHENTICATED) &&
ownerNode.equals(principalNode)) {
return true;
}
1.7 +8 -8
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/AclPrincipalPropSetReport.java
Index: AclPrincipalPropSetReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/AclPrincipalPropSetReport.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AclPrincipalPropSetReport.java 5 Aug 2004 14:43:34 -0000 1.6
+++ AclPrincipalPropSetReport.java 5 Aug 2004 15:44:57 -0000 1.7
@@ -137,14 +137,14 @@
}
private String getPrincipalPath(SubjectNode principalNode,
NodeRevisionDescriptor nrd) throws SlideException {
- if (principalNode == SubjectNode.ALL
- || principalNode == SubjectNode.SELF
- || principalNode == SubjectNode.AUTHENTICATED
- || principalNode == SubjectNode.UNAUTHENTICATED
+ if (principalNode.equals(SubjectNode.ALL)
+ || principalNode.equals(SubjectNode.SELF)
+ || principalNode.equals(SubjectNode.AUTHENTICATED)
+ || principalNode.equals(SubjectNode.UNAUTHENTICATED)
) {
return null;
}
- else if (principalNode == SubjectNode.OWNER) {
+ else if (principalNode.equals(SubjectNode.OWNER)) {
NodeProperty ownerProp = nrd.getProperty(P_OWNER);
if (ownerProp != null) {
return
token.getNamespaceConfig().getUsersPath()+"/"+ownerProp.getValue();
1.11 +5 -5
jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalMatchReport.java
Index: PrincipalMatchReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/report/PrincipalMatchReport.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PrincipalMatchReport.java 5 Aug 2004 14:43:34 -0000 1.10
+++ PrincipalMatchReport.java 5 Aug 2004 15:44:57 -0000 1.11
@@ -171,10 +171,10 @@
}
private Element getQueryElement(String resourcePath, SubjectNode
currentUserNode) throws SlideException {
- if (matchSubjectNode == SubjectNode.OWNER) {
+ if (matchSubjectNode.equals(SubjectNode.OWNER)) {
return getOwnerQueryElement(resourcePath, currentUserNode);
}
- else if (matchSubjectNode == SubjectNode.SELF) {
+ else if (matchSubjectNode.equals(SubjectNode.SELF)) {
return getSelfQueryElement(resourcePath, currentUserNode);
}
else {
1.25 +14 -4
jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java
Index: NodeProperty.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- NodeProperty.java 28 Jul 2004 09:37:55 -0000 1.24
+++ NodeProperty.java 5 Aug 2004 15:44:57 -0000 1.25
@@ -532,6 +532,16 @@
private Kind( int id ) {
this.id = id;
}
+
+ public boolean equals(Object object) {
+ if (this == object) {
+ return true;
+ }
+ if (object instanceof Kind) {
+ return ((Kind) object).id == id;
+ }
+ return false;
+ }
}
/**
1.60 +5 -8
jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
Index: ContentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ContentImpl.java 28 Jul 2004 09:37:57 -0000 1.59
+++ ContentImpl.java 5 Aug 2004 15:44:57 -0000 1.60
@@ -995,9 +995,6 @@
// Retrieve the revision table
NodeRevisionDescriptors revisionDescriptors =
objectUri.getStore().retrieveRevisionDescriptors(objectUri);
- NodeRevisionDescriptor oldRevisionDescriptor =
- objectUri.getStore().retrieveRevisionDescriptor
- (objectUri, revisionDescriptor.getRevisionNumber());
// Fire event
if ( revisionDescriptor.getRevisionNumber() !=
NodeRevisionNumber.HIDDEN_0_0 && ContentEvent.STORE.isEnabled() )
EventDispatcher.getInstance().fireVetoableEvent(ContentEvent.STORE, new
ContentEvent(this, token, namespace, objectUri.toString(), revisionDescriptors,
revisionDescriptor, revisionContent));
@@ -1489,7 +1486,7 @@
throws ServiceAccessException, ObjectLockedException, AccessDeniedException,
LinkedObjectNotFoundException, ObjectNotFoundException, VetoException {
- if (namespaceConfig.getCreateObjectAction() == ActionNode.DEFAULT) {
+ if (namespaceConfig.getCreateObjectAction().equals(ActionNode.DEFAULT)) {
// do not check during start-up
return;
}
1.27 +7 -4
jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java
Index: ObjectNode.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ObjectNode.java 28 Jul 2004 09:34:35 -0000 1.26
+++ ObjectNode.java 5 Aug 2004 15:44:58 -0000 1.27
@@ -349,6 +349,9 @@
* <li>The Uris are equal</li>
*/
public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
if (obj instanceof ObjectNode) {
return getPath().equals(((ObjectNode)obj).getPath());
}
1.10 +9 -28
jakarta-slide/src/share/org/apache/slide/structure/SubjectNode.java
Index: SubjectNode.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/structure/SubjectNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SubjectNode.java 28 Jul 2004 09:34:34 -0000 1.9
+++ SubjectNode.java 5 Aug 2004 15:44:58 -0000 1.10
@@ -80,39 +80,20 @@
super(uuri, bindings, parentset, links);
}
- public static String getSubjectUri(String subjectUri) {
- if (SubjectNode.ALL_URI != subjectUri &&
SubjectNode.ALL_URI.equals(subjectUri)) {
- return SubjectNode.ALL_URI;
- }
- else if (SubjectNode.AUTHENTICATED_URI != subjectUri &&
SubjectNode.AUTHENTICATED_URI.equals(subjectUri)) {
- return SubjectNode.AUTHENTICATED_URI;
- }
- else if (SubjectNode.OWNER_URI != subjectUri &&
SubjectNode.OWNER_URI.equals(subjectUri)) {
- return SubjectNode.OWNER_URI;
- }
- else if (SubjectNode.SELF_URI != subjectUri &&
SubjectNode.SELF_URI.equals(subjectUri)) {
- return SubjectNode.SELF_URI;
- }
- else if (SubjectNode.UNAUTHENTICATED_URI != subjectUri &&
SubjectNode.UNAUTHENTICATED_URI.equals(subjectUri)) {
- return SubjectNode.UNAUTHENTICATED_URI;
- }
- return subjectUri;
- }
-
public static SubjectNode getSubjectNode(String subjectUri) {
- if (SubjectNode.ALL_URI == subjectUri ||
SubjectNode.ALL_URI.equals(subjectUri)) {
+ if (SubjectNode.ALL_URI.equals(subjectUri)) {
return SubjectNode.ALL;
}
- else if (SubjectNode.AUTHENTICATED_URI == subjectUri ||
SubjectNode.AUTHENTICATED_URI.equals(subjectUri)) {
+ else if (SubjectNode.AUTHENTICATED_URI.equals(subjectUri)) {
return SubjectNode.AUTHENTICATED;
}
- else if (SubjectNode.OWNER_URI == subjectUri ||
SubjectNode.OWNER_URI.equals(subjectUri)) {
+ else if (SubjectNode.OWNER_URI.equals(subjectUri)) {
return SubjectNode.OWNER;
}
- else if (SubjectNode.SELF_URI == subjectUri ||
SubjectNode.SELF_URI.equals(subjectUri)) {
+ else if (SubjectNode.SELF_URI.equals(subjectUri)) {
return SubjectNode.SELF;
}
- else if (SubjectNode.UNAUTHENTICATED_URI == subjectUri ||
SubjectNode.UNAUTHENTICATED_URI.equals(subjectUri)) {
+ else if (SubjectNode.UNAUTHENTICATED_URI.equals(subjectUri)) {
return SubjectNode.UNAUTHENTICATED;
}
return new SubjectNode(subjectUri);
1.79 +9 -9
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- PropertyHelper.java 3 Aug 2004 10:18:09 -0000 1.78
+++ PropertyHelper.java 5 Aug 2004 15:44:58 -0000 1.79
@@ -1449,7 +1449,7 @@
SubjectNode snode =
SubjectNode.getSubjectNode(objectLockToken.getSubjectUri());
String subjectUri = objectLockToken.getSubjectUri();
- if (snode == SubjectNode.UNAUTHENTICATED) {
+ if (snode.equals(SubjectNode.UNAUTHENTICATED)) {
String userspath = nsaToken.getNamespaceConfig().getUsersPath();
subjectUri = userspath+"/"+snode.toString();
}
@@ -1755,24 +1755,24 @@
private Element createPrincipalElement(String subjectUri) {
Element principalElm = new Element(E_PRINCIPAL, DNSP);
- if (subjectUri == SubjectNode.ALL_URI) {
+ if (subjectUri.equals(SubjectNode.ALL_URI)) {
Element allElm = new Element(E_ALL, DNSP);
principalElm.addContent(allElm);
}
- else if (subjectUri == SubjectNode.AUTHENTICATED_URI) {
+ else if (subjectUri.equals(SubjectNode.AUTHENTICATED_URI)) {
Element authenticatedElm = new Element(E_AUTHENTICATED, DNSP);
principalElm.addContent(authenticatedElm);
}
- else if (subjectUri == SubjectNode.UNAUTHENTICATED_URI) {
+ else if (subjectUri.equals(SubjectNode.UNAUTHENTICATED_URI)) {
Element unauthenticatedElm = new Element(E_UNAUTHENTICATED, DNSP);
principalElm.addContent(unauthenticatedElm);
}
- else if (subjectUri == SubjectNode.OWNER_URI) {
+ else if (subjectUri.equals(SubjectNode.OWNER_URI)) {
Element propertyElm = new Element(E_PROPERTY, DNSP);
propertyElm.addContent(new Element(P_OWNER, DNSP));
principalElm.addContent(propertyElm);
}
- else if (subjectUri == SubjectNode.SELF_URI) {
+ else if (subjectUri.equals(SubjectNode.SELF_URI)) {
Element selfElm = new Element(E_SELF, DNSP);
principalElm.addContent(selfElm);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
