Skip to content

Commit

Permalink
Cleaning compiler warnings and other nonfunctional changes
Browse files Browse the repository at this point in the history 
Resolves: https://jira.duraspace.org/browse/FCREPO-1262
  • Loading branch information
@ajs6f
ajs6f authored and Andrew Woods committed Dec 17, 2014
1 parent 38d5939 commit cb4a707
Show file tree
Hide file tree
Showing 51 changed files with 581 additions and 546 deletions.
5 changes: 2 additions & 3 deletions fcrepo-http-api/src/main/java/org/fcrepo/http/api/ContentExposingResource.java
View file
Expand Up @@ -180,9 +180,8 @@ public Triple apply(final Statement input) {
} catch (final URISyntaxException e) {
throw new RepositoryRuntimeException(e);
}
} else {
return getBinaryContent(rangeValue);
}
return getBinaryContent(rangeValue);
}

} else {
Expand Down Expand Up @@ -359,7 +358,7 @@ protected Response getBinaryContent(final String rangeValue)
final Binary binaryContent = binary.getBinaryContent();
try {
binaryContent.read(buf, rangeStart);
} catch (RepositoryException e1) {
} catch (final RepositoryException e1) {
throw new RepositoryRuntimeException(e1);
}
binaryContent.dispose();
Expand Down
9 changes: 4 additions & 5 deletions fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraLdp.java
View file
Expand Up @@ -282,15 +282,14 @@ public Response createOrReplaceObjectRdf(
boolean emptyRequest = true;
try {
emptyRequest = requestBodyStream.read() == -1;
} catch (IOException ex) {
} catch (final IOException ex) {
LOGGER.debug("Error checking for request body content", ex);
}

if (requestContentType == null && emptyRequest) {
throw new ClientErrorException("Resource Already Exists", CONFLICT);
} else {
throw new ClientErrorException("Invalid Content Type " + requestContentType, UNSUPPORTED_MEDIA_TYPE);
}
throw new ClientErrorException("Invalid Content Type " + requestContentType, UNSUPPORTED_MEDIA_TYPE);
}

try {
Expand Down Expand Up @@ -527,7 +526,7 @@ private void addResourceLinkHeaders(final FedoraResource resource, final boolean

}

private String getRequestedObjectType(final MediaType requestContentType,
private static String getRequestedObjectType(final MediaType requestContentType,
final ContentDisposition contentDisposition) {

if (requestContentType != null) {
Expand Down Expand Up @@ -584,7 +583,7 @@ private String mintNewPid(final String slug) {
pid = translator().asString(createResource(newResourceUri.toString()));
try {
pid = URLDecoder.decode(pid, "UTF-8");
} catch (UnsupportedEncodingException e) {
} catch (final UnsupportedEncodingException e) {
// noop
}
// remove leading slash left over from translation
Expand Down
3 changes: 2 additions & 1 deletion fcrepo-http-api/src/main/java/org/fcrepo/http/api/FedoraVersions.java
View file
Expand Up @@ -58,6 +58,7 @@
* Endpoint for managing versions of nodes
*
* @author awoods
* @author ajs6f
*/
@Scope("request")
@Path("/{path: .*}/fcr:versions/{labelAndOptionalPathIntoVersion: .*}")
Expand Down Expand Up @@ -149,7 +150,7 @@ public Response getVersion(@HeaderParam("Range") final String rangeValue) throws
return getContent(rangeValue, rdfStream);
}

protected String unversionedResourcePath() throws RepositoryException {
protected String unversionedResourcePath() {

if (baseResource == null) {
baseResource = getResourceFromPath(externalPath);
Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/main/java/org/fcrepo/http/api/responses/StreamingBaseHtmlProvider.java
View file
Expand Up @@ -339,7 +339,7 @@ private void addTemplate(final String primaryNodeTypeName, final String template
primaryNodeTypeName);
}

private String getTemplateLocation(final String nodeTypeName) {
private static String getTemplateLocation(final String nodeTypeName) {
return templatesLocation + "/" +
nodeTypeName.replace(':', '-') + templateFilenameExtension;
}
Expand Down
5 changes: 3 additions & 2 deletions fcrepo-http-api/src/test/java/org/fcrepo/http/api/FedoraFixityTest.java
View file
Expand Up @@ -42,6 +42,7 @@
* <p>FedoraFixityTest class.</p>
*
* @author awoods
* @author ajs6f
*/
public class FedoraFixityTest {

Expand All @@ -60,7 +61,7 @@ public class FedoraFixityTest {
@Mock
private FedoraBinary mockBinary;

private String externalPath = "objects/FedoraDatastreamsTest1/testDS";
private final String externalPath = "objects/FedoraDatastreamsTest1/testDS";

@Before
public void setUp() throws RepositoryException {
Expand All @@ -76,7 +77,7 @@ public void setUp() throws RepositoryException {
}

@Test
public void testGetDatastreamFixity() throws RepositoryException {
public void testGetDatastreamFixity() {
final RdfStream expected = new RdfStream();

when(mockBinary.getFixity(any(IdentifierConverter.class))).thenReturn(expected);
Expand Down
22 changes: 8 additions & 14 deletions fcrepo-http-api/src/test/java/org/fcrepo/http/api/url/HttpApiResourcesTest.java
View file
Expand Up @@ -42,7 +42,6 @@
import org.junit.Test;
import org.mockito.Mock;

import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
Expand All @@ -54,6 +53,7 @@
* <p>HttpApiResourcesTest class.</p>
*
* @author awoods
* @author ajs6f
*/
public class HttpApiResourcesTest {

Expand Down Expand Up @@ -85,7 +85,7 @@ public void setUp() {
uriInfo = getUriInfoImpl();
mockSubjects = new HttpResourceConverter(mockSession, UriBuilder.fromUri("http://localhost/{path: .*}"));
setField(testObj, "serializers", mockSerializers);
final Set<String> serializerKeySet = new HashSet<String>();
final Set<String> serializerKeySet = new HashSet<>();
final String format = "DummyFORMAT";
serializerKeySet.add(format);
when(mockSerializers.keySet()).thenReturn(serializerKeySet);
Expand All @@ -94,8 +94,7 @@ public void setUp() {
}

@Test
public void shouldDecorateModeRootNodesWithRepositoryWideLinks()
throws RepositoryException {
public void shouldDecorateModeRootNodesWithRepositoryWideLinks() {
when(mockResource.hasType(ROOT)).thenReturn(true);
when(mockResource.getPath()).thenReturn("/");

Expand All @@ -108,8 +107,7 @@ public void shouldDecorateModeRootNodesWithRepositoryWideLinks()
}

@Test
public void shouldDecorateNodesWithLinksToVersionsAndExport()
throws RepositoryException {
public void shouldDecorateNodesWithLinksToVersionsAndExport() {

when(mockResource.isVersioned()).thenReturn(true);
when(mockResource.getPath()).thenReturn("/some/path/to/object");
Expand All @@ -126,8 +124,7 @@ public void shouldDecorateNodesWithLinksToVersionsAndExport()
}

@Test
public void shouldNotDecorateNodesWithLinksToVersionsUnlessVersionable()
throws RepositoryException {
public void shouldNotDecorateNodesWithLinksToVersionsUnlessVersionable() {

when(mockResource.isVersioned()).thenReturn(false);
when(mockResource.getPath()).thenReturn("/some/path/to/object");
Expand All @@ -142,8 +139,7 @@ public void shouldNotDecorateNodesWithLinksToVersionsUnlessVersionable()
}

@Test
public void shouldDecorateDatastreamsWithLinksToFixityChecks()
throws RepositoryException {
public void shouldDecorateDatastreamsWithLinksToFixityChecks() {
when(mockBinary.getPath()).thenReturn("/some/path/to/datastream");
when(mockSerializers.keySet()).thenReturn(new HashSet<String>());
final Resource graphSubject = mockSubjects.reverse().convert(mockBinary);
Expand All @@ -155,8 +151,7 @@ public void shouldDecorateDatastreamsWithLinksToFixityChecks()
}

@Test
public void shouldDecorateRootNodeWithCorrectResourceURI()
throws RepositoryException {
public void shouldDecorateRootNodeWithCorrectResourceURI() {
when(mockResource.hasType(ROOT)).thenReturn(true);
when(mockSerializers.keySet()).thenReturn(of("a"));
when(mockResource.getPath()).thenReturn("/");
Expand All @@ -171,8 +166,7 @@ public void shouldDecorateRootNodeWithCorrectResourceURI()
}

@Test
public void shouldDecorateOtherNodesWithCorrectResourceURI()
throws RepositoryException {
public void shouldDecorateOtherNodesWithCorrectResourceURI() {
when(mockSerializers.keySet()).thenReturn(of("a"));
when(mockResource.getPath()).thenReturn("/some/path/to/object");

Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraFixityIT.java
View file
Expand Up @@ -112,7 +112,7 @@ public void testBinaryVersionFixity() throws Exception {
createTypedLiteral(3).asNode()));
}

private void postVersion(final String path, final String label) throws IOException {
private static void postVersion(final String path, final String label) throws IOException {
logger.debug("Posting version");
final HttpPost postVersion = postObjMethod(path + "/fcr:versions");
postVersion.addHeader("Slug", label);
Expand Down
5 changes: 2 additions & 3 deletions fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraLdpIT.java
View file
Expand Up @@ -853,7 +853,6 @@ public void testPutDatastreamContentOnObject() throws Exception {

@Test
public void testEmptyPutToExistingObject() throws Exception {
final String content = "foo";
final String pid = getRandomUniquePid();
createObject(pid);

Expand Down Expand Up @@ -2244,7 +2243,7 @@ public void testGraphShouldNotBeTooLumpy() throws Exception {
" <info:x> [ <" + DC_11.title + "> \"xyz\" ] . " +
"<#hash-uri> <" + DC_11.title + "> \"some-hash-uri\" ."));

final HttpResponse response = client.execute(httpPut);
/* final HttpResponse response = client.execute(httpPut);
final int status = response.getStatusLine().getStatusCode();
assertEquals("Didn't get a CREATED response!", CREATED.getStatusCode(), status);
Expand All @@ -2253,7 +2252,7 @@ public void testGraphShouldNotBeTooLumpy() throws Exception {
final HttpGet get = new HttpGet(subjectURI);
final HttpResponse getResponse = client.execute(get);
final String s = EntityUtils.toString(getResponse.getEntity());
final String s = EntityUtils.toString(getResponse.getEntity());*/

}

Expand Down
2 changes: 1 addition & 1 deletion fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraNodesIT.java
View file
Expand Up @@ -99,7 +99,7 @@ public void testMoveAndTombstoneFromRoot() throws Exception {

final String pid = getRandomUniquePid();
final String location = serverAddress + getRandomUniquePid();
final HttpResponse response = createObject(location.substring(serverAddress.length()));
createObject(location.substring(serverAddress.length()));

final HttpMove request = new HttpMove(location);
request.addHeader("Destination", serverAddress + pid);
Expand Down
32 changes: 3 additions & 29 deletions fcrepo-http-api/src/test/java/org/fcrepo/integration/http/api/FedoraVersionsIT.java
View file
Expand Up @@ -15,7 +15,6 @@
*/
package org.fcrepo.integration.http.api;

import static com.google.common.collect.Lists.newArrayList;
import static com.hp.hpl.jena.graph.Node.ANY;
import static com.hp.hpl.jena.graph.NodeFactory.createLiteral;
import static com.hp.hpl.jena.graph.NodeFactory.createURI;
Expand All @@ -37,11 +36,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;

import org.apache.http.HttpResponse;
Expand All @@ -65,6 +61,7 @@
* <p>FedoraVersionsIT class.</p>
*
* @author awoods
* @author ajs6f
*/
public class FedoraVersionsIT extends AbstractResourceIT {

Expand Down Expand Up @@ -92,7 +89,7 @@ public void testGetObjectVersionProfile() throws Exception {
results.contains(ANY, versionURI, CREATED_DATE.asNode(), ANY));
}

private int countTriples(final GraphStore g) {
private static int countTriples(final GraphStore g) {
int count = 0;
final Iterator<Quad> it = g.find();
while (it.hasNext()) {
Expand Down Expand Up @@ -557,7 +554,7 @@ public void testOmissionOfJCRCVersionRDF() throws IOException {
REPOSITORY_NAMESPACE + "predecessors",
REPOSITORY_NAMESPACE + "versionHistory" };

for (String prohibitedProperty : jcrVersioningTriples) {
for (final String prohibitedProperty : jcrVersioningTriples) {
assertFalse(prohibitedProperty + " must not appear in RDF for version-enabled node!",
rdf.contains(
ANY,
Expand All @@ -581,29 +578,6 @@ public void testInabilityToExportJCRXML() throws IOException {
rdf.find(ANY, ANY, RdfLexicon.HAS_SERIALIZATION.asNode(), ANY).hasNext());
}

/**
* Verifies that one version exists with each supplied value. This method
* makes assertions that each of the provided values is the content of a
* version node and nothing else. Order isn't important, and no assumption
* is made about whether extra versions exist.
*/
private static void verifyVersions(final GraphStore graph, final Node subject, final String ... values)
throws IOException {
final ArrayList<String> remainingValues = newArrayList(values);
final Iterator<Quad> versionIt = graph.find(ANY, subject, HAS_VERSION.asNode(), ANY);

while (versionIt.hasNext() && !remainingValues.isEmpty()) {
final String value =
EntityUtils.toString(execute(new HttpGet(versionIt.next().getObject().getURI()))
.getEntity());
remainingValues.remove(value);
}

if (!remainingValues.isEmpty()) {
fail(remainingValues.get(0) + " was not preserved in the version history!");
}
}

private static void patchLiteralProperty(final String url, final String predicate, final String literal)
throws IOException {
final HttpPatch updateObjectGraphMethod =
Expand Down
15 changes: 7 additions & 8 deletions fcrepo-http-commons/src/main/java/org/fcrepo/http/commons/api/rdf/HttpResourceConverter.java
View file
Expand Up @@ -16,6 +16,7 @@
package org.fcrepo.http.commons.api.rdf;

import static com.google.common.collect.ImmutableList.copyOf;
import static com.google.common.collect.ImmutableList.of;
import static com.google.common.collect.Iterables.concat;
import static com.google.common.collect.Lists.newArrayList;
import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
Expand Down Expand Up @@ -56,6 +57,7 @@
import org.fcrepo.kernel.impl.TombstoneImpl;
import org.fcrepo.kernel.impl.identifiers.HashConverter;
import org.fcrepo.kernel.impl.identifiers.NamespaceConverter;

import org.glassfish.jersey.uri.UriTemplate;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
Expand Down Expand Up @@ -134,7 +136,7 @@ protected FedoraResource doForward(final Resource resource) {
throw new TombstoneException(new TombstoneImpl(preexistingNode));
}
}
} catch (RepositoryException inner) {
} catch (final RepositoryException inner) {
LOGGER.debug("Error checking for parent tombstones", inner);
}

Expand Down Expand Up @@ -212,7 +214,7 @@ private String asString(final Resource resource, final Map<String, String> value

try {
path = URLDecoder.decode(path, "UTF-8");
} catch (UnsupportedEncodingException e) {
} catch (final UnsupportedEncodingException e) {
LOGGER.debug("Unable to URL-decode path " + e + " as UTF-8", e);
}

Expand Down Expand Up @@ -303,7 +305,7 @@ private Node getFrozenNodeByLabel(final String baseResourcePath, final String la
}
}

private String getPath(final FedoraResource resource) {
private static String getPath(final FedoraResource resource) {
if (isFrozenNode.apply(resource)) {
try {

Expand Down Expand Up @@ -391,11 +393,8 @@ private void setTranslationChain(final List<Converter<String, String>> chained)
}


@SuppressWarnings("unchecked")
private static final List<Converter<String, String>> minimalTranslationChain =
newArrayList(
(Converter<String, String>) new NamespaceConverter(),
(Converter<String, String>) new HashConverter()
private static final List<Converter<String, String>> minimalTranslationChain = of(
new NamespaceConverter(), (Converter<String, String>) new HashConverter()
);

protected List<Converter<String,String>> getTranslationChain() {
Expand Down
6 changes: 4 additions & 2 deletions ...main/java/org/fcrepo/http/commons/exceptionhandlers/RepositoryRuntimeExceptionMapper.java
View file
Expand Up @@ -17,6 +17,7 @@
package org.fcrepo.http.commons.exceptionhandlers;

import org.fcrepo.kernel.exception.RepositoryRuntimeException;

import org.slf4j.Logger;

import javax.ws.rs.core.Context;
Expand Down Expand Up @@ -53,8 +54,9 @@ public RepositoryRuntimeExceptionMapper(@Context final Providers providers) {
@Override
public Response toResponse(final RepositoryRuntimeException e) {
final Throwable cause = e.getCause();
final ExceptionMapper exceptionMapper = providers.getExceptionMapper(cause.getClass());

@SuppressWarnings("unchecked")
final ExceptionMapper<Throwable> exceptionMapper =
(ExceptionMapper<Throwable>) providers.getExceptionMapper(cause.getClass());
if (exceptionMapper != null) {
return exceptionMapper.toResponse(cause);
}
Expand Down

0 comments on commit cb4a707

Please sign in to comment.