Removing ununused imports and variables, declaring some test set up m…

…ethods static
fcrepo · Feb 24, 2014 · 7dcbf0e · 7dcbf0e
1 parent d2dbb68
commit 7dcbf0e
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 42 deletions.
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/FedoraResourceImplIT.java b/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/FedoraResourceImplIT.java
@@ -40,14 +40,10 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.inject.Inject;
-import javax.jcr.NamespaceRegistry;
-import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeDefinition;
-import javax.jcr.nodetype.NodeTypeIterator;
 import javax.jcr.nodetype.NodeTypeTemplate;
 import javax.jcr.PropertyType;
 import javax.jcr.Repository;
@@ -76,7 +72,6 @@
 import com.hp.hpl.jena.rdf.model.Resource;
 import com.hp.hpl.jena.rdf.model.Statement;
 import com.hp.hpl.jena.sparql.core.DatasetGraph;
-import com.hp.hpl.jena.sparql.core.Quad;
 import com.hp.hpl.jena.sparql.util.Symbol;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator;
 import com.hp.hpl.jena.vocabulary.RDF;
@@ -232,44 +227,42 @@ public void testObjectGraphWithCustomProperty() throws RepositoryException {
 
     }
 
-    @Test 
+    @Test
     public void testRdfTypeInheritance() throws RepositoryException {
         logger.info("in testRdfTypeInheritance...");
-        NodeTypeManager mgr = session.getWorkspace().getNodeTypeManager();
-        NamespaceRegistry nsReg = session.getWorkspace().getNamespaceRegistry();
-
+        final NodeTypeManager mgr = session.getWorkspace().getNodeTypeManager();
         //create supertype mixin
-        NodeTypeTemplate type = mgr.createNodeTypeTemplate();
+        final NodeTypeTemplate type = mgr.createNodeTypeTemplate();
         type.setName("test:aSupertype");
         type.setMixin(true);
-        NodeTypeDefinition[] nodeTypes = new NodeTypeDefinition[]{type};
+        final NodeTypeDefinition[] nodeTypes = new NodeTypeDefinition[]{type};
         mgr.registerNodeTypes(nodeTypes, true);
-        
+
         //create a type inheriting above supertype
-        NodeTypeTemplate type2 = mgr.createNodeTypeTemplate();
+        final NodeTypeTemplate type2 = mgr.createNodeTypeTemplate();
         type2.setName("test:testInher");
         type2.setMixin(true);
         type2.setDeclaredSuperTypeNames(new String[]{"test:aSupertype"});
-        NodeTypeDefinition[] nodeTypes2 = new NodeTypeDefinition[]{type2};
+        final NodeTypeDefinition[] nodeTypes2 = new NodeTypeDefinition[]{type2};
         mgr.registerNodeTypes(nodeTypes2, true);
-        
+
         //create object with inheriting type
         FedoraResource object = objectService.createObject(session, "/testNTTnheritanceObject");
         final javax.jcr.Node node = object.getNode();
         node.addMixin("test:testInher");
-        
+
         session.save();
         session.logout();
         session = repo.login();
-        
+
         object = objectService.createObject(session, "/testNTTnheritanceObject");
 
         //test that supertype has been inherited as rdf:type
         final Node s = createGraphSubjectNode("/testNTTnheritanceObject");
         final Node p = createProperty(RDF_NAMESPACE + "type").asNode();
         final Node o = createProperty("info:fedora/test/aSupertype").asNode();
         assertTrue("supertype test:aSupertype not found inherited in test:testInher!",object.getPropertiesDataset(subjects).asDatasetGraph()
-                       .contains(ANY, s, p, o));               
+                       .contains(ANY, s, p, o));
     }
 
     @Test

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/HierarchyRdfContextTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/HierarchyRdfContextTest.java
@@ -207,7 +207,7 @@ public void setUp() throws RepositoryException {
         when(mockWorkspace.getNamespaceRegistry()).thenReturn(mockNamespaceRegistry);
         when(mockNamespaceRegistry.getURI("not")).thenReturn(JCR_NAMESPACE);
         when(mockParentNode.getSession()).thenReturn(mockSession);
-        
+
     }
 
     private void nodeIsContainer() {
@@ -265,7 +265,7 @@ private void buildChildNodes() throws RepositoryException {
                 createResource(RESOURCE_PREFIX + "/4"));
         when(mockGraphSubjects.getGraphSubject(mockChildNode5)).thenReturn(
                 createResource(RESOURCE_PREFIX + "/5"));
-        
+
         when(mockChildNode.getSession()).thenReturn(mockSession);
         when(mockChildNode2.getSession()).thenReturn(mockSession);
         when(mockChildNode3.getSession()).thenReturn(mockSession);
@@ -302,7 +302,7 @@ private Model getResults() throws RepositoryException {
                 mockLowLevelStorageService).asModel();
     }
 
-    private void
+    private static void
             logRdf(final String message, final Model model) throws IOException {
         LOGGER.debug(message);
         try (Writer w = new StringWriter()) {
@@ -342,10 +342,10 @@ private Model getResults() throws RepositoryException {
 
     @Mock
     private Session mockSession;
-    
+
     @Mock
     private Repository mockRepository;
-    
+
     @Mock
     private Workspace mockWorkspace;
 

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/NodeRdfContextTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/NodeRdfContextTest.java
@@ -54,13 +54,13 @@ public class NodeRdfContextTest {
 
     @Mock
     private NodeType mockPrimaryNodeType;
-    
+
     @Mock
     private NodeType mockMixinNodeType;
-    
+
     @Mock
     private NodeType mockPrimarySuperNodeType;
-    
+
     @Mock
     private NodeType mockMixinSuperNodeType;
 
@@ -99,24 +99,24 @@ public void setUp() throws RepositoryException {
         when(mockNode.getPrimaryNodeType()).thenReturn(mockPrimaryNodeType);
         when(mockPrimaryNodeType.getName()).thenReturn(
                 mockNodeTypePrefix + ":" + mockPrimaryNodeTypeName);
-        
+
         when(mockNode.getName()).thenReturn(mockNodeName);
-        
+
         when(mockNode.getMixinNodeTypes()).thenReturn(
                 new NodeType[] {mockMixinNodeType});
         when(mockMixinNodeType.getName()).thenReturn(
-                mockNodeTypePrefix + ":" + mockMixinNodeTypeName);  
-        
+                mockNodeTypePrefix + ":" + mockMixinNodeTypeName);
+
         when(mockPrimaryNodeType.getSupertypes()).thenReturn(
                 new NodeType[] {mockPrimarySuperNodeType});
         when(mockPrimarySuperNodeType.getName()).thenReturn(
                 mockNodeTypePrefix + ":" + mockPrimarySuperNodeTypeName);
-        
+
         when(mockMixinNodeType.getSupertypes()).thenReturn(
                 new NodeType[] {mockMixinSuperNodeType});
         when(mockMixinSuperNodeType.getName()).thenReturn(
                 mockNodeTypePrefix + ":" + mockMixinSuperNodeTypeName);
-       
+
         when(mockNode.getSession()).thenReturn(mockSession);
         when(mockSession.getRepository()).thenReturn(mockRepository);
         when(mockSession.getWorkspace()).thenReturn(mockWorkspace);
@@ -128,7 +128,7 @@ public void setUp() throws RepositoryException {
 
     @Test
     public void testRdfTypesForNodetypes() throws RepositoryException,
-        IOException {    
+        IOException {
         final Model actual =
             new NodeRdfContext(mockNode, mockGraphSubjects, mockLowLevelStorageService).asModel();
         final Resource expectedRdfTypePrimary =
@@ -159,7 +159,7 @@ public void testBadRepository() throws RepositoryException {
 
     }
 
-    private void logRdf(final String message, final Model model) throws IOException {
+    private static void logRdf(final String message, final Model model) throws IOException {
         LOGGER.debug(message);
         try (Writer w = new StringWriter()) {
             model.write(w);

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/NodeTypeRdfContextTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/NodeTypeRdfContextTest.java
@@ -241,7 +241,7 @@ private void initNodeTypeMocks(final NodeType mockNodeType, final String mockNam
 
     }
 
-    private void initNamespacedMocks(final Namespaced namedspacedObject, final String mockNamespaceUri, final String mockNodeTypeName) throws RepositoryException {
+    private static void initNamespacedMocks(final Namespaced namedspacedObject, final String mockNamespaceUri, final String mockNodeTypeName) throws RepositoryException {
         when(namedspacedObject.getNamespaceURI()).thenReturn(mockNamespaceUri);
         when(namedspacedObject.getLocalName()).thenReturn(mockNodeTypeName);
     }

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/PropertiesRdfContextTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/PropertiesRdfContextTest.java
@@ -22,7 +22,6 @@
 import static org.fcrepo.kernel.RdfLexicon.IS_CONTENT_OF;
 import static org.fcrepo.kernel.RdfLexicon.JCR_NAMESPACE;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
@@ -100,7 +99,7 @@ public void setUp() throws RepositoryException {
         when(mockNodeType.getSupertypes()).thenReturn(new NodeType[] {mockNodeType});
         when(mockNodeType.getName()).thenReturn(
                  mockNodeTypePrefix + ":" + mockNodeName);
-        
+
         //when(mockNodeType.getName()).thenReturn("not:root");
     }
 
@@ -112,7 +111,7 @@ public void setUp() throws RepositoryException {
 
     private static final Resource mockSubject =
         createResource("http://example.com/node");
-    
+
     private static final String mockNodeTypePrefix = "jcr";
 
     private static final String mockNodeName = "mockNode";
@@ -134,7 +133,7 @@ public void setUp() throws RepositoryException {
 
     @Mock
     private Repository mockRepository;
-    
+
     @Mock
     private Workspace mockWorkspace;
 
@@ -144,7 +143,7 @@ public void setUp() throws RepositoryException {
     @Mock
     private LowLevelCacheEntry mockLowLevelCacheEntry;
 
-    private void
+    private static void
             logRdf(final String message, final Model model) throws IOException {
         LOGGER.debug(message);
         try (Writer w = new StringWriter()) {

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/mappings/PropertyToTripleTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/mappings/PropertyToTripleTest.java
@@ -366,7 +366,7 @@ public void setUp() throws ValueFormatException, RepositoryException {
         when(mockNode.getNode(TEST_NODE_PATH)).thenReturn(mockNode);
     }
 
-    private <T> Iterator<T> twoValueIterator(final T t, final T t2) {
+    private static <T> Iterator<T> twoValueIterator(final T t, final T t2) {
         return ImmutableList.of(t, t2).iterator();
     }
 

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/TransactionServiceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/services/TransactionServiceTest.java
@@ -24,7 +24,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;