chore: migrate to owlbot

.github/.OwlBot.lock.yaml

@@ -0,0 +1,3 @@
+docker:
+  digest: sha256:db1616f2f70823d8381d859835229e04371d14f59ac78063c5af73c55c3fffbb
+  image: gcr.io/repo-automation-bots/owlbot-java:latest

synth.py → .github/.OwlBot.yaml

@@ -1,4 +1,4 @@
-# Copyright 2019 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,14 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""This script is used to synthesize generated parts of this library."""
 
-import synthtool.languages.java as java
-
-java.common_templates(excludes=[
-    "README.md",
-    "java.header",
-    "checkstyle.xml",
-    "license-checks.xml",
-    ".github/workflows/samples.yaml",
-])
+docker:
+  image: "gcr.io/repo-automation-bots/owlbot-java:latest"

google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java

@@ -15,7 +15,6 @@
 
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.test.json.AbstractJsonFactoryTest;
-
 import java.util.ArrayList;
 
 /**
@@ -24,16 +23,31 @@
  * @author Yaniv Inbar
  */
 public class AndroidJsonFactoryTest extends AbstractJsonFactoryTest {
-  
+
   private static final String GSON_LINE_SEPARATOR = "\n";
 
   private static final String JSON_ENTRY_PRETTY =
       "{" + GSON_LINE_SEPARATOR + "  \"title\": \"foo\"" + GSON_LINE_SEPARATOR + "}";
-  private static final String JSON_FEED_PRETTY = "{" + GSON_LINE_SEPARATOR + "  \"entries\": ["
-      + GSON_LINE_SEPARATOR + "    {" + GSON_LINE_SEPARATOR + "      \"title\": \"foo\""
-      + GSON_LINE_SEPARATOR + "    }," + GSON_LINE_SEPARATOR + "    {"
-      + GSON_LINE_SEPARATOR + "      \"title\": \"bar\"" + GSON_LINE_SEPARATOR + "    }"
-      + GSON_LINE_SEPARATOR + "  ]" + GSON_LINE_SEPARATOR + "}";
+  private static final String JSON_FEED_PRETTY =
+      "{"
+          + GSON_LINE_SEPARATOR
+          + "  \"entries\": ["
+          + GSON_LINE_SEPARATOR
+          + "    {"
+          + GSON_LINE_SEPARATOR
+          + "      \"title\": \"foo\""
+          + GSON_LINE_SEPARATOR
+          + "    },"
+          + GSON_LINE_SEPARATOR
+          + "    {"
+          + GSON_LINE_SEPARATOR
+          + "      \"title\": \"bar\""
+          + GSON_LINE_SEPARATOR
+          + "    }"
+          + GSON_LINE_SEPARATOR
+          + "  ]"
+          + GSON_LINE_SEPARATOR
+          + "}";
 
   public AndroidJsonFactoryTest(String name) {
     super(name);
@@ -61,5 +75,4 @@ public final void testToPrettyString_Feed() throws Exception {
     feed.entries.add(entryBar);
     assertEquals(JSON_FEED_PRETTY, newFactory().toPrettyString(feed));
   }
-
 }

google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java

@@ -26,6 +26,5 @@ public FakeTest(String name) {
     super(name);
   }
 
-  public final void test() throws Exception {
-  }
+  public final void test() throws Exception {}
 }

google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java

@@ -17,6 +17,4 @@
  *
  * @author Yaniv Inbar
  */
-
 package com.google.api.client.extensions.android.json;
-

google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java

@@ -20,8 +20,7 @@
 @Beta
 public class BetaClass {
 
-  public void method() {
-  }
+  public void method() {}
 
   @Beta
   public void betaMethod() {
@@ -36,8 +35,7 @@ public BetaClass() {
 
   int field;
 
-  @Beta
-  int betaField;
+  @Beta int betaField;
 
   @Override
   public String toString() {

google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java

@@ -19,12 +19,10 @@
 /** A class which contains {@link Beta} fields. */
 public class ClassWithBetaField {
 
-  @Beta
-  public int betaField;
+  @Beta public int betaField;
   public int field;
 
-  @Beta
-  public static final int betaStaticField = 10;
+  @Beta public static final int betaStaticField = 10;
   public static final int staticField = 20;
 
   public ClassWithBetaField() {

google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java

@@ -19,8 +19,7 @@
 /** A class which contains {@link Beta} methods. */
 public class ClassWithBetaMethod {
 
-  @Beta
-  int betaField = 10;
+  @Beta int betaField = 10;
 
   @Beta
   public void betaMethod() {

owlbot.py

@@ -0,0 +1,32 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import synthtool as s
+from synthtool.languages import java
+
+
+for library in s.get_staging_dirs():
+    # put any special-case replacements here
+    s.move(library)
+
+s.remove_staging_dirs()
+java.common_templates(
+    excludes=[
+        "README.md",
+        "java.header",
+        "checkstyle.xml",
+        "license-checks.xml",
+        ".github/workflows/samples.yaml",
+    ]
+)

samples/snippets/src/main/java/com/example/json/YouTubeSample.java

@@ -18,7 +18,6 @@
 
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.util.Key;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -28,8 +27,7 @@ public static class ListResponse {
     @Key("items")
     private List<SearchResult> searchResults;
 
-    @Key
-    private PageInfo pageInfo;
+    @Key private PageInfo pageInfo;
 
     public List<SearchResult> getSearchResults() {
       return searchResults;
@@ -41,11 +39,9 @@ public PageInfo getPageInfo() {
   }
 
   public static class PageInfo {
-    @Key
-    private long totalResults;
+    @Key private long totalResults;
 
-    @Key
-    private long resultsPerPage;
+    @Key private long resultsPerPage;
 
     public long getTotalResults() {
       return totalResults;
@@ -57,14 +53,12 @@ public long getResultsPerPage() {
   }
 
   public static class SearchResult {
-    @Key
-    private String kind;
+    @Key private String kind;
 
     @Key("id")
     private VideoId videoId;
 
-    @Key
-    private Snippet snippet;
+    @Key private Snippet snippet;
 
     public String getKind() {
       return kind;
@@ -80,11 +74,9 @@ public Snippet getSnippet() {
   }
 
   public static class VideoId {
-    @Key
-    private String kind;
+    @Key private String kind;
 
-    @Key
-    private String videoId;
+    @Key private String videoId;
 
     public String getKind() {
       return kind;
@@ -96,20 +88,15 @@ public String getVideoId() {
   }
 
   public static class Snippet {
-    @Key
-    private String publishedAt;
+    @Key private String publishedAt;
 
-    @Key
-    private String channelId;
+    @Key private String channelId;
 
-    @Key
-    private String title;
+    @Key private String title;
 
-    @Key
-    private String description;
+    @Key private String description;
 
-    @Key
-    private Map<String, Thumbnail> thumbnails;
+    @Key private Map<String, Thumbnail> thumbnails;
 
     public String getPublishedAt() {
       return publishedAt;
@@ -133,14 +120,11 @@ public Map<String, Thumbnail> getThumbnails() {
   }
 
   public static class Thumbnail {
-    @Key
-    private String url;
+    @Key private String url;
 
-    @Key
-    private long width;
+    @Key private long width;
 
-    @Key
-    private long height;
+    @Key private long height;
 
     public String getUrl() {
       return url;
@@ -171,5 +155,4 @@ public static ListResponse parseJson(HttpResponse httpResponse) throws IOExcepti
     }
     return listResponse;
   }
-
-}
+}

samples/snippets/src/test/java/com/example/json/YouTubeSampleTest.java

@@ -19,10 +19,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import org.junit.Test;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpTransport;
@@ -36,12 +32,17 @@
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.common.base.Preconditions;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import org.junit.Test;
 
 public class YouTubeSampleTest {
 
   @Test
   public void testParsing() throws IOException {
-    final InputStream contents = getClass().getClassLoader().getResourceAsStream("youtube-search.json");
+    final InputStream contents =
+        getClass().getClassLoader().getResourceAsStream("youtube-search.json");
     Preconditions.checkNotNull(contents);
     HttpTransport transport =
         new MockHttpTransport() {
@@ -91,4 +92,4 @@ public LowLevelHttpResponse execute() throws IOException {
       }
     }
   }
-}
+}