Skip to content

Commit dd5a872

Browse files
gk5885garrettjonesgoogle
authored andcommitted
Update imports ordering to the new java import order (go/java-imports).
The import order is changing because the current rules are unnecessarily complicated, difficult to configure in IDEs, and difficult for users to remember. More information: http://go/java-imports-lsc Tested: $ blaze build //javatests/com/google/android/libraries/componentview/components/gencode:all //javatests/com/google/android/libraries/componentview/components/interactive:all //javatests/com/google/android/libraries/componentview/performance/testactivity:all //javatests/com/google/android/libraries/componentview/robolectric:all //javatests/com/google/android/libraries/curvular/codegen:all //javatests/com/google/android/libraries/gcoreclient/common/api/mocks:all //javatests/com/google/android/libraries/glide/cronet:all //javatests/com/google/android/libraries/gmb/bizinfov2/mocks:all //javatests/com/google/android/libraries/gmb/experiments/mocks:all //javatests/com/google/android/libraries/hangouts/video/testing:all //javatests/com/google/android/libraries/kids/supervision/chimera/shadows:all //javatests/com/google/android/libraries/kids/supervision/testcommon:all //javatests/com/google/android/libraries/location/beacon/testing:all //javatests/com/google/android/libraries/location/normalizer:all //javatests/com/google/android/libraries/location/places/eval/conversions:all //javatests/com/google/android/libraries/location/places/inference/data/model:all //javatests/com/google/android/libraries/location/places/inference/data:all //javatests/com/google/android/libraries/location/places/inference/modules:all //javatests/com/google/android/libraries/micore/context/libs/cm:all //javatests/com/google/android/libraries/micore/training/sampleapp:all //javatests/com/google/android/libraries/micore/training/service:all //javatests/com/google/android/libraries/nbu/flags:all //javatests/com/google/android/libraries/performance/primes/hprof:all //javatests/com/google/android/libraries/performance/primes/testharness:all //javatests/com/google/android/libraries/photoeditor/core:all //javatests/com/google/android/libraries/sense/processor/matchmaker:all //javatests/com/google/android/libraries/social/autobackup:all //javatests/com/google/android/libraries/social/experiments/mocks:all //javatests/com/google/android/libraries/social/notifications/testing:all //javatests/com/google/android/libraries/social/people/mocks:all //javatests/com/google/android/libraries/social/sendkit/apitest:all //javatests/com/google/android/libraries/social/sendkit/shellapp:all //javatests/com/google/android/libraries/social/socialanalytics/testing:all //javatests/com/google/android/libraries/social/squares/apitest:all //javatests/com/google/android/libraries/social/stream/streamview/shellapp:all //javatests/com/google/android/libraries/social/testing/espresso/idlingresource:all //javatests/com/google/android/libraries/stitch/binder/compiler/bar:all //javatests/com/google/android/libraries/stitch/incompat/lgemenuoverride:all //javatests/com/google/android/libraries/tvdetect:all //javatests/com/google/android/libraries/velour/buildtools/resources:all //javatests/com/google/android/libraries/youtube/common/nio:all //javatests/com/google/android/libraries/youtube/creator/fluff:all //javatests/com/google/android/libraries/youtube/edit/filters/renderer/client/pipeline:all //javatests/com/google/android/libraries/youtube/innertube/crawler/processor:all //javatests/com/google/android/libraries/youtube/player/proxy:all //javatests/com/google/android/libraries/youtube/systemhealth:all //javatests/com/google/android/libraries/youtube/upload/faststart:all //javatests/com/google/android/testing/loganalysis/parser/impl:all //javatests/com/google/android/wh/common:all //javatests/com/google/api/buganizer/stubby:all //javatests/com/google/api/client/auth/oauth:all //javatests/com/google/api/client/dapper:all //javatests/com/google/api/client/googleapis/batch:all //javatests/com/google/api/client/googleapis/extensions/appengine/auth/oauth2:all //javatests/com/google/api/client/googleapis:all //javatests/com/google/api/client/testing/util:all //javatests/com/google/api/client/util:all //javatests/com/google/api/client/xml:all //javatests/com/google/api/management/dcshared/apiconfiguration:all //javatests/com/google/api/management/dcshared/quota/appstats:all //javatests/com/google/api/management/offline/migration:all //javatests/com/google/api/management/server/apis/loasproject/v1:all //javatests/com/google/api/management/server/apis/servicemanager/v1:all //javatests/com/google/api/management/server/controlplanemigration:all //javatests/com/google/api/management/server/core/flows/util/testing:all //javatests/com/google/api/management/server/debug:all //javatests/com/google/api/management/server/domain/irdb:all //javatests/com/google/api/management/server/integrations/consumersettings:all //javatests/com/google/api/management/server/integrations/gfe/coordinatorv2:all //javatests/com/google/api/management/server/integrations/precisequotaserver:all //javatests/com/google/api/management/server/integrations/quotaserver/client:all //javatests/com/google/api/management/server/integrations/respay:all //javatests/com/google/api/management/server/integrations/serviceaccounts:all //javatests/com/google/api/management/server/superquota:all //javatests/com/google/api/management/services/apis/common/dcvisibility:all http://sponge/b448ece6-ceda-4d4a-ab21-d7511d3351e6 Some tests failed; test failures are believed to be unrelated to this CL ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=127782949
1 parent ece1541 commit dd5a872

36 files changed

+43
-113
lines changed

google-http-client-protobuf/src/test/java/com/google/api/client/protobuf/ProtocolBuffersTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414

1515
package com.google.api.client.protobuf;
1616

17-
import junit.framework.TestCase;
18-
1917
import java.io.ByteArrayInputStream;
18+
import junit.framework.TestCase;
2019

2120
/**
2221
* Tests {@link ProtocolBuffers}.

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616

1717
import com.google.api.client.http.HttpHeaders;
1818
import com.google.api.client.xml.atom.Atom;
19-
19+
import java.util.List;
2020
import junit.framework.TestCase;
2121
import org.junit.Assert;
2222

23-
import java.util.List;
24-
2523
/**
2624
* Tests {@link Atom}.
2725
*

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
package com.google.api.client.xml;
1616

1717
import com.google.api.client.util.ArrayMap;
18-
19-
import org.xmlpull.v1.XmlPullParser;
20-
21-
import junit.framework.TestCase;
22-
2318
import java.io.StringReader;
2419
import java.util.Collection;
20+
import junit.framework.TestCase;
21+
import org.xmlpull.v1.XmlPullParser;
2522

2623
/**
2724
* Tests {@link GenericXml}.

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
import com.google.api.client.util.Key;
1818
import com.google.api.client.xml.atom.Atom;
1919
import com.google.common.collect.ImmutableMap;
20-
21-
import junit.framework.TestCase;
22-
import org.xmlpull.v1.XmlSerializer;
23-
2420
import java.io.StringWriter;
2521
import java.util.Collection;
2622
import java.util.TreeSet;
23+
import junit.framework.TestCase;
24+
import org.xmlpull.v1.XmlSerializer;
2725

2826
/**
2927
* Tests {@link XmlNamespaceDictionary}.

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@
1616

1717
import com.google.api.client.util.ArrayMap;
1818
import com.google.api.client.util.Key;
19-
20-
import junit.framework.TestCase;
21-
import org.xmlpull.v1.XmlPullParser;
22-
import org.xmlpull.v1.XmlSerializer;
23-
2419
import java.io.ByteArrayOutputStream;
2520
import java.io.StringReader;
2621
import java.util.ArrayList;
2722
import java.util.Map;
23+
import junit.framework.TestCase;
24+
import org.xmlpull.v1.XmlPullParser;
25+
import org.xmlpull.v1.XmlSerializer;
2826

2927
/**
3028
* Tests {@link Xml}.

google-http-client/src/test/java/com/google/api/client/http/AbstractHttpContentTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414

1515
package com.google.api.client.http;
1616

17-
import junit.framework.TestCase;
18-
1917
import java.io.IOException;
2018
import java.io.OutputStream;
2119
import java.util.Arrays;
20+
import junit.framework.TestCase;
2221

2322
/**
2423
* Tests {@link AbstractHttpContent}.

google-http-client/src/test/java/com/google/api/client/http/ByteArrayContentTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
import com.google.api.client.util.IOUtils;
1818
import com.google.api.client.util.StringUtils;
19-
20-
import junit.framework.TestCase;
21-
2219
import java.io.ByteArrayOutputStream;
2320
import java.io.IOException;
21+
import junit.framework.TestCase;
2422

2523
/**
2624
* Tests {@link ByteArrayContent}.

google-http-client/src/test/java/com/google/api/client/http/EmptyContentTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
package com.google.api.client.http;
1616

1717

18-
import junit.framework.TestCase;
19-
2018
import java.io.ByteArrayOutputStream;
2119
import java.io.IOException;
20+
import junit.framework.TestCase;
2221

2322
/**
2423
* Tests {@link EmptyContent}.

google-http-client/src/test/java/com/google/api/client/http/GZipEncodingTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
import com.google.api.client.testing.util.TestableByteArrayOutputStream;
1919
import com.google.api.client.util.ByteArrayStreamingContent;
2020
import com.google.api.client.util.StringUtils;
21-
21+
import java.io.IOException;
2222
import junit.framework.TestCase;
2323
import org.junit.Assert;
2424

25-
import java.io.IOException;
26-
2725
/**
2826
* Tests {@link GZipEncoding}.
2927
*

google-http-client/src/test/java/com/google/api/client/http/GenericUrlTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
package com.google.api.client.http;
1616

1717
import com.google.api.client.util.Key;
18-
19-
import junit.framework.TestCase;
20-
import org.junit.Assert;
21-
2218
import java.net.MalformedURLException;
2319
import java.net.URI;
2420
import java.net.URISyntaxException;
@@ -28,6 +24,8 @@
2824
import java.util.Collection;
2925
import java.util.Iterator;
3026
import java.util.List;
27+
import junit.framework.TestCase;
28+
import org.junit.Assert;
3129

3230
/**
3331
* Tests {@link GenericUrl}.

0 commit comments

Comments
 (0)