Skip to content

Commit

Permalink
Merge branch 'renovate/com.google.cloud-native-image-shared-config-1.…
Browse files Browse the repository at this point in the history
…x' of https://github.com/renovate-bot/google-http-java-client into renovate/com.google.cloud-native-image-shared-config-1.x
  • Loading branch information
diegomarquezp committed Feb 6, 2025
2 parents 3d4c01f + 6209970 commit 448d178
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public static JacksonFactory getDefaultInstance() {
/** Holder for the result of {@link #getDefaultInstance()}. */
static class InstanceHolder {
static final JacksonFactory INSTANCE;

static {
INSTANCE = new JacksonFactory();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ public class JacksonFactoryTest extends AbstractJsonFactoryTest {

static {
JSON_ENTRY_PRETTY =
"{" + StringUtils.LINE_SEPARATOR + " \"title\" : \"foo\"" + StringUtils.LINE_SEPARATOR + "}";
"{"
+ StringUtils.LINE_SEPARATOR
+ " \"title\" : \"foo\""
+ StringUtils.LINE_SEPARATOR
+ "}";
JSON_FEED_PRETTY =
"{"
+ StringUtils.LINE_SEPARATOR
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Args=--initialize-at-build-time=org.junit.runner.RunWith,java.lang.annotation.Annotation
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ public void testParse_empty() throws Exception {
}
}


@Test
public void testParse_emptyMap() throws Exception {
JsonParser parser = newFactory().createJsonParser(EMPTY_OBJECT);
Expand Down Expand Up @@ -139,8 +138,7 @@ public void testParser_partialEmpty() throws Exception {

static {
JSON_ENTRY = "{\"title\":\"foo\"}";
JSON_FEED =
"{\"entries\":[" + "{\"title\":\"foo\"}," + "{\"title\":\"bar\"}]}";
JSON_FEED = "{\"entries\":[" + "{\"title\":\"foo\"}," + "{\"title\":\"bar\"}]}";
}

@Test
Expand Down Expand Up @@ -461,6 +459,7 @@ public static class AnyType {
}

static final String ANY_TYPE;

static {
ANY_TYPE =
"{\"arr\":[1],\"bool\":true,\"nul\":null,\"num\":5,"
Expand Down Expand Up @@ -548,8 +547,7 @@ public static class MapOfMapType {
static final String MAP_TYPE;

static {
MAP_TYPE =
"{\"value\":[{\"map1\":{\"k1\":1,\"k2\":2},\"map2\":{\"kk1\":3,\"kk2\":4}}]}";
MAP_TYPE = "{\"value\":[{\"map1\":{\"k1\":1,\"k2\":2},\"map2\":{\"kk1\":3,\"kk2\":4}}]}";
}

@Test
Expand Down Expand Up @@ -929,8 +927,7 @@ public static class EnumValue {
static final String ENUM_VALUE;

static {
ENUM_VALUE =
"{\"nullValue\":null,\"otherValue\":\"other\",\"value\":\"VALUE\"}";
ENUM_VALUE = "{\"nullValue\":null,\"otherValue\":\"other\",\"value\":\"VALUE\"}";
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public abstract class AbstractJsonParserTest {
private static final String TEST_JSON_BIG_DECIMAL;

static {
TEST_JSON =
"{\"strValue\": \"bar\", \"intValue\": 123, \"boolValue\": false}";
TEST_JSON = "{\"strValue\": \"bar\", \"intValue\": 123, \"boolValue\": false}";
TEST_JSON_BIG_DECIMAL = "{\"bigDecimalValue\": 1559341956102}";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public abstract class AbstractDataStoreFactoryTest {
STRING_ID = "String";
BOOLEAN_ID = "Boolean";
}

DataStoreFactory dataStore;
DataStore<String> stringTyped;
DataStore<Boolean> boolTyped;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.io.StringWriter;
import java.util.Collection;
import java.util.TreeSet;
import junit.framework.TestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ public class XmlTest {
SIMPLE_XML = "<any>test</any>";
SIMPLE_XML_NUMERIC = "<any>1</any>";
START_WITH_TEXT = "<?xml version=\"1.0\"?>start_with_text</any>";
MISSING_END_ELEMENT =
"<?xml version=\"1.0\"?><any xmlns=\"\">" + "missing_end_element";
MISSING_END_ELEMENT = "<?xml version=\"1.0\"?><any xmlns=\"\">" + "missing_end_element";
START_WITH_END_ELEMENT =
"<?xml version=\"1.0\"?></p><any " + "xmlns=\"\">start_with_end_elemtn</any>";
START_WITH_END_ELEMENT_NESTED =
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Args=--initialize-at-build-time=org.junit.runner.RunWith,java.lang.annotation.Annotation
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ public abstract class AbstractDataStoreFactory implements DataStoreFactory {
}

public final <V extends Serializable> DataStore<V> getDataStore(String id) throws IOException {
checkArgument(
ID_PATTERN.matcher(id).matches(), "%s does not match pattern %s", id, ID_PATTERN);
checkArgument(ID_PATTERN.matcher(id).matches(), "%s does not match pattern %s", id, ID_PATTERN);
lock.lock();
try {
@SuppressWarnings("unchecked")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
public class FileDataStoreFactory extends AbstractDataStoreFactory {

private static final boolean IS_WINDOWS;

static {
try {
IS_WINDOWS =
Expand Down

0 comments on commit 448d178

Please sign in to comment.