diff --git a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java index c2e29a1c..6ca5f715 100644 --- a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java +++ b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/BaseLookup.java @@ -174,7 +174,7 @@ public String extractStatus(T element) { .filter(docTree -> docTree.getKind().equals(DocTree.Kind.DEPRECATED)) .findFirst() .isPresent(); - if (isDeprecated){ + if (isDeprecated) { return DocTree.Kind.DEPRECATED.name().toLowerCase(); } } diff --git a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/ClassItemsLookup.java b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/ClassItemsLookup.java index 1e60bd45..d3e8d2a3 100644 --- a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/ClassItemsLookup.java +++ b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/ClassItemsLookup.java @@ -6,11 +6,20 @@ import com.microsoft.model.Return; import com.microsoft.util.CommentHelper; import com.microsoft.util.Utils; -import com.sun.source.doctree.*; +import com.sun.source.doctree.DocCommentTree; +import com.sun.source.doctree.DocTree; import com.sun.source.doctree.DocTree.Kind; +import com.sun.source.doctree.ParamTree; +import com.sun.source.doctree.ReturnTree; +import com.sun.source.doctree.ThrowsTree; import jdk.javadoc.doclet.DocletEnvironment; -import javax.lang.model.element.*; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.element.VariableElement; import javax.lang.model.type.TypeKind; import java.util.ArrayList; import java.util.List; @@ -151,7 +160,7 @@ String extractOverriddenUid(ExecutableElement ovr) { private String determineComment(ExecutableElement methodElement) { String inheritedInlineComment = getInheritedInlineCommentString(methodElement); Optional docCommentTree = getDocCommentTree(methodElement); - if (docCommentTree.isPresent()){ + if (docCommentTree.isPresent()) { return replaceBlockTags(docCommentTree.get(), inheritedInlineComment); } return inheritedInlineComment; @@ -198,4 +207,16 @@ private CommentHelper getInheritedInlineTags(CommentHelper input) { return output; } + + public String extractJavaType(Element element) { + if (element.getModifiers().contains(Modifier.STATIC)) { + if (element.getKind().equals(ElementKind.METHOD)) { + return "static method"; + } + if (element.getKind().equals(ElementKind.FIELD) || element.getKind().equals(ElementKind.ENUM_CONSTANT)) { + return "static field"; + } + } + return null; + } } diff --git a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/PackageLookup.java b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/PackageLookup.java index afc4a55d..8f939d49 100644 --- a/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/PackageLookup.java +++ b/third_party/docfx-doclet-143274/src/main/java/com/microsoft/lookup/PackageLookup.java @@ -46,7 +46,7 @@ String determinePackageContent(PackageElement packageElement) { } public String extractJavaType(PackageElement element) { - String javaType = element.getKind().name().toLowerCase().replaceAll("_", ""); + String javaType = element.getKind().name().toLowerCase(); if (javaType.equals("package")) { return javaType; } diff --git a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/lookup/ClassItemsLookupTest.java b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/lookup/ClassItemsLookupTest.java index ed5ce1a2..2f990ade 100644 --- a/third_party/docfx-doclet-143274/src/test/java/com/microsoft/lookup/ClassItemsLookupTest.java +++ b/third_party/docfx-doclet-143274/src/test/java/com/microsoft/lookup/ClassItemsLookupTest.java @@ -4,8 +4,14 @@ import com.microsoft.model.ExceptionItem; import com.microsoft.model.MethodParameter; import com.microsoft.model.Return; -import com.sun.source.doctree.*; +import com.sun.source.doctree.DeprecatedTree; +import com.sun.source.doctree.DocCommentTree; import com.sun.source.doctree.DocTree.Kind; +import com.sun.source.doctree.IdentifierTree; +import com.sun.source.doctree.ParamTree; +import com.sun.source.doctree.ReturnTree; +import com.sun.source.doctree.TextTree; +import com.sun.source.doctree.ThrowsTree; import com.sun.source.util.DocTrees; import jdk.javadoc.doclet.DocletEnvironment; import org.junit.Before; @@ -15,6 +21,7 @@ import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; +import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; import javax.lang.model.element.VariableElement; @@ -22,10 +29,14 @@ import javax.lang.model.util.Elements; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class ClassItemsLookupTest { @@ -33,6 +44,8 @@ public class ClassItemsLookupTest { @Rule public CompilationRule rule = new CompilationRule(); private Elements elements; + private List allGenderElements; + private List allPersonElements; private DocletEnvironment environment; private DocTrees docTrees; private DocCommentTree docCommentTree; @@ -47,6 +60,10 @@ public class ClassItemsLookupTest { @Before public void setup() { elements = rule.getElements(); + allGenderElements = elements.getTypeElement("com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender") + .getEnclosedElements().stream().collect(Collectors.toList()); + allPersonElements = elements.getTypeElement("com.microsoft.samples.subpackage.Person") + .getEnclosedElements().stream().collect(Collectors.toList()); environment = Mockito.mock(DocletEnvironment.class); docTrees = Mockito.mock(DocTrees.class); docCommentTree = Mockito.mock(DocCommentTree.class); @@ -265,4 +282,34 @@ public void determineTypeForEnumConstant() { assertEquals(classItemsLookup.determineType(element.getEnclosedElements().get(0)), "Field"); assertEquals(classItemsLookup.determineType(element.getEnclosedElements().get(1)), "Field"); } + + @Test + public void testExtractJavaTypeStaticMethod() { + Element staticMethod = getElementByName(allGenderElements,"valueOf(java.lang.String)"); + assertEquals("Wrong javaType","static method", classItemsLookup.extractJavaType(staticMethod)); + } + + @Test + public void testExtractJavaTypeStaticField() { + Element field = getElementByName(allGenderElements,"FEMALE"); + assertEquals("Wrong javaType", "static field", classItemsLookup.extractJavaType(field)); + } + + @Test + public void testExtractJavaTypeNonStatic() { + Element constructor = getElementByName(allGenderElements,"Gender()"); + assertEquals("Wrong javaType",null, classItemsLookup.extractJavaType(constructor)); + + Element nonStaticMethod = getElementByName(allPersonElements,"getFirstName()"); + assertEquals("Wrong javaType",null, classItemsLookup.extractJavaType(nonStaticMethod)); + + Element nonStaticField = getElementByName(allPersonElements,"age"); + assertEquals("Wrong javaType",null, classItemsLookup.extractJavaType(nonStaticField)); + } + + private Element getElementByName(List elements, String name) { + return elements.stream() + .filter(e -> e.toString().equals(name)) + .findFirst().orElse(null); + } } diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.yml index 870375f3..96e630fa 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.yml @@ -53,6 +53,7 @@ items: content: "public static final ExceptionHandler.Interceptor.RetryResult CONTINUE_EVALUATION" return: type: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult" + javaType: "static field" - uid: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.NO_RETRY" id: "NO_RETRY" parent: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult" @@ -67,6 +68,7 @@ items: content: "public static final ExceptionHandler.Interceptor.RetryResult NO_RETRY" return: type: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult" + javaType: "static field" - uid: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.RETRY" id: "RETRY" parent: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult" @@ -81,6 +83,7 @@ items: content: "public static final ExceptionHandler.Interceptor.RetryResult RETRY" return: type: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult" + javaType: "static field" - uid: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.RetryResult()" id: "RetryResult()" parent: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult" @@ -112,6 +115,7 @@ items: type: "java.lang.String" return: type: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult" + javaType: "static method" - uid: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.values()" id: "values()" parent: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult" @@ -127,6 +131,7 @@ items: content: "public static ExceptionHandler.Interceptor.RetryResult[] values()" return: type: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult[]" + javaType: "static method" references: - uid: "com.microsoft.samples.ExceptionHandler.Interceptor.RetryResult.RetryResult*" name: "RetryResult" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.yml index d1928ffb..bb3dbec5 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.ExceptionHandler.yml @@ -112,6 +112,7 @@ items: content: "public static ExceptionHandler getDefaultInstance()" return: type: "com.microsoft.samples.ExceptionHandler" + javaType: "static method" - uid: "com.microsoft.samples.ExceptionHandler.hashCode()" id: "hashCode()" parent: "com.microsoft.samples.ExceptionHandler" @@ -143,6 +144,7 @@ items: content: "public static ExceptionHandler.Builder newBuilder()" return: type: "com.microsoft.samples.ExceptionHandler.Builder" + javaType: "static method" - uid: "com.microsoft.samples.ExceptionHandler.shouldRetry(java.lang.Throwable,java.lang.Object)" id: "shouldRetry(java.lang.Throwable,java.lang.Object)" parent: "com.microsoft.samples.ExceptionHandler" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.yml index fcb4b7e9..aa11ba23 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ProductSearchSettings.yml @@ -128,6 +128,7 @@ items: type: "com.microsoft.samples.google.ProductSearchSettings" exceptions: - type: "java.io.IOException" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.createProductSetSettings()" id: "createProductSetSettings()" parent: "com.microsoft.samples.google.ProductSearchSettings" @@ -191,6 +192,7 @@ items: content: "public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder()" return: type: "com.google.api.gax.rpc.ApiClientHeaderProvider.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.defaultCredentialsProviderBuilder()" id: "defaultCredentialsProviderBuilder()" parent: "com.microsoft.samples.google.ProductSearchSettings" @@ -207,6 +209,7 @@ items: content: "public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder()" return: type: "com.google.api.gax.core.GoogleCredentialsProvider.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.defaultExecutorProviderBuilder()" id: "defaultExecutorProviderBuilder()" parent: "com.microsoft.samples.google.ProductSearchSettings" @@ -223,6 +226,7 @@ items: content: "public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder()" return: type: "com.google.api.gax.core.InstantiatingExecutorProvider.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.defaultGrpcTransportProviderBuilder()" id: "defaultGrpcTransportProviderBuilder()" parent: "com.microsoft.samples.google.ProductSearchSettings" @@ -239,6 +243,7 @@ items: content: "public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder()" return: type: "com.google.api.gax.grpc.InstantiatingGrpcChannelProvider.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.defaultTransportChannelProvider()" id: "defaultTransportChannelProvider()" parent: "com.microsoft.samples.google.ProductSearchSettings" @@ -254,6 +259,7 @@ items: content: "public static TransportChannelProvider defaultTransportChannelProvider()" return: type: "com.google.api.gax.rpc.TransportChannelProvider" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.deleteProductSetSettings()" id: "deleteProductSetSettings()" parent: "com.microsoft.samples.google.ProductSearchSettings" @@ -318,6 +324,7 @@ items: content: "public static String getDefaultEndpoint()" return: type: "java.lang.String" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.getDefaultServiceScopes()" id: "getDefaultServiceScopes()" parent: "com.microsoft.samples.google.ProductSearchSettings" @@ -334,6 +341,7 @@ items: content: "public static List getDefaultServiceScopes()" return: type: "java.util.List" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.getProductSetSettings()" id: "getProductSetSettings()" parent: "com.microsoft.samples.google.ProductSearchSettings" @@ -494,6 +502,7 @@ items: content: "public static ProductSearchSettings.Builder newBuilder()" return: type: "com.microsoft.samples.google.ProductSearchSettings.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.newBuilder(com.google.api.gax.rpc.ClientContext)" id: "newBuilder(com.google.api.gax.rpc.ClientContext)" parent: "com.microsoft.samples.google.ProductSearchSettings" @@ -513,6 +522,7 @@ items: type: "com.google.api.gax.rpc.ClientContext" return: type: "com.microsoft.samples.google.ProductSearchSettings.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.ProductSearchSettings.purgeProductsOperationSettings()" id: "purgeProductsOperationSettings()" parent: "com.microsoft.samples.google.ProductSearchSettings" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml index 134a6841..3ceed122 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.yml @@ -58,6 +58,7 @@ items: content: "public static final RecognitionAudio.AudioSourceCase AUDIOSOURCE_NOT_SET" return: type: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" + javaType: "static field" - uid: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.AudioSourceCase(int)" id: "AudioSourceCase(int)" parent: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" @@ -88,6 +89,7 @@ items: content: "public static final RecognitionAudio.AudioSourceCase CONTENT" return: type: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" + javaType: "static field" - uid: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.URI" id: "URI" parent: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" @@ -102,6 +104,7 @@ items: content: "public static final RecognitionAudio.AudioSourceCase URI" return: type: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" + javaType: "static field" - uid: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.forNumber(int)" id: "forNumber(int)" parent: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" @@ -120,6 +123,7 @@ items: type: "int" return: type: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" + javaType: "static method" - uid: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.getNumber()" id: "getNumber()" parent: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" @@ -157,6 +161,7 @@ items: type: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" description: "The enum associated with the given number." status: "deprecated" + javaType: "static method" - uid: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.valueOf(java.lang.String)" id: "valueOf(java.lang.String)" parent: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" @@ -175,6 +180,7 @@ items: type: "java.lang.String" return: type: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" + javaType: "static method" - uid: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase.values()" id: "values()" parent: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase" @@ -190,6 +196,7 @@ items: content: "public static RecognitionAudio.AudioSourceCase[] values()" return: type: "com.microsoft.samples.google.RecognitionAudio.AudioSourceCase[]" + javaType: "static method" references: - uid: "int" href: "https://docs.oracle.com/javase/tutorial/java/nutsandbolts/datatypes.html" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.yml index 429de39c..147c3183 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.RecognitionAudio.yml @@ -133,6 +133,7 @@ items: content: "public static final int CONTENT_FIELD_NUMBER" return: type: "int" + javaType: "static field" - uid: "com.microsoft.samples.google.RecognitionAudio.RecognitionAudio()" id: "RecognitionAudio()" parent: "com.microsoft.samples.google.RecognitionAudio" @@ -194,6 +195,7 @@ items: content: "public static final int URI_FIELD_NUMBER" return: type: "int" + javaType: "static field" - uid: "com.microsoft.samples.google.RecognitionAudio.getAudioSourceCase()" id: "getAudioSourceCase()" parent: "com.microsoft.samples.google.RecognitionAudio" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechClient.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechClient.yml index 2b5f6b5b..7600053c 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechClient.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechClient.yml @@ -138,6 +138,7 @@ items: type: "com.microsoft.samples.google.SpeechClient" exceptions: - type: "java.io.IOException" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechClient.create(com.google.cloud.speech.v1p1beta1.stub.SpeechStub)" id: "create(com.google.cloud.speech.v1p1beta1.stub.SpeechStub)" parent: "com.microsoft.samples.google.SpeechClient" @@ -157,6 +158,7 @@ items: type: "com.google.cloud.speech.v1p1beta1.stub.SpeechStub" return: type: "com.microsoft.samples.google.SpeechClient" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechClient.create(com.microsoft.samples.google.SpeechSettings)" id: "create(com.microsoft.samples.google.SpeechSettings)" parent: "com.microsoft.samples.google.SpeechClient" @@ -178,6 +180,7 @@ items: type: "com.microsoft.samples.google.SpeechClient" exceptions: - type: "java.io.IOException" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechClient.getOperationsClient()" id: "getOperationsClient()" parent: "com.microsoft.samples.google.SpeechClient" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.yml index 16a482b0..faffd422 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.SpeechSettings.yml @@ -95,6 +95,7 @@ items: type: "com.microsoft.samples.google.SpeechSettings" exceptions: - type: "java.io.IOException" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.defaultApiClientHeaderProviderBuilder()" id: "defaultApiClientHeaderProviderBuilder()" parent: "com.microsoft.samples.google.SpeechSettings" @@ -110,6 +111,7 @@ items: content: "public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder()" return: type: "com.google.api.gax.rpc.ApiClientHeaderProvider.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.defaultCredentialsProviderBuilder()" id: "defaultCredentialsProviderBuilder()" parent: "com.microsoft.samples.google.SpeechSettings" @@ -126,6 +128,7 @@ items: content: "public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder()" return: type: "com.google.api.gax.core.GoogleCredentialsProvider.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.defaultExecutorProviderBuilder()" id: "defaultExecutorProviderBuilder()" parent: "com.microsoft.samples.google.SpeechSettings" @@ -142,6 +145,7 @@ items: content: "public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder()" return: type: "com.google.api.gax.core.InstantiatingExecutorProvider.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.defaultGrpcTransportProviderBuilder()" id: "defaultGrpcTransportProviderBuilder()" parent: "com.microsoft.samples.google.SpeechSettings" @@ -158,6 +162,7 @@ items: content: "public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder()" return: type: "com.google.api.gax.grpc.InstantiatingGrpcChannelProvider.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.defaultTransportChannelProvider()" id: "defaultTransportChannelProvider()" parent: "com.microsoft.samples.google.SpeechSettings" @@ -173,6 +178,7 @@ items: content: "public static TransportChannelProvider defaultTransportChannelProvider()" return: type: "com.google.api.gax.rpc.TransportChannelProvider" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.getDefaultEndpoint()" id: "getDefaultEndpoint()" parent: "com.microsoft.samples.google.SpeechSettings" @@ -189,6 +195,7 @@ items: content: "public static String getDefaultEndpoint()" return: type: "java.lang.String" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.getDefaultServiceScopes()" id: "getDefaultServiceScopes()" parent: "com.microsoft.samples.google.SpeechSettings" @@ -205,6 +212,7 @@ items: content: "public static List getDefaultServiceScopes()" return: type: "java.util.List" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.longRunningRecognizeOperationSettings()" id: "longRunningRecognizeOperationSettings()" parent: "com.microsoft.samples.google.SpeechSettings" @@ -253,6 +261,7 @@ items: content: "public static SpeechSettings.Builder newBuilder()" return: type: "com.microsoft.samples.google.SpeechSettings.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.newBuilder(com.google.api.gax.rpc.ClientContext)" id: "newBuilder(com.google.api.gax.rpc.ClientContext)" parent: "com.microsoft.samples.google.SpeechSettings" @@ -272,6 +281,7 @@ items: type: "com.google.api.gax.rpc.ClientContext" return: type: "com.microsoft.samples.google.SpeechSettings.Builder" + javaType: "static method" - uid: "com.microsoft.samples.google.SpeechSettings.recognizeSettings()" id: "recognizeSettings()" parent: "com.microsoft.samples.google.SpeechSettings" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ValidationException.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ValidationException.yml index ac1fa8b9..49324c70 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ValidationException.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.ValidationException.yml @@ -83,6 +83,7 @@ items: summary: "Clears the validation context." syntax: content: "public static void popCurrentThreadValidationContext()" + javaType: "static method" - uid: "com.microsoft.samples.google.ValidationException.pushCurrentThreadValidationContext(com.microsoft.samples.google.ValidationException.Supplier)" id: "pushCurrentThreadValidationContext(com.microsoft.samples.google.ValidationException.Supplier)" parent: "com.microsoft.samples.google.ValidationException" @@ -100,6 +101,7 @@ items: parameters: - id: "supplier" type: "com.microsoft.samples.google.ValidationException.Supplier" + javaType: "static method" - uid: "com.microsoft.samples.google.ValidationException.pushCurrentThreadValidationContext(java.lang.String)" id: "pushCurrentThreadValidationContext(java.lang.String)" parent: "com.microsoft.samples.google.ValidationException" @@ -116,6 +118,7 @@ items: parameters: - id: "context" type: "java.lang.String" + javaType: "static method" references: - uid: "java.lang.String" href: "https://docs.oracle.com/javase/8/docs/api/java/lang/String.html" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1beta.SpeechClient.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1beta.SpeechClient.yml index 6a6c1f22..4b03fd5b 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1beta.SpeechClient.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1beta.SpeechClient.yml @@ -138,6 +138,7 @@ items: type: "com.microsoft.samples.google.v1beta.SpeechClient" exceptions: - type: "java.io.IOException" + javaType: "static method" - uid: "com.microsoft.samples.google.v1beta.SpeechClient.create(com.google.cloud.speech.v1p1beta1.stub.SpeechStub)" id: "create(com.google.cloud.speech.v1p1beta1.stub.SpeechStub)" parent: "com.microsoft.samples.google.v1beta.SpeechClient" @@ -157,6 +158,7 @@ items: type: "com.google.cloud.speech.v1p1beta1.stub.SpeechStub" return: type: "com.microsoft.samples.google.v1beta.SpeechClient" + javaType: "static method" - uid: "com.microsoft.samples.google.v1beta.SpeechClient.create(com.microsoft.samples.google.SpeechSettings)" id: "create(com.microsoft.samples.google.SpeechSettings)" parent: "com.microsoft.samples.google.v1beta.SpeechClient" @@ -178,6 +180,7 @@ items: type: "com.microsoft.samples.google.v1beta.SpeechClient" exceptions: - type: "java.io.IOException" + javaType: "static method" - uid: "com.microsoft.samples.google.v1beta.SpeechClient.getOperationsClient()" id: "getOperationsClient()" parent: "com.microsoft.samples.google.v1beta.SpeechClient" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1p1alpha.SpeechClient.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1p1alpha.SpeechClient.yml index f19a072a..5ad0e5d2 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1p1alpha.SpeechClient.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.google.v1p1alpha.SpeechClient.yml @@ -138,6 +138,7 @@ items: type: "com.microsoft.samples.google.v1p1alpha.SpeechClient" exceptions: - type: "java.io.IOException" + javaType: "static method" - uid: "com.microsoft.samples.google.v1p1alpha.SpeechClient.create(com.google.cloud.speech.v1p1beta1.stub.SpeechStub)" id: "create(com.google.cloud.speech.v1p1beta1.stub.SpeechStub)" parent: "com.microsoft.samples.google.v1p1alpha.SpeechClient" @@ -157,6 +158,7 @@ items: type: "com.google.cloud.speech.v1p1beta1.stub.SpeechStub" return: type: "com.microsoft.samples.google.v1p1alpha.SpeechClient" + javaType: "static method" - uid: "com.microsoft.samples.google.v1p1alpha.SpeechClient.create(com.microsoft.samples.google.SpeechSettings)" id: "create(com.microsoft.samples.google.SpeechSettings)" parent: "com.microsoft.samples.google.v1p1alpha.SpeechClient" @@ -178,6 +180,7 @@ items: type: "com.microsoft.samples.google.v1p1alpha.SpeechClient" exceptions: - type: "java.io.IOException" + javaType: "static method" - uid: "com.microsoft.samples.google.v1p1alpha.SpeechClient.getOperationsClient()" id: "getOperationsClient()" parent: "com.microsoft.samples.google.v1p1alpha.SpeechClient" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml index d20b6979..ede81fa9 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.yml @@ -52,6 +52,7 @@ items: content: "public static final Person.IdentificationInfo.Gender FEMALE" return: type: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender" + javaType: "static field" - uid: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.Gender()" id: "Gender()" parent: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender" @@ -79,6 +80,7 @@ items: content: "public static final Person.IdentificationInfo.Gender MALE" return: type: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender" + javaType: "static field" - uid: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.valueOf(java.lang.String)" id: "valueOf(java.lang.String)" parent: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender" @@ -97,6 +99,7 @@ items: type: "java.lang.String" return: type: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender" + javaType: "static method" - uid: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.values()" id: "values()" parent: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender" @@ -112,6 +115,7 @@ items: content: "public static Person.IdentificationInfo.Gender[] values()" return: type: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender[]" + javaType: "static method" references: - uid: "com.microsoft.samples.subpackage.Person.IdentificationInfo.Gender.Gender*" name: "Gender" diff --git a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.yml b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.yml index c994836c..1a071f68 100644 --- a/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.yml +++ b/third_party/docfx-doclet-143274/src/test/resources/expected-generated-files/com.microsoft.samples.subpackage.Person.yml @@ -86,6 +86,7 @@ items: type: "com.microsoft.samples.subpackage.Person" return: type: "com.microsoft.samples.subpackage.Person" + javaType: "static method" - uid: "com.microsoft.samples.subpackage.Person.getFirstName()" id: "getFirstName()" parent: "com.microsoft.samples.subpackage.Person"