Repository: olingo-odata4 Updated Branches: refs/heads/master 422d4a6ea -> e1997e8e0
[OLINGO-575] Remove java warnings part 4 Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/e1997e8e Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/e1997e8e Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/e1997e8e Branch: refs/heads/master Commit: e1997e8e076ca6d695fcc6f47246a673aa701325 Parents: 422d4a6 Author: Christian Amend <[email protected]> Authored: Mon Mar 9 16:02:25 2015 +0100 Committer: Christian Amend <[email protected]> Committed: Mon Mar 9 16:02:25 2015 +0100 ---------------------------------------------------------------------- .../org/apache/olingo/fit/AbstractServices.java | 9 +++++---- .../java/org/apache/olingo/fit/V4Services.java | 13 +++++++------ .../core/deserializer/batch/BatchParserCommon.java | 8 ++++---- .../core/batchhandler/MockedBatchHandlerTest.java | 17 +++++++++-------- 4 files changed, 25 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e1997e8e/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java index ddb1268..63a53af 100644 --- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java +++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java @@ -1185,7 +1185,7 @@ public abstract class AbstractServices { final String format, String expand, final String select) { - + try { final Map.Entry<Accept, AbstractUtilities> utils = getUtilities(accept, format); @@ -1238,9 +1238,10 @@ public abstract class AbstractServices { entry.getNavigationLinks().removeAll(linkToBeRemoved); } - if (StringUtils.isNotBlank(expand)) { - expand = StringUtils.substringBefore(expand, "("); - final List<String> links = Arrays.asList(expand.split(",")); + String tempExpand = expand; + if (StringUtils.isNotBlank(tempExpand)) { + tempExpand = StringUtils.substringBefore(tempExpand, "("); + final List<String> links = Arrays.asList(tempExpand.split(",")); final Map<Link, Link> replace = new HashMap<Link, Link>(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e1997e8e/fit/src/main/java/org/apache/olingo/fit/V4Services.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Services.java b/fit/src/main/java/org/apache/olingo/fit/V4Services.java index d4a3e4a..0b4f6bd 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Services.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4Services.java @@ -1082,8 +1082,9 @@ public class V4Services extends AbstractServices { @PathParam("containedEntitySetName") String containedEntitySetName, @QueryParam("$format") @DefaultValue(StringUtils.EMPTY) final String format) { - if ("MyGiftCard".equals(containedEntitySetName)) { - return getContainedEntity(accept, entityId, containedEntitySetName, null, format); + String tempContainedESName = containedEntitySetName; + if ("MyGiftCard".equals(tempContainedESName)) { + return getContainedEntity(accept, entityId, tempContainedESName, null, format); } try { @@ -1098,14 +1099,14 @@ public class V4Services extends AbstractServices { } String derivedType = null; - if (containedEntitySetName.contains("/")) { - final String[] parts = containedEntitySetName.split("/"); - containedEntitySetName = parts[0]; + if (tempContainedESName.contains("/")) { + final String[] parts = tempContainedESName.split("/"); + tempContainedESName = parts[0]; derivedType = parts[1]; } final InputStream feed = FSManager.instance(version). - readFile(containedPath(entityId, containedEntitySetName).toString(), Accept.ATOM); + readFile(containedPath(entityId, tempContainedESName).toString(), Accept.ATOM); final ResWrap<EntitySet> container = atomDeserializer.toEntitySet(feed); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e1997e8e/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommon.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommon.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommon.java index b09f56b..a1874c8 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommon.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/batch/BatchParserCommon.java @@ -82,15 +82,15 @@ public class BatchParserCommon { } public static String removeEndingSlash(String content) { - content = content.trim(); - int lastSlashIndex = content.lastIndexOf('/'); + String newContent = content.trim(); + int lastSlashIndex = newContent.lastIndexOf('/'); - return (lastSlashIndex == content.length() - 1) ? content.substring(0, content.length() - 1) : content; + return (lastSlashIndex == newContent.length() - 1) ? newContent.substring(0, newContent.length() - 1) : newContent; } private static String trimQuota(String boundary) { if (boundary.matches("\".*\"")) { - boundary = boundary.replace("\"", ""); + return boundary.replace("\"", ""); } return boundary; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e1997e8e/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java index 86c336e..aa5df37 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/batchhandler/MockedBatchHandlerTest.java @@ -520,16 +520,17 @@ public class MockedBatchHandlerTest { * Helper methods */ private String checkChangeSetPartHeader(final List<String> response, int line) { - assertEquals(CRLF, response.get(line++)); - assertTrue(response.get(line++).contains("--changeset_")); - assertEquals("Content-Type: application/http" + CRLF, response.get(line++)); - assertEquals("Content-Transfer-Encoding: binary" + CRLF, response.get(line++)); + int lineNumber = line; + assertEquals(CRLF, response.get(lineNumber++)); + assertTrue(response.get(lineNumber++).contains("--changeset_")); + assertEquals("Content-Type: application/http" + CRLF, response.get(lineNumber++)); + assertEquals("Content-Transfer-Encoding: binary" + CRLF, response.get(lineNumber++)); - assertTrue(response.get(line).contains("Content-Id:")); - String contentId = response.get(line).split(":")[1].trim(); - line++; + assertTrue(response.get(lineNumber).contains("Content-Id:")); + String contentId = response.get(lineNumber).split(":")[1].trim(); + lineNumber++; - assertEquals(CRLF, response.get(line++)); + assertEquals(CRLF, response.get(lineNumber++)); return contentId; }
