Author: bcarothers
Date: 2010-01-06 17:13:11 -0500 (Wed, 06 Jan 2010)
New Revision: 1535
Modified:
trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/svn/SvnRepository.java
trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/svn/SvnRepositorySource.java
trunk/extensions/dna-connector-svn/src/test/java/org/jboss/dna/connector/svn/SvnIntegrationTest.java
trunk/extensions/dna-connector-svn/src/test/java/org/jboss/dna/connector/svn/SvnRepositorySourceTest.java
Log:
Corrected Eclipse warnings
Modified:
trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/svn/SvnRepository.java
===================================================================
---
trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/svn/SvnRepository.java 2010-01-06
18:43:36 UTC (rev 1534)
+++
trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/svn/SvnRepository.java 2010-01-06
22:13:11 UTC (rev 1535)
@@ -59,10 +59,10 @@
public class SvnRepository extends WritablePathRepository {
- private static final String DEFAULT_MIME_TYPE =
"application/octet-stream";
- private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+ protected static final String DEFAULT_MIME_TYPE =
"application/octet-stream";
+ protected static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
- private final SvnRepositorySource source;
+ protected final SvnRepositorySource source;
static {
// for DAV (over http and https)
Modified:
trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/svn/SvnRepositorySource.java
===================================================================
---
trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/svn/SvnRepositorySource.java 2010-01-06
18:43:36 UTC (rev 1534)
+++
trunk/extensions/dna-connector-svn/src/main/java/org/jboss/dna/connector/svn/SvnRepositorySource.java 2010-01-06
22:13:11 UTC (rev 1535)
@@ -289,6 +289,11 @@
return false;
}
+ @Override
+ public int hashCode() {
+ return getName().hashCode();
+ }
+
/**
* {@inheritDoc}
*
Modified:
trunk/extensions/dna-connector-svn/src/test/java/org/jboss/dna/connector/svn/SvnIntegrationTest.java
===================================================================
---
trunk/extensions/dna-connector-svn/src/test/java/org/jboss/dna/connector/svn/SvnIntegrationTest.java 2010-01-06
18:43:36 UTC (rev 1534)
+++
trunk/extensions/dna-connector-svn/src/test/java/org/jboss/dna/connector/svn/SvnIntegrationTest.java 2010-01-06
22:13:11 UTC (rev 1535)
@@ -69,6 +69,7 @@
return null;
}
+ @SuppressWarnings( "synthetic-access" )
public ExecutionContext getExecutionContext() {
return context;
}
Modified:
trunk/extensions/dna-connector-svn/src/test/java/org/jboss/dna/connector/svn/SvnRepositorySourceTest.java
===================================================================
---
trunk/extensions/dna-connector-svn/src/test/java/org/jboss/dna/connector/svn/SvnRepositorySourceTest.java 2010-01-06
18:43:36 UTC (rev 1534)
+++
trunk/extensions/dna-connector-svn/src/test/java/org/jboss/dna/connector/svn/SvnRepositorySourceTest.java 2010-01-06
22:13:11 UTC (rev 1535)
@@ -35,14 +35,12 @@
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import javax.naming.Context;
import javax.naming.Name;
import javax.naming.RefAddr;
import javax.naming.Reference;
import javax.naming.spi.ObjectFactory;
-import org.jboss.dna.connector.svn.SvnRepositorySource;
import org.jboss.dna.graph.ExecutionContext;
import org.jboss.dna.graph.Subgraph;
import org.jboss.dna.graph.cache.BasicCachePolicy;
@@ -65,11 +63,9 @@
private SvnRepositorySource source;
private RepositoryConnection connection;
private String validName;
- private String validUuidPropertyName;
private static String url;
private String username;
private String password;
- private UUID validRootNodeUuid;
private final ExecutionContext context = new ExecutionContext();
@BeforeClass
@@ -93,6 +89,7 @@
return null;
}
+ @SuppressWarnings( "synthetic-access" )
public ExecutionContext getExecutionContext() {
return context;
}
@@ -220,23 +217,21 @@
public void shouldCreateJndiReferenceAndRecreatedObjectFromReference() throws
Exception {
BasicCachePolicy cachePolicy = new BasicCachePolicy();
cachePolicy.setTimeToLive(1000L, TimeUnit.MILLISECONDS);
- convertToAndFromJndiReference(validName, validRootNodeUuid, url, username,
password, validUuidPropertyName, 100);
+ convertToAndFromJndiReference(validName, url, username, password, 100);
}
@Test
public void
shouldCreateJndiReferenceAndRecreatedObjectFromReferenceWithNullProperties() throws
Exception {
BasicCachePolicy cachePolicy = new BasicCachePolicy();
cachePolicy.setTimeToLive(1000L, TimeUnit.MILLISECONDS);
- convertToAndFromJndiReference("some source", null, "url1",
null, null, null, 100);
- convertToAndFromJndiReference(null, null, "url2", null, null, null,
100);
+ convertToAndFromJndiReference("some source", "url1", null,
null, 100);
+ convertToAndFromJndiReference(null, "url2", null, null, 100);
}
private void convertToAndFromJndiReference( String sourceName,
- UUID rootNodeUuid,
String url,
String username,
String password,
- String uuidPropertyName,
int retryLimit ) throws Exception {
source.setRetryLimit(retryLimit);
source.setName(sourceName);