Format Java files with google-java-format 1.6 Change-Id: Ib4e5a604f3e34943ebee12ef8cc665d6e79086cd
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractor.java index 75a1cc3..41acd83 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractor.java +++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/IssueExtractor.java
@@ -117,7 +117,7 @@ if (footerStart == -1) { // No footer could be found. So all lines after the first one (that's // the subject) is the body. - //body = String[] templateParameters = + // body = String[] templateParameters = // Arrays.copyOfRange(allParameters, 1, allParameters.length); if (lines.length > 0) { body = StringUtils.join(lines, "\n", 1, lines.length);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java index f13044e..98c593a 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java +++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractor.java
@@ -59,7 +59,9 @@ properties.add(propertyFactory.create("branch", changeAttribute.branch)); properties.add(propertyFactory.create("topic", changeAttribute.topic)); properties.add(propertyFactory.create("subject", changeAttribute.subject)); - properties.add(propertyFactory.create("escapedSubject", StringEscapeUtils.escapeJava(changeAttribute.subject))); + properties.add( + propertyFactory.create( + "escapedSubject", StringEscapeUtils.escapeJava(changeAttribute.subject))); // deprecated, to be removed soon. migrate to ones without dash. properties.add(propertyFactory.create("commit-message", changeAttribute.commitMessage));
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractorTest.java index beb0d67..0df6abb 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractorTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyAttributeExtractorTest.java
@@ -121,7 +121,8 @@ expect(propertyFactory.create("subject", "testSubject")).andReturn(propertySubject); Property propertyEscapedSubject = createMock(Property.class); - expect(propertyFactory.create("escapedSubject", "testSubject")).andReturn(propertyEscapedSubject); + expect(propertyFactory.create("escapedSubject", "testSubject")) + .andReturn(propertyEscapedSubject); Property propertyId2 = createMock(Property.class); expect(propertyFactory.create("change-id", "testId")).andReturn(propertyId2); @@ -241,7 +242,8 @@ expect(propertyFactory.create("subject", "testSubject")).andReturn(propertySubject); Property propertyEscapedSubject = createMock(Property.class); - expect(propertyFactory.create("escapedSubject", "testSubject")).andReturn(propertyEscapedSubject); + expect(propertyFactory.create("escapedSubject", "testSubject")) + .andReturn(propertyEscapedSubject); Property propertyId = createMock(Property.class); expect(propertyFactory.create("changeId", "testId")).andReturn(propertyId);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java index 009a8d5..d0a2eb0 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java
@@ -452,7 +452,7 @@ propertyFactory = createMock(Property.Factory.class); bind(Property.Factory.class).toInstance(propertyFactory); - //factory(Property.Factory.class); + // factory(Property.Factory.class); } }
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/action/AddCommentTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/action/AddCommentTest.java index 691fb6a..d16bab2 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/action/AddCommentTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/workflow/action/AddCommentTest.java
@@ -21,7 +21,6 @@ import com.googlesource.gerrit.plugins.its.base.its.ItsFacade; import com.googlesource.gerrit.plugins.its.base.testutil.LoggingMockingTestCase; import com.googlesource.gerrit.plugins.its.base.workflow.ActionRequest; - import java.io.IOException; import java.util.HashSet;