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 2012/04/24 21:57:07 UTC
svn commit: r1329975 - in
/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr:
SessionImpl.java ValueImpl.java query/RowImpl.java
Author: mduerig
Date: Tue Apr 24 19:57:06 2012
New Revision: 1329975
URL: http://svn.apache.org/viewvc?rev=1329975&view=rev
Log:
Minor cleanup:
- make instance fields final when possible
- add missing @Override
- remove redundant throws declarations from implementations
- use @code instead of <code></code> in javadoc
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ValueImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/RowImpl.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java?rev=1329975&r1=1329974&r2=1329975&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java Tue Apr 24 19:57:06 2012
@@ -20,16 +20,15 @@ import org.apache.jackrabbit.api.Jackrab
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.commons.AbstractSession;
-import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentSession;
+import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.namepath.Paths;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.ContentHandler;
-import javax.jcr.AccessDeniedException;
import javax.jcr.Credentials;
import javax.jcr.InvalidItemStateException;
import javax.jcr.Node;
@@ -293,13 +292,13 @@ public class SessionImpl extends Abstrac
//--------------------------------------------------< JackrabbitSession >---
@Override
- public PrincipalManager getPrincipalManager() throws AccessDeniedException, UnsupportedRepositoryOperationException, RepositoryException {
+ public PrincipalManager getPrincipalManager() throws RepositoryException {
// TODO
throw new UnsupportedOperationException("Implementation missing");
}
@Override
- public UserManager getUserManager() throws AccessDeniedException, UnsupportedRepositoryOperationException, RepositoryException {
+ public UserManager getUserManager() throws RepositoryException {
// TODO
throw new UnsupportedOperationException("Implementation missing");
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ValueImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ValueImpl.java?rev=1329975&r1=1329974&r2=1329975&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ValueImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ValueImpl.java Tue Apr 24 19:57:06 2012
@@ -51,10 +51,10 @@ class ValueImpl implements Value {
private final ValueFactoryImpl.DummyNamePathResolver resolver;
/**
- * Constructs a <code>ValueImpl</code> object representing an SPI
+ * Constructs a {@code ValueImpl} object representing an SPI
* <codeQValue</code>.
*
- * @param value the value object this <code>ValueImpl</code> should represent
+ * @param value the value object this {@code ValueImpl} should represent
* @param resolver
*/
public ValueImpl(CoreValue value, ValueFactoryImpl.DummyNamePathResolver resolver) {
@@ -70,6 +70,7 @@ class ValueImpl implements Value {
/**
* @see javax.jcr.Value#getType()
*/
+ @Override
public int getType() {
return value.getType();
}
@@ -77,6 +78,7 @@ class ValueImpl implements Value {
/**
* @see javax.jcr.Value#getBoolean()
*/
+ @Override
public boolean getBoolean() throws RepositoryException {
if (getType() == PropertyType.STRING || getType() == PropertyType.BINARY || getType() == PropertyType.BOOLEAN) {
return value.getBoolean();
@@ -88,6 +90,7 @@ class ValueImpl implements Value {
/**
* @see javax.jcr.Value#getDate()
*/
+ @Override
public Calendar getDate() throws RepositoryException {
Calendar cal;
switch (getType()) {
@@ -109,6 +112,7 @@ class ValueImpl implements Value {
/**
* @see javax.jcr.Value#getDecimal()
*/
+ @Override
public BigDecimal getDecimal() throws RepositoryException {
try {
return value.getDecimal();
@@ -120,6 +124,7 @@ class ValueImpl implements Value {
/**
* @see javax.jcr.Value#getDouble()
*/
+ @Override
public double getDouble() throws RepositoryException {
try {
return value.getDouble();
@@ -131,6 +136,7 @@ class ValueImpl implements Value {
/**
* @see javax.jcr.Value#getLong()
*/
+ @Override
public long getLong() throws RepositoryException {
try {
return value.getLong();
@@ -142,6 +148,7 @@ class ValueImpl implements Value {
/**
* @see javax.jcr.Value#getString()
*/
+ @Override
public String getString() throws RepositoryException {
switch (getType()) {
case PropertyType.NAME :
@@ -166,6 +173,7 @@ class ValueImpl implements Value {
/**
* @see javax.jcr.Value#getStream()
*/
+ @Override
public InputStream getStream() throws IllegalStateException, RepositoryException {
InputStream stream;
switch (getType()) {
@@ -186,6 +194,7 @@ class ValueImpl implements Value {
/**
* @see javax.jcr.Value#getBinary()
*/
+ @Override
public Binary getBinary() throws RepositoryException {
return new BinaryImpl();
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/RowImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/RowImpl.java?rev=1329975&r1=1329974&r2=1329975&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/RowImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/RowImpl.java Tue Apr 24 19:57:06 2012
@@ -33,7 +33,7 @@ import javax.jcr.query.Row;
public class RowImpl implements Row {
private final ResultRow row;
- private ValueFactoryImpl valueFactory;
+ private final ValueFactoryImpl valueFactory;
public RowImpl(ResultRow row, ValueFactoryImpl valueFactory) {
this.row = row;