You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2015/10/19 13:14:58 UTC
svn commit: r1709393 - in
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr:
delegate/ session/ version/
Author: mduerig
Date: Mon Oct 19 11:14:57 2015
New Revision: 1709393
URL: http://svn.apache.org/viewvc?rev=1709393&view=rev
Log:
OAK-3528: Unchecked assignements in calls to performVoid()
Parametrize arguments passed to performVoid with the Void type
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AccessControlManagerDelegator.java Mon Oct 19 11:14:57 2015
@@ -126,7 +126,7 @@ public class AccessControlManagerDelegat
@Override
public void setPolicy(final String absPath, final AccessControlPolicy policy)
throws RepositoryException {
- delegate.performVoid(new SessionOperation("setPolicy") {
+ delegate.performVoid(new SessionOperation<Void>("setPolicy") {
@Override
public void performVoid() throws RepositoryException {
acManager.setPolicy(absPath, policy);
@@ -137,7 +137,7 @@ public class AccessControlManagerDelegat
@Override
public void removePolicy(final String absPath, final AccessControlPolicy policy)
throws RepositoryException {
- delegate.performVoid(new SessionOperation("removePolicy") {
+ delegate.performVoid(new SessionOperation<Void>("removePolicy") {
@Override
public void performVoid() throws RepositoryException {
acManager.removePolicy(absPath, policy);
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/AuthorizableDelegator.java Mon Oct 19 11:14:57 2015
@@ -143,7 +143,7 @@ abstract class AuthorizableDelegator imp
@Override
public void remove() throws RepositoryException {
- sessionDelegate.performVoid(new SessionOperation("remove") {
+ sessionDelegate.performVoid(new SessionOperation<Void>("remove") {
@Override
public void performVoid() throws RepositoryException {
delegate.remove();
@@ -186,7 +186,7 @@ abstract class AuthorizableDelegator imp
@Override
public void setProperty(final String relPath, final Value value) throws RepositoryException {
- sessionDelegate.performVoid(new SessionOperation("setProperty") {
+ sessionDelegate.performVoid(new SessionOperation<Void>("setProperty") {
@Override
public void performVoid() throws RepositoryException {
delegate.setProperty(relPath, value);
@@ -196,7 +196,7 @@ abstract class AuthorizableDelegator imp
@Override
public void setProperty(final String relPath, final Value[] value) throws RepositoryException {
- sessionDelegate.performVoid(new SessionOperation("setProperty") {
+ sessionDelegate.performVoid(new SessionOperation<Void>("setProperty") {
@Override
public void performVoid() throws RepositoryException {
delegate.setProperty(relPath, value);
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserDelegator.java Mon Oct 19 11:14:57 2015
@@ -108,7 +108,7 @@ final class UserDelegator extends Author
@Override
public void changePassword(final String password) throws RepositoryException {
- sessionDelegate.performVoid(new SessionOperation("changePassword") {
+ sessionDelegate.performVoid(new SessionOperation<Void>("changePassword") {
@Override
public void performVoid() throws RepositoryException {
getDelegate().changePassword(password);
@@ -118,7 +118,7 @@ final class UserDelegator extends Author
@Override
public void changePassword(final String password, final String oldPassword) throws RepositoryException {
- sessionDelegate.performVoid(new SessionOperation("changePassword") {
+ sessionDelegate.performVoid(new SessionOperation<Void>("changePassword") {
@Override
public void performVoid() throws RepositoryException {
getDelegate().changePassword(password, oldPassword);
@@ -128,7 +128,7 @@ final class UserDelegator extends Author
@Override
public void disable(final String reason) throws RepositoryException {
- sessionDelegate.performVoid(new SessionOperation("disable") {
+ sessionDelegate.performVoid(new SessionOperation<Void>("disable") {
@Override
public void performVoid() throws RepositoryException {
getDelegate().disable(reason);
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegator.java Mon Oct 19 11:14:57 2015
@@ -253,7 +253,7 @@ public class UserManagerDelegator implem
@Override
public void autoSave(final boolean enable) throws RepositoryException {
- sessionDelegate.performVoid(new UserManagerOperation(sessionDelegate, "autoSave") {
+ sessionDelegate.performVoid(new UserManagerOperation<Void>(sessionDelegate, "autoSave") {
@Override
public void performVoid() throws RepositoryException {
userManagerDelegate.autoSave(enable);
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java Mon Oct 19 11:14:57 2015
@@ -250,7 +250,7 @@ abstract class ItemImpl<T extends ItemDe
@Override
public void save() throws RepositoryException {
try {
- sessionDelegate.performVoid(new ItemWriteOperation("save") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("save") {
@Override
public void performVoid() throws RepositoryException {
dlg.save();
@@ -285,7 +285,7 @@ abstract class ItemImpl<T extends ItemDe
if (!keepChanges) {
log.warn("Item#refresh invokes Session#refresh!");
}
- sessionDelegate.performVoid(new SessionOperation("refresh") {
+ sessionDelegate.performVoid(new SessionOperation<Void>("refresh") {
@Override
public void performVoid() throws InvalidItemStateException {
sessionDelegate.refresh(keepChanges);
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java Mon Oct 19 11:14:57 2015
@@ -214,7 +214,7 @@ public class NodeImpl<T extends NodeDele
*/
@Override
public void remove() throws RepositoryException {
- sessionDelegate.performVoid(new ItemWriteOperation("remove") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("remove") {
@Override
public void performVoid() throws RepositoryException {
if (dlg.isRoot()) {
@@ -309,7 +309,7 @@ public class NodeImpl<T extends NodeDele
@Override
public void orderBefore(final String srcChildRelPath, final String destChildRelPath) throws RepositoryException {
- sessionDelegate.performVoid(new ItemWriteOperation("orderBefore") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("orderBefore") {
@Override
public void performVoid() throws RepositoryException {
getEffectiveNodeType().checkOrderableChildNodes();
@@ -944,7 +944,7 @@ public class NodeImpl<T extends NodeDele
@Override
public void setPrimaryType(final String nodeTypeName) throws RepositoryException {
- sessionDelegate.performVoid(new ItemWriteOperation("setPrimaryType") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("setPrimaryType") {
@Override
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
@@ -963,7 +963,7 @@ public class NodeImpl<T extends NodeDele
@Override
public void addMixin(String mixinName) throws RepositoryException {
final String oakTypeName = getOakName(checkNotNull(mixinName));
- sessionDelegate.performVoid(new ItemWriteOperation("addMixin") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("addMixin") {
@Override
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
@@ -982,7 +982,7 @@ public class NodeImpl<T extends NodeDele
@Override
public void removeMixin(final String mixinName) throws RepositoryException {
final String oakTypeName = getOakName(checkNotNull(mixinName));
- sessionDelegate.performVoid(new ItemWriteOperation("removeMixin") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("removeMixin") {
@Override
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
@@ -1063,7 +1063,7 @@ public class NodeImpl<T extends NodeDele
@Override
public void update(final String srcWorkspace) throws RepositoryException {
- sessionDelegate.performVoid(new ItemWriteOperation("update") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("update") {
@Override
public void performVoid() throws RepositoryException {
checkValidWorkspace(srcWorkspace);
@@ -1245,7 +1245,7 @@ public class NodeImpl<T extends NodeDele
@Override
public void removeSharedSet() throws RepositoryException {
- sessionDelegate.performVoid(new ItemWriteOperation("removeSharedSet") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("removeSharedSet") {
@Override
public void performVoid() throws RepositoryException {
// TODO: avoid nested calls
@@ -1482,7 +1482,7 @@ public class NodeImpl<T extends NodeDele
return;
}
- sessionDelegate.performVoid(new ItemWriteOperation("rename") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("rename") {
@Override
public void performVoid() throws RepositoryException {
Node parent = getParent();
@@ -1549,7 +1549,7 @@ public class NodeImpl<T extends NodeDele
for (String mixinName : mixinNames) {
oakTypeNames.add(getOakName(checkNotNull(mixinName)));
}
- sessionDelegate.performVoid(new ItemWriteOperation("setMixins") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("setMixins") {
@Override
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java Mon Oct 19 11:14:57 2015
@@ -109,7 +109,7 @@ public class PropertyImpl extends ItemIm
@Override
public void remove() throws RepositoryException {
- sessionDelegate.performVoid(new ItemWriteOperation("remove") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("remove") {
@Override
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
@@ -459,7 +459,7 @@ public class PropertyImpl extends ItemIm
private void internalSetValue(@Nonnull final Value value)
throws RepositoryException {
- sessionDelegate.performVoid(new ItemWriteOperation("internalSetValue") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("internalSetValue") {
@Override
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
@@ -495,7 +495,7 @@ public class PropertyImpl extends ItemIm
LOG.warn("Large multi valued property [{}] detected ({} values).",dlg.getPath(), values.length);
}
- sessionDelegate.performVoid(new ItemWriteOperation("internalSetValue") {
+ sessionDelegate.performVoid(new ItemWriteOperation<Void>("internalSetValue") {
@Override
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java Mon Oct 19 11:14:57 2015
@@ -401,7 +401,7 @@ public class SessionContext implements N
*/
// TODO: should this be in SessionImpl?
private void unlockAllSessionScopedLocks() throws RepositoryException {
- delegate.performVoid(new SessionOperation("unlockAllSessionScopedLocks") {
+ delegate.performVoid(new SessionOperation<Void>("unlockAllSessionScopedLocks") {
@Override
public void performVoid() {
Iterator<String> iterator = sessionScopedLocks.iterator();
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java Mon Oct 19 11:14:57 2015
@@ -125,7 +125,7 @@ public class SessionImpl implements Jack
}
}
- private abstract class WriteOperation extends SessionOperation<Void> {
+ private abstract class WriteOperation<T> extends SessionOperation<T> {
protected WriteOperation(String name) {
super(name, true);
}
@@ -374,7 +374,7 @@ public class SessionImpl implements Jack
checkIndexOnName(checkNotNull(destAbsPath));
final String srcOakPath = getOakPathOrThrowNotFound(checkNotNull(srcAbsPath));
final String destOakPath = getOakPathOrThrowNotFound(destAbsPath);
- sd.performVoid(new WriteOperation("move") {
+ sd.performVoid(new WriteOperation<Void>("move") {
@Override
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
@@ -393,7 +393,7 @@ public class SessionImpl implements Jack
public void removeItem(final String absPath) throws RepositoryException {
checkAlive();
final String oakPath = getOakPathOrThrowNotFound(checkNotNull(absPath));
- sd.performVoid(new WriteOperation("removeItem") {
+ sd.performVoid(new WriteOperation<Void>("removeItem") {
@Override
public void performVoid() throws RepositoryException {
ItemDelegate item = sd.getItem(oakPath);
@@ -413,7 +413,7 @@ public class SessionImpl implements Jack
@Override
public void save() throws RepositoryException {
checkAlive();
- sd.performVoid(new WriteOperation("save") {
+ sd.performVoid(new WriteOperation<Void>("save") {
@Override
public void performVoid() throws RepositoryException {
sd.save(null);
@@ -429,7 +429,7 @@ public class SessionImpl implements Jack
@Override
public void refresh(final boolean keepChanges) throws RepositoryException {
checkAlive();
- sd.performVoid(new WriteOperation("refresh") {
+ sd.performVoid(new WriteOperation<Void>("refresh") {
@Override
public void performVoid() {
sd.refresh(keepChanges);
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java Mon Oct 19 11:14:57 2015
@@ -137,7 +137,7 @@ public class WorkspaceImpl implements Ja
throw new UnsupportedRepositoryOperationException("Not implemented.");
}
- sessionDelegate.performVoid(new SessionOperation("copy", true) {
+ sessionDelegate.performVoid(new SessionOperation<Void>("copy", true) {
@Override
public void checkPreconditions() throws RepositoryException {
super.checkPreconditions();
@@ -161,7 +161,7 @@ public class WorkspaceImpl implements Ja
final String srcOakPath = getOakPathOrThrowNotFound(srcAbsPath);
final String destOakPath = getOakPathOrThrowNotFound(destAbsPath);
- sessionDelegate.performVoid(new SessionOperation("clone", true) {
+ sessionDelegate.performVoid(new SessionOperation<Void>("clone", true) {
@Override
public void checkPreconditions() throws RepositoryException {
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java?rev=1709393&r1=1709392&r2=1709393&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionHistoryImpl.java Mon Oct 19 11:14:57 2015
@@ -158,7 +158,7 @@ public class VersionHistoryImpl extends
final boolean moveLabel)
throws LabelExistsVersionException, VersionException,
RepositoryException {
- sessionDelegate.performVoid(new SessionOperation("addVersionLabel", true) {
+ sessionDelegate.performVoid(new SessionOperation<Void>("addVersionLabel", true) {
@Override
public void performVoid() throws RepositoryException {
String oakLabel = sessionContext.getOakName(label);
@@ -172,7 +172,7 @@ public class VersionHistoryImpl extends
@Override
public void removeVersionLabel(final String label)
throws VersionException, RepositoryException {
- sessionDelegate.performVoid(new SessionOperation("removeVersionLabel", true) {
+ sessionDelegate.performVoid(new SessionOperation<Void>("removeVersionLabel", true) {
@Override
public void performVoid() throws RepositoryException {
String oakLabel = sessionContext.getOakName(label);
@@ -233,7 +233,7 @@ public class VersionHistoryImpl extends
UnsupportedRepositoryOperationException, VersionException,
RepositoryException {
- sessionDelegate.performVoid(new SessionOperation("removeVersion", true) {
+ sessionDelegate.performVoid(new SessionOperation<Void>("removeVersion", true) {
@Override
public void performVoid() throws RepositoryException {
String oakName = sessionContext.getOakName(versionName);