More style fixes for Sonar

fcrepo · Apr 20, 2013 · 00b050d · 00b050d
1 parent 96b8ee5
commit 00b050d
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 38 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraDatastreams.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraDatastreams.java
@@ -70,10 +70,10 @@ public class FedoraDatastreams extends AbstractResource {
     private final Logger logger = getLogger(FedoraDatastreams.class);
 
     @Autowired
-    DatastreamService datastreamService;
+    private DatastreamService datastreamService;
 
     @Autowired
-    LowLevelStorageService llStoreService;
+    private LowLevelStorageService llStoreService;
 
     /**
      * Returns a list of datastreams for the object
@@ -436,9 +436,29 @@ public DatastreamElement apply(Datastream ds) {
                         return new DatastreamElement(ds.getDsId(),
                                 ds.getDsId(), ds.getMimeType());
                     } catch (RepositoryException e) {
-                        throw new RuntimeException(e);
+                        throw new IllegalStateException(e);
                     }
                 }
             };
 
+
+    public DatastreamService getDatastreamService() {
+        return datastreamService;
+    }
+
+
+    public void setDatastreamService(DatastreamService datastreamService) {
+        this.datastreamService = datastreamService;
+    }
+
+
+    public LowLevelStorageService getLlStoreService() {
+        return llStoreService;
+    }
+
+
+    public void setLlStoreService(LowLevelStorageService llStoreService) {
+        this.llStoreService = llStoreService;
+    }
+
 }
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFieldSearch.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraFieldSearch.java
@@ -13,10 +13,10 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.ValueFactory;
-import javax.jcr.query.InvalidQueryException;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 import javax.jcr.query.QueryResult;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -48,16 +48,17 @@ public class FedoraFieldSearch extends AbstractResource implements
 
     @GET
     @Produces(TEXT_HTML)
-    public String searchForm() throws LoginException, RepositoryException {
+    public String searchForm() throws RepositoryException {
         return new VelocityViewer().getFieldSearch(null);
     }
 
     @POST
     @Produces(TEXT_HTML)
     public String searchSubmit(@FormParam("terms")
-    final String terms, @FormParam("offSet")
+    final String terms, final @FormParam("offSet")
+    @DefaultValue("0")
     String offSet, @FormParam("maxResults")
-    final String maxResults) throws LoginException, RepositoryException {
+    final String maxResults) throws RepositoryException {
 
         final Session session = getAuthenticatedSession();
         final QueryManager queryManager =
@@ -70,10 +71,6 @@ public String searchSubmit(@FormParam("terms")
         final Query query = getQuery(queryManager, valueFactory, terms);
         logger.debug("statement is " + query.getStatement());
 
-        if (offSet == null) {
-            offSet = "0";
-        }
-
         final FieldSearchResult fsr =
                 search(query, parseInt(offSet), parseInt(maxResults));
         fsr.setSearchTerms(terms);
@@ -85,7 +82,7 @@ public String searchSubmit(@FormParam("terms")
 
     Query getQuery(final QueryManager queryManager,
             final ValueFactory valueFactory, final String terms)
-            throws InvalidQueryException, RepositoryException {
+            throws RepositoryException {
         final Query query = queryManager.createQuery(QUERY_STRING, JCR_SQL2);
         query.bindValue("sterm", valueFactory.createValue("%" + terms + "%"));
         logger.debug("statement is " + query.getStatement());
@@ -102,7 +99,7 @@ Query getQuery(final QueryManager queryManager,
      * @throws RepositoryException
      */
     public FieldSearchResult search(final Query query, final int offSet,
-            final int maxResults) throws LoginException, RepositoryException {
+            final int maxResults) throws RepositoryException {
 
         final ImmutableList.Builder<ObjectFields> fieldObjects = builder();
 

diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraIdentifiers.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraIdentifiers.java
@@ -11,7 +11,6 @@
 
 import java.io.IOException;
 
-import javax.jcr.RepositoryException;
 import javax.ws.rs.DefaultValue;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;

diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraObjects.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraObjects.java
@@ -40,7 +40,7 @@ public class FedoraObjects extends AbstractResource {
     private static final Logger logger = getLogger(FedoraObjects.class);
 
     @Autowired
-    ObjectService objectService;
+    private ObjectService objectService;
 
     /**
      * 
@@ -168,4 +168,14 @@ public Response deleteObject(@PathParam("pid")
         return noContent().build();
     }
 
+
+    public ObjectService getObjectService() {
+        return objectService;
+    }
+
+
+    public void setObjectService(ObjectService objectService) {
+        this.objectService = objectService;
+    }
+
 }
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraRepository.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraRepository.java
@@ -13,7 +13,6 @@
 
 import java.io.IOException;
 
-import javax.jcr.LoginException;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -24,8 +23,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
 import org.fcrepo.AbstractResource;
 import org.fcrepo.jaxb.responses.access.DescribeRepository;
 import org.fcrepo.provider.VelocityViewer;
@@ -43,15 +40,14 @@ public class FedoraRepository extends AbstractResource {
     private static final Logger logger = getLogger(FedoraRepository.class);
 
     @Autowired
-    Repository repo;
+    private Repository repo;
 
     @Autowired
-    ObjectService objectService;
+    private ObjectService objectService;
 
     @GET
     @Path("modeshape")
-    public Response describeModeshape() throws JsonGenerationException,
-            JsonMappingException, IOException, RepositoryException {
+    public Response describeModeshape() throws IOException, RepositoryException {
         final Session session = getAuthenticatedSession();
         logger.debug("Repository name: " + repo.getDescriptor(REP_NAME_DESC));
         final Builder<String, Object> repoproperties = builder();
@@ -80,8 +76,7 @@ public Response describeModeshape() throws JsonGenerationException,
 
     @GET
     @Produces({TEXT_XML, APPLICATION_XML, APPLICATION_JSON})
-    public DescribeRepository describe() throws LoginException,
-            RepositoryException {
+    public DescribeRepository describe() throws RepositoryException {
 
         final Session session = getAuthenticatedSession();
         final DescribeRepository description = new DescribeRepository();
@@ -98,7 +93,7 @@ public DescribeRepository describe() throws LoginException,
 
     @GET
     @Produces(TEXT_HTML)
-    public String describeHtml() throws LoginException, RepositoryException {
+    public String describeHtml() throws RepositoryException {
 
         final VelocityViewer view = new VelocityViewer();
         return view.getRepoInfo(describe());
@@ -112,4 +107,9 @@ public void setRepository(final Repository repo) {
         this.repo = repo;
     }
 
+
+    public void setObjectService(ObjectService objectService) {
+        this.objectService = objectService;
+    }
+
 }
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraSitemap.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraSitemap.java
@@ -37,7 +37,7 @@ public class FedoraSitemap extends AbstractResource {
     public static final long entriesPerPage = 50000;
 
     @Autowired
-    ObjectService objectService;
+    private ObjectService objectService;
 
     @GET
     @Produces(TEXT_XML)
@@ -119,4 +119,9 @@ private SitemapEntry getSitemapEntry(final Row r)
                 .getDate());
     }
 
+
+    public void setObjectService(ObjectService objectService) {
+        this.objectService = objectService;
+    }
+
 }
diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraDatastreamsTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraDatastreamsTest.java
@@ -79,10 +79,10 @@ public void setUp() throws LoginException, RepositoryException {
         mockLow = mock(LowLevelStorageService.class);
 
         testObj = new FedoraDatastreams();
-        testObj.datastreamService = mockDatastreams;
+        testObj.setDatastreamService(mockDatastreams);
         testObj.setSecurityContext(mockSecurityContext);
         testObj.setHttpServletRequest(mockServletRequest);
-        testObj.llStoreService = mockLow;
+        testObj.setLlStoreService(mockLow);
         //mockRepo = mock(Repository.class);
         final SessionFactory mockSessions = mock(SessionFactory.class);
         testObj.setSessionFactory(mockSessions);

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraObjectsTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraObjectsTest.java
@@ -58,7 +58,7 @@ public void setUp() throws LoginException, RepositoryException {
         mockPrincipal = mock(Principal.class);
         mockObjects = mock(ObjectService.class);
         testObj = new FedoraObjects();
-        testObj.objectService = mockObjects;
+        testObj.setObjectService(mockObjects);
         mockRepo = mock(Repository.class);
         mockSession = mock(Session.class);
         when(mockSession.getUserID()).thenReturn(mockUser);

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraRepositoryTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraRepositoryTest.java
@@ -42,7 +42,7 @@ public void setUp() throws LoginException, RepositoryException {
         testFedoraRepo = new FedoraRepository();
         testFedoraRepo.setUriInfo(TestHelpers.getUriInfoImpl());
         mockObjects = mock(ObjectService.class);
-        testFedoraRepo.objectService = mockObjects;
+        testFedoraRepo.setObjectService(mockObjects);
         mockRepo = mock(Repository.class);
         mockSession = mock(Session.class);
         final SessionFactory mockSessions = mock(SessionFactory.class);

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraSitemapTest.java b/fcrepo-http-api/src/test/java/org/fcrepo/api/FedoraSitemapTest.java
@@ -32,7 +32,7 @@ public class FedoraSitemapTest {
     public void setUp() throws LoginException, RepositoryException {
         mockObjects = mock(ObjectService.class);
         testObj = new FedoraSitemap();
-        testObj.objectService = mockObjects;
+        testObj.setObjectService(mockObjects);
         mockSession = mock(Session.class);
         final SessionFactory mockSessions = mock(SessionFactory.class);
         when(mockSessions.getSession()).thenReturn(mockSession);

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/utils/FixityResult.java b/fcrepo-kernel/src/main/java/org/fcrepo/utils/FixityResult.java
@@ -1,15 +1,15 @@
 
 package org.fcrepo.utils;
 
+import static java.util.Objects.hash;
+
 import java.net.URI;
 import java.util.EnumSet;
 
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.google.common.primitives.Longs;
-
 @XmlRootElement(name = "DatastreamFixityStatus")
 public class FixityResult {
 
@@ -79,11 +79,7 @@ public boolean equals(final Object obj) {
 
     @Override
     public int hashCode() {
-        int hash = 1;
-        hash = hash * 31 + Longs.hashCode(computedSize);
-        hash = hash * 31 + computedChecksum.hashCode();
-
-        return hash;
+        return hash(computedSize, computedChecksum);
     }
 
     @Override