Skip to content

Commit 448d178

Browse files
committed
Merge branch 'renovate/com.google.cloud-native-image-shared-config-1.x' of https://github.com/renovate-bot/google-http-java-client into renovate/com.google.cloud-native-image-shared-config-1.x
2 parents 3d4c01f + 6209970 commit 448d178

File tree

11 files changed

+17
-15
lines changed

11 files changed

+17
-15
lines changed

google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public static JacksonFactory getDefaultInstance() {
6161
/** Holder for the result of {@link #getDefaultInstance()}. */
6262
static class InstanceHolder {
6363
static final JacksonFactory INSTANCE;
64+
6465
static {
6566
INSTANCE = new JacksonFactory();
6667
}

google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ public class JacksonFactoryTest extends AbstractJsonFactoryTest {
3838

3939
static {
4040
JSON_ENTRY_PRETTY =
41-
"{" + StringUtils.LINE_SEPARATOR + " \"title\" : \"foo\"" + StringUtils.LINE_SEPARATOR + "}";
41+
"{"
42+
+ StringUtils.LINE_SEPARATOR
43+
+ " \"title\" : \"foo\""
44+
+ StringUtils.LINE_SEPARATOR
45+
+ "}";
4246
JSON_FEED_PRETTY =
4347
"{"
4448
+ StringUtils.LINE_SEPARATOR
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Args=--initialize-at-build-time=org.junit.runner.RunWith,java.lang.annotation.Annotation

google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public void testParse_empty() throws Exception {
101101
}
102102
}
103103

104-
105104
@Test
106105
public void testParse_emptyMap() throws Exception {
107106
JsonParser parser = newFactory().createJsonParser(EMPTY_OBJECT);
@@ -139,8 +138,7 @@ public void testParser_partialEmpty() throws Exception {
139138

140139
static {
141140
JSON_ENTRY = "{\"title\":\"foo\"}";
142-
JSON_FEED =
143-
"{\"entries\":[" + "{\"title\":\"foo\"}," + "{\"title\":\"bar\"}]}";
141+
JSON_FEED = "{\"entries\":[" + "{\"title\":\"foo\"}," + "{\"title\":\"bar\"}]}";
144142
}
145143

146144
@Test
@@ -461,6 +459,7 @@ public static class AnyType {
461459
}
462460

463461
static final String ANY_TYPE;
462+
464463
static {
465464
ANY_TYPE =
466465
"{\"arr\":[1],\"bool\":true,\"nul\":null,\"num\":5,"
@@ -548,8 +547,7 @@ public static class MapOfMapType {
548547
static final String MAP_TYPE;
549548

550549
static {
551-
MAP_TYPE =
552-
"{\"value\":[{\"map1\":{\"k1\":1,\"k2\":2},\"map2\":{\"kk1\":3,\"kk2\":4}}]}";
550+
MAP_TYPE = "{\"value\":[{\"map1\":{\"k1\":1,\"k2\":2},\"map2\":{\"kk1\":3,\"kk2\":4}}]}";
553551
}
554552

555553
@Test
@@ -929,8 +927,7 @@ public static class EnumValue {
929927
static final String ENUM_VALUE;
930928

931929
static {
932-
ENUM_VALUE =
933-
"{\"nullValue\":null,\"otherValue\":\"other\",\"value\":\"VALUE\"}";
930+
ENUM_VALUE = "{\"nullValue\":null,\"otherValue\":\"other\",\"value\":\"VALUE\"}";
934931
}
935932

936933
@Test

google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonParserTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public abstract class AbstractJsonParserTest {
3939
private static final String TEST_JSON_BIG_DECIMAL;
4040

4141
static {
42-
TEST_JSON =
43-
"{\"strValue\": \"bar\", \"intValue\": 123, \"boolValue\": false}";
42+
TEST_JSON = "{\"strValue\": \"bar\", \"intValue\": 123, \"boolValue\": false}";
4443
TEST_JSON_BIG_DECIMAL = "{\"bigDecimalValue\": 1559341956102}";
4544
}
4645

google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public abstract class AbstractDataStoreFactoryTest {
4949
STRING_ID = "String";
5050
BOOLEAN_ID = "Boolean";
5151
}
52+
5253
DataStoreFactory dataStore;
5354
DataStore<String> stringTyped;
5455
DataStore<Boolean> boolTyped;

google-http-client-xml/src/test/java/com/google/api/client/xml/XmlNamespaceDictionaryTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.io.StringWriter;
2626
import java.util.Collection;
2727
import java.util.TreeSet;
28-
import junit.framework.TestCase;
2928
import org.junit.Test;
3029
import org.junit.runner.RunWith;
3130
import org.junit.runners.JUnit4;

google-http-client-xml/src/test/java/com/google/api/client/xml/XmlTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ public class XmlTest {
6363
SIMPLE_XML = "<any>test</any>";
6464
SIMPLE_XML_NUMERIC = "<any>1</any>";
6565
START_WITH_TEXT = "<?xml version=\"1.0\"?>start_with_text</any>";
66-
MISSING_END_ELEMENT =
67-
"<?xml version=\"1.0\"?><any xmlns=\"\">" + "missing_end_element";
66+
MISSING_END_ELEMENT = "<?xml version=\"1.0\"?><any xmlns=\"\">" + "missing_end_element";
6867
START_WITH_END_ELEMENT =
6968
"<?xml version=\"1.0\"?></p><any " + "xmlns=\"\">start_with_end_elemtn</any>";
7069
START_WITH_END_ELEMENT_NESTED =
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Args=--initialize-at-build-time=org.junit.runner.RunWith,java.lang.annotation.Annotation

google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStoreFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ public abstract class AbstractDataStoreFactory implements DataStoreFactory {
5555
}
5656

5757
public final <V extends Serializable> DataStore<V> getDataStore(String id) throws IOException {
58-
checkArgument(
59-
ID_PATTERN.matcher(id).matches(), "%s does not match pattern %s", id, ID_PATTERN);
58+
checkArgument(ID_PATTERN.matcher(id).matches(), "%s does not match pattern %s", id, ID_PATTERN);
6059
lock.lock();
6160
try {
6261
@SuppressWarnings("unchecked")

google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
public class FileDataStoreFactory extends AbstractDataStoreFactory {
5757

5858
private static final boolean IS_WINDOWS;
59+
5960
static {
6061
try {
6162
IS_WINDOWS =

0 commit comments

Comments
 (0)