From 55740011e42bf29e3b9f9f067c8b1116a4e92170 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Thu, 20 May 2021 14:59:12 -0700 Subject: [PATCH 1/2] fix: add outer classname for addon_widget_set proto for java Committer: @neenushaji PiperOrigin-RevId: 374926588 Source-Author: Google APIs Source-Date: Thu May 20 12:29:25 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: d606bb4a7852604e4045948d6340e73cb0d1d70b Source-Link: https://github.com/googleapis/googleapis/commit/d606bb4a7852604e4045948d6340e73cb0d1d70b --- .../apps/script/type/AddOnWidgetSet.java | 10 +-- .../apps/script/type/AddOnWidgetSetProto.java | 73 +++++++++++++++++++ .../apps/script/type/ScriptManifest.java | 4 +- .../type/gmail/GmailAddOnManifestProto.java | 4 +- synth.metadata | 65 ++++++++++++++++- 5 files changed, 144 insertions(+), 12 deletions(-) create mode 100644 proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSetProto.java diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java index fac35977..03e3dc88 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java @@ -119,14 +119,14 @@ private AddOnWidgetSet( } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable .ensureFieldAccessorsInitialized( com.google.apps.script.type.AddOnWidgetSet.class, @@ -689,14 +689,14 @@ public static final class Builder extends com.google.protobuf.GeneratedMessageV3 // @@protoc_insertion_point(builder_implements:google.apps.script.type.AddOnWidgetSet) com.google.apps.script.type.AddOnWidgetSetOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable .ensureFieldAccessorsInitialized( com.google.apps.script.type.AddOnWidgetSet.class, @@ -727,7 +727,7 @@ public Builder clear() { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return com.google.apps.script.type.AddonWidgetSet + return com.google.apps.script.type.AddOnWidgetSetProto .internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; } diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSetProto.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSetProto.java new file mode 100644 index 00000000..873586a6 --- /dev/null +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSetProto.java @@ -0,0 +1,73 @@ +/* + * Copyright 2020 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. + */ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/apps/script/type/addon_widget_set.proto + +package com.google.apps.script.type; + +public final class AddOnWidgetSetProto { + private AddOnWidgetSetProto() {} + + public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} + + public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); + } + + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + return descriptor; + } + + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; + + static { + java.lang.String[] descriptorData = { + "\n.google/apps/script/type/addon_widget_s" + + "et.proto\022\027google.apps.script.type\"\244\002\n\016Ad" + + "dOnWidgetSet\022H\n\014used_widgets\030\001 \003(\01622.goo" + + "gle.apps.script.type.AddOnWidgetSet.Widg" + + "etType\"\307\001\n\nWidgetType\022\033\n\027WIDGET_TYPE_UNS" + + "PECIFIED\020\000\022\017\n\013DATE_PICKER\020\001\022\022\n\016STYLED_BU" + + "TTONS\020\002\022\024\n\020PERSISTENT_FORMS\020\003\022\020\n\014FIXED_F" + + "OOTER\020\004\022!\n\035UPDATE_SUBJECT_AND_RECIPIENTS" + + "\020\005\022\017\n\013GRID_WIDGET\020\006\022\033\n\027ADDON_COMPOSE_UI_" + + "ACTION\020\007B\275\001\n\033com.google.apps.script.type" + + "B\023AddOnWidgetSetProtoP\001Z6google.golang.o" + + "rg/genproto/googleapis/apps/script/type\252" + + "\002\027Google.Apps.Script.Type\312\002\027Google\\Apps\\" + + "Script\\Type\352\002\032Google::Apps::Script::Type" + + "b\006proto3" + }; + descriptor = + com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( + descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); + internal_static_google_apps_script_type_AddOnWidgetSet_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable = + new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_google_apps_script_type_AddOnWidgetSet_descriptor, + new java.lang.String[] { + "UsedWidgets", + }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java index 6174baa6..05553f41 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java @@ -81,7 +81,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.apps.script.type.AddonWidgetSet.getDescriptor(), + com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(), com.google.apps.script.type.ExtensionPoint.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), }); @@ -116,7 +116,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new java.lang.String[] { "AuthorizationHeader", }); - com.google.apps.script.type.AddonWidgetSet.getDescriptor(); + com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(); com.google.apps.script.type.ExtensionPoint.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); } diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java index 6876cff1..850a0a07 100644 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java +++ b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java @@ -94,7 +94,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.apps.script.type.AddonWidgetSet.getDescriptor(), + com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(), com.google.apps.script.type.ExtensionPoint.getDescriptor(), com.google.protobuf.StructProto.getDescriptor(), }); @@ -140,7 +140,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_apps_script_type_gmail_UnconditionalTrigger_descriptor, new java.lang.String[] {}); - com.google.apps.script.type.AddonWidgetSet.getDescriptor(); + com.google.apps.script.type.AddOnWidgetSetProto.getDescriptor(); com.google.apps.script.type.ExtensionPoint.getDescriptor(); com.google.protobuf.StructProto.getDescriptor(); } diff --git a/synth.metadata b/synth.metadata index 60e11f44..389c83f4 100644 --- a/synth.metadata +++ b/synth.metadata @@ -3,16 +3,75 @@ { "git": { "name": ".", - "sha": "af52b7dc4936599ab3ded39d5e134d482de6a6a3" + "remote": "https://github.com/googleapis/java-gsuite-addons.git", + "sha": "42017004ded7208095a9cd5fbd84a991f335431f" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "cc094a40ae0aaf9138093a072f6df7d4a6b2195f", - "internalRef": "372997305" + "sha": "d606bb4a7852604e4045948d6340e73cb0d1d70b", + "internalRef": "374926588" } } + ], + "generatedFiles": [ + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSet.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSetOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddOnWidgetSetProto.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/CommonAddOnManifest.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/CommonAddOnManifestOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ExtensionPoint.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/HomepageExtensionPoint.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/HomepageExtensionPointOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/HttpAuthorizationHeader.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/HttpOptions.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/HttpOptionsOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/LayoutProperties.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/LayoutPropertiesOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/MenuItemExtensionPoint.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/MenuItemExtensionPointOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/ScriptManifest.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/UniversalActionExtensionPoint.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/UniversalActionExtensionPointOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarAddOnManifest.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarAddOnManifestOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarAddOnManifestProto.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarExtensionPoint.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/CalendarExtensionPointOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/ConferenceSolution.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/calendar/ConferenceSolutionOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/docs/DocsAddOnManifest.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/docs/DocsAddOnManifestOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/docs/DocsAddOnManifestProto.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/docs/DocsExtensionPoint.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/docs/DocsExtensionPointOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/drive/DriveAddOnManifest.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/drive/DriveAddOnManifestOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/drive/DriveAddOnManifestProto.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/drive/DriveExtensionPoint.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/drive/DriveExtensionPointOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/ComposeTrigger.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/ComposeTriggerOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/ContextualTrigger.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/ContextualTriggerOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifest.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/GmailAddOnManifestProto.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/UnconditionalTrigger.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/UnconditionalTriggerOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/UniversalAction.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/gmail/UniversalActionOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/sheets/SheetsAddOnManifest.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/sheets/SheetsAddOnManifestOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/sheets/SheetsAddOnManifestProto.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/sheets/SheetsExtensionPoint.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/sheets/SheetsExtensionPointOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/slides/SlidesAddOnManifest.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/slides/SlidesAddOnManifestOrBuilder.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/slides/SlidesAddOnManifestProto.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/slides/SlidesExtensionPoint.java", + "proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/slides/SlidesExtensionPointOrBuilder.java" ] } \ No newline at end of file From 875a3accd9e30ac2c7fe1dec373e20fc081faa4b Mon Sep 17 00:00:00 2001 From: Neenu1995 Date: Thu, 20 May 2021 18:43:23 -0400 Subject: [PATCH 2/2] chore: remove duplicate file --- .../apps/script/type/AddonWidgetSet.java | 72 ------------------- 1 file changed, 72 deletions(-) delete mode 100644 proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java diff --git a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java b/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java deleted file mode 100644 index ff74b79d..00000000 --- a/proto-google-apps-script-type-protos/src/main/java/com/google/apps/script/type/AddonWidgetSet.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2020 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. - */ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/apps/script/type/addon_widget_set.proto - -package com.google.apps.script.type; - -public final class AddonWidgetSet { - private AddonWidgetSet() {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); - } - - static final com.google.protobuf.Descriptors.Descriptor - internal_static_google_apps_script_type_AddOnWidgetSet_descriptor; - static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { - return descriptor; - } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; - - static { - java.lang.String[] descriptorData = { - "\n.google/apps/script/type/addon_widget_s" - + "et.proto\022\027google.apps.script.type\"\244\002\n\016Ad" - + "dOnWidgetSet\022H\n\014used_widgets\030\001 \003(\01622.goo" - + "gle.apps.script.type.AddOnWidgetSet.Widg" - + "etType\"\307\001\n\nWidgetType\022\033\n\027WIDGET_TYPE_UNS" - + "PECIFIED\020\000\022\017\n\013DATE_PICKER\020\001\022\022\n\016STYLED_BU" - + "TTONS\020\002\022\024\n\020PERSISTENT_FORMS\020\003\022\020\n\014FIXED_F" - + "OOTER\020\004\022!\n\035UPDATE_SUBJECT_AND_RECIPIENTS" - + "\020\005\022\017\n\013GRID_WIDGET\020\006\022\033\n\027ADDON_COMPOSE_UI_" - + "ACTION\020\007B\250\001\n\033com.google.apps.script.type" - + "P\001Z6google.golang.org/genproto/googleapi" - + "s/apps/script/type\252\002\027Google.Apps.Script." - + "Type\312\002\027Google\\Apps\\Script\\Type\352\002\032Google:" - + ":Apps::Script::Typeb\006proto3" - }; - descriptor = - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); - internal_static_google_apps_script_type_AddOnWidgetSet_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_google_apps_script_type_AddOnWidgetSet_fieldAccessorTable = - new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_google_apps_script_type_AddOnWidgetSet_descriptor, - new java.lang.String[] { - "UsedWidgets", - }); - } - - // @@protoc_insertion_point(outer_class_scope) -}