updated PegasusPlugin to still register restModel tasks even if IDL f…

…iles dir is empty
linkedin · Jul 20, 2023 · 0dc74a9 · 0dc74a9
1 parent d8f17a0
commit 0dc74a9
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,9 @@ and what APIs have changed, if applicable.
 
 ## [Unreleased]
 
+## [29.43.9] - 2023-07-18
+- Update `PegasusPlugin` to not check IDL dir contains rest models
+
 ## [29.43.8] - 2023-07-13
 - Add support for gRPC-downstream extension annotations (`@grpcExtension`, `@grpcService`).
 
@@ -5502,7 +5505,8 @@ patch operations can re-use these classes for generating patch messages.
 
 ## [0.14.1]
 
-[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.43.8...master
+[Unreleased]: https://github.com/linkedin/rest.li/compare/v29.43.9...master
+[29.43.9]: https://github.com/linkedin/rest.li/compare/v29.43.8...v29.43.9
 [29.43.8]: https://github.com/linkedin/rest.li/compare/v29.43.7...v29.43.8
 [29.43.7]: https://github.com/linkedin/rest.li/compare/v29.43.6...v29.43.7
 [29.43.6]: https://github.com/linkedin/rest.li/compare/v29.43.5...v29.43.6

diff --git a/gradle-plugins/src/integTest/resources/ivy/legacy/expectedChildIvyDescriptorContents.txt b/gradle-plugins/src/integTest/resources/ivy/legacy/expectedChildIvyDescriptorContents.txt
@@ -23,6 +23,14 @@
     <conf name="mainGeneratedDataTemplateRuntime" visibility="private" extends="mainGeneratedDataTemplateCompile"/>
     <conf name="mainGeneratedDataTemplateRuntimeClasspath" visibility="private" extends="mainGeneratedDataTemplateImplementation,mainGeneratedDataTemplateRuntime,mainGeneratedDataTemplateRuntimeOnly"/>
     <conf name="mainGeneratedDataTemplateRuntimeOnly" visibility="private"/>
+    <conf name="mainGeneratedRestAnnotationProcessor" visibility="private"/>
+    <conf name="mainGeneratedRestCompile" visibility="private"/>
+    <conf name="mainGeneratedRestCompileClasspath" visibility="private" extends="mainGeneratedRestCompileOnly,mainGeneratedRestImplementation"/>
+    <conf name="mainGeneratedRestCompileOnly" visibility="private"/>
+    <conf name="mainGeneratedRestImplementation" visibility="private" extends="mainGeneratedRestCompile"/>
+    <conf name="mainGeneratedRestRuntime" visibility="private" extends="mainGeneratedRestCompile"/>
+    <conf name="mainGeneratedRestRuntimeClasspath" visibility="private" extends="mainGeneratedRestImplementation,mainGeneratedRestRuntime,mainGeneratedRestRuntimeOnly"/>
+    <conf name="mainGeneratedRestRuntimeOnly" visibility="private"/>
     <conf name="pegasusPlugin" visibility="public"/>
     <conf name="restClient" visibility="public" extends="dataTemplate,restClientCompile"/>
     <conf name="restClientCompile" visibility="private"/>
@@ -49,6 +57,14 @@
     <conf name="testGeneratedDataTemplateRuntimeClasspath" visibility="private" extends="testGeneratedDataTemplateImplementation,testGeneratedDataTemplateRuntime,testGeneratedDataTemplateRuntimeOnly"/>
     <conf name="testGeneratedDataTemplateRuntimeOnly" visibility="private"/>
     <conf name="testGeneratedJavadoc" visibility="public" extends="generatedJavadoc"/>
+    <conf name="testGeneratedRestAnnotationProcessor" visibility="private"/>
+    <conf name="testGeneratedRestCompile" visibility="private"/>
+    <conf name="testGeneratedRestCompileClasspath" visibility="private" extends="testGeneratedRestCompileOnly,testGeneratedRestImplementation"/>
+    <conf name="testGeneratedRestCompileOnly" visibility="private"/>
+    <conf name="testGeneratedRestImplementation" visibility="private" extends="testGeneratedRestCompile"/>
+    <conf name="testGeneratedRestRuntime" visibility="private" extends="testGeneratedRestCompile"/>
+    <conf name="testGeneratedRestRuntimeClasspath" visibility="private" extends="testGeneratedRestImplementation,testGeneratedRestRuntime,testGeneratedRestRuntimeOnly"/>
+    <conf name="testGeneratedRestRuntimeOnly" visibility="private"/>
     <conf name="testGeneratedSources" visibility="public" extends="generatedSources"/>
     <conf name="testImplementation" visibility="private" extends="implementation,testCompile"/>
     <conf name="testRestClient" visibility="public" extends="restClient,testDataTemplate"/>
@@ -63,11 +79,15 @@
     <artifact name="child-data-template" type="jar" ext="jar" conf="dataTemplate"/>
     <artifact name="child" type="jar" ext="jar" conf="generatedJavadoc" m:classifier="javadoc"/>
     <artifact name="child" type="jar" ext="jar" conf="generatedSources" m:classifier="sources"/>
+    <artifact name="child-rest-client" type="jar" ext="jar" conf="restClient"/>
+    <artifact name="child-rest-model" type="jar" ext="jar" conf="restModel"/>
     <artifact name="child-test-avro-schema" type="jar" ext="jar" conf="testAvroSchema"/>
     <artifact name="child-test-data-template" type="jar" ext="jar" conf="testDataTemplate"/>
+    <artifact name="child-test-rest-client" type="jar" ext="jar" conf="testRestClient"/>
+    <artifact name="child-test-rest-model" type="jar" ext="jar" conf="testRestModel"/>
   </publications>
   <dependencies>
     <dependency org="com.linkedin.pegasus-parent-demo" name="parent" rev="1.0.0" conf="dataModel-&gt;dataTemplate"/>
     <dependency org="com.google.code.findbugs" name="jsr305" rev="3.0.2" conf="dataTemplateCompile-&gt;default"/>
     <dependency org="org.slf4j" name="slf4j-simple" rev="1.7.2" conf="pegasusPlugin-&gt;default"/>
-  </dependencies>
+  </dependencies>
diff --git a/...e-plugins/src/integTest/resources/ivy/legacy/expectedGrandparentIvyDescriptorContents.txt b/...e-plugins/src/integTest/resources/ivy/legacy/expectedGrandparentIvyDescriptorContents.txt
@@ -23,6 +23,14 @@
     <conf name="mainGeneratedDataTemplateRuntime" visibility="private" extends="mainGeneratedDataTemplateCompile"/>
     <conf name="mainGeneratedDataTemplateRuntimeClasspath" visibility="private" extends="mainGeneratedDataTemplateImplementation,mainGeneratedDataTemplateRuntime,mainGeneratedDataTemplateRuntimeOnly"/>
     <conf name="mainGeneratedDataTemplateRuntimeOnly" visibility="private"/>
+    <conf name="mainGeneratedRestAnnotationProcessor" visibility="private"/>
+    <conf name="mainGeneratedRestCompile" visibility="private"/>
+    <conf name="mainGeneratedRestCompileClasspath" visibility="private" extends="mainGeneratedRestCompileOnly,mainGeneratedRestImplementation"/>
+    <conf name="mainGeneratedRestCompileOnly" visibility="private"/>
+    <conf name="mainGeneratedRestImplementation" visibility="private" extends="mainGeneratedRestCompile"/>
+    <conf name="mainGeneratedRestRuntime" visibility="private" extends="mainGeneratedRestCompile"/>
+    <conf name="mainGeneratedRestRuntimeClasspath" visibility="private" extends="mainGeneratedRestImplementation,mainGeneratedRestRuntime,mainGeneratedRestRuntimeOnly"/>
+    <conf name="mainGeneratedRestRuntimeOnly" visibility="private"/>
     <conf name="pegasusPlugin" visibility="public"/>
     <conf name="restClient" visibility="public" extends="dataTemplate,restClientCompile"/>
     <conf name="restClientCompile" visibility="private"/>
@@ -49,6 +57,14 @@
     <conf name="testGeneratedDataTemplateRuntimeClasspath" visibility="private" extends="testGeneratedDataTemplateImplementation,testGeneratedDataTemplateRuntime,testGeneratedDataTemplateRuntimeOnly"/>
     <conf name="testGeneratedDataTemplateRuntimeOnly" visibility="private"/>
     <conf name="testGeneratedJavadoc" visibility="public" extends="generatedJavadoc"/>
+    <conf name="testGeneratedRestAnnotationProcessor" visibility="private"/>
+    <conf name="testGeneratedRestCompile" visibility="private"/>
+    <conf name="testGeneratedRestCompileClasspath" visibility="private" extends="testGeneratedRestCompileOnly,testGeneratedRestImplementation"/>
+    <conf name="testGeneratedRestCompileOnly" visibility="private"/>
+    <conf name="testGeneratedRestImplementation" visibility="private" extends="testGeneratedRestCompile"/>
+    <conf name="testGeneratedRestRuntime" visibility="private" extends="testGeneratedRestCompile"/>
+    <conf name="testGeneratedRestRuntimeClasspath" visibility="private" extends="testGeneratedRestImplementation,testGeneratedRestRuntime,testGeneratedRestRuntimeOnly"/>
+    <conf name="testGeneratedRestRuntimeOnly" visibility="private"/>
     <conf name="testGeneratedSources" visibility="public" extends="generatedSources"/>
     <conf name="testImplementation" visibility="private" extends="implementation,testCompile"/>
     <conf name="testRestClient" visibility="public" extends="restClient,testDataTemplate"/>
@@ -63,10 +79,14 @@
     <artifact name="grandparent-data-template" type="jar" ext="jar" conf="dataTemplate"/>
     <artifact name="grandparent" type="jar" ext="jar" conf="generatedJavadoc" m:classifier="javadoc"/>
     <artifact name="grandparent" type="jar" ext="jar" conf="generatedSources" m:classifier="sources"/>
+    <artifact name="grandparent-rest-client" type="jar" ext="jar" conf="restClient"/>
+    <artifact name="grandparent-rest-model" type="jar" ext="jar" conf="restModel"/>
     <artifact name="grandparent-test-avro-schema" type="jar" ext="jar" conf="testAvroSchema"/>
     <artifact name="grandparent-test-data-template" type="jar" ext="jar" conf="testDataTemplate"/>
+    <artifact name="grandparent-test-rest-client" type="jar" ext="jar" conf="testRestClient"/>
+    <artifact name="grandparent-test-rest-model" type="jar" ext="jar" conf="testRestModel"/>
   </publications>
   <dependencies>
     <dependency org="com.google.code.findbugs" name="jsr305" rev="3.0.2" conf="dataTemplateCompile-&gt;default"/>
     <dependency org="org.slf4j" name="slf4j-simple" rev="1.7.2" conf="pegasusPlugin-&gt;default"/>
-  </dependencies>
+  </dependencies>
diff --git a/gradle-plugins/src/integTest/resources/ivy/legacy/expectedParentIvyDescriptorContents.txt b/gradle-plugins/src/integTest/resources/ivy/legacy/expectedParentIvyDescriptorContents.txt
@@ -23,6 +23,14 @@
     <conf name="mainGeneratedDataTemplateRuntime" visibility="private" extends="mainGeneratedDataTemplateCompile"/>
     <conf name="mainGeneratedDataTemplateRuntimeClasspath" visibility="private" extends="mainGeneratedDataTemplateImplementation,mainGeneratedDataTemplateRuntime,mainGeneratedDataTemplateRuntimeOnly"/>
     <conf name="mainGeneratedDataTemplateRuntimeOnly" visibility="private"/>
+    <conf name="mainGeneratedRestAnnotationProcessor" visibility="private"/>
+    <conf name="mainGeneratedRestCompile" visibility="private"/>
+    <conf name="mainGeneratedRestCompileClasspath" visibility="private" extends="mainGeneratedRestCompileOnly,mainGeneratedRestImplementation"/>
+    <conf name="mainGeneratedRestCompileOnly" visibility="private"/>
+    <conf name="mainGeneratedRestImplementation" visibility="private" extends="mainGeneratedRestCompile"/>
+    <conf name="mainGeneratedRestRuntime" visibility="private" extends="mainGeneratedRestCompile"/>
+    <conf name="mainGeneratedRestRuntimeClasspath" visibility="private" extends="mainGeneratedRestImplementation,mainGeneratedRestRuntime,mainGeneratedRestRuntimeOnly"/>
+    <conf name="mainGeneratedRestRuntimeOnly" visibility="private"/>
     <conf name="pegasusPlugin" visibility="public"/>
     <conf name="restClient" visibility="public" extends="dataTemplate,restClientCompile"/>
     <conf name="restClientCompile" visibility="private"/>
@@ -49,6 +57,14 @@
     <conf name="testGeneratedDataTemplateRuntimeClasspath" visibility="private" extends="testGeneratedDataTemplateImplementation,testGeneratedDataTemplateRuntime,testGeneratedDataTemplateRuntimeOnly"/>
     <conf name="testGeneratedDataTemplateRuntimeOnly" visibility="private"/>
     <conf name="testGeneratedJavadoc" visibility="public" extends="generatedJavadoc"/>
+    <conf name="testGeneratedRestAnnotationProcessor" visibility="private"/>
+    <conf name="testGeneratedRestCompile" visibility="private"/>
+    <conf name="testGeneratedRestCompileClasspath" visibility="private" extends="testGeneratedRestCompileOnly,testGeneratedRestImplementation"/>
+    <conf name="testGeneratedRestCompileOnly" visibility="private"/>
+    <conf name="testGeneratedRestImplementation" visibility="private" extends="testGeneratedRestCompile"/>
+    <conf name="testGeneratedRestRuntime" visibility="private" extends="testGeneratedRestCompile"/>
+    <conf name="testGeneratedRestRuntimeClasspath" visibility="private" extends="testGeneratedRestImplementation,testGeneratedRestRuntime,testGeneratedRestRuntimeOnly"/>
+    <conf name="testGeneratedRestRuntimeOnly" visibility="private"/>
     <conf name="testGeneratedSources" visibility="public" extends="generatedSources"/>
     <conf name="testImplementation" visibility="private" extends="implementation,testCompile"/>
     <conf name="testRestClient" visibility="public" extends="restClient,testDataTemplate"/>
@@ -63,8 +79,12 @@
     <artifact name="parent-data-template" type="jar" ext="jar" conf="dataTemplate"/>
     <artifact name="parent" type="jar" ext="jar" conf="generatedJavadoc" m:classifier="javadoc"/>
     <artifact name="parent" type="jar" ext="jar" conf="generatedSources" m:classifier="sources"/>
+    <artifact name="parent-rest-client" type="jar" ext="jar" conf="restClient"/>
+    <artifact name="parent-rest-model" type="jar" ext="jar" conf="restModel"/>
     <artifact name="parent-test-avro-schema" type="jar" ext="jar" conf="testAvroSchema"/>
     <artifact name="parent-test-data-template" type="jar" ext="jar" conf="testDataTemplate"/>
+    <artifact name="parent-test-rest-client" type="jar" ext="jar" conf="testRestClient"/>
+    <artifact name="parent-test-rest-model" type="jar" ext="jar" conf="testRestModel"/>
   </publications>
   <dependencies>
     <dependency org="com.linkedin.pegasus-grandparent-demo" name="grandparent" rev="1.0.0" conf="dataModel-&gt;dataTemplate"/>

diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java
@@ -1991,10 +1991,6 @@ protected void configureRestClientGeneration(Project project, SourceSet sourceSe
   {
     // idl directory for api project
     File idlDir = project.file(getIdlPath(project, sourceSet));
-    if (SharedFileUtils.getSuffixedFiles(project, idlDir, IDL_FILE_SUFFIX).isEmpty())
-    {
-      return;
-    }
 
     File generatedRestClientDir = project.file(getGeneratedDirPath(project, sourceSet, REST_GEN_TYPE)
         + File.separatorChar + "java");

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=29.43.8
+version=29.43.9
 group=com.linkedin.pegasus
 org.gradle.configureondemand=true
 org.gradle.parallel=true

diff --git a/restli-tools/src/main/java/com/linkedin/restli/tools/idlgen/RestLiResourceModelExporter.java b/restli-tools/src/main/java/com/linkedin/restli/tools/idlgen/RestLiResourceModelExporter.java
@@ -16,7 +16,6 @@
 
 package com.linkedin.restli.tools.idlgen;
 
-
 import com.linkedin.pegasus.generator.GeneratorResult;
 import com.linkedin.restli.common.RestConstants;
 import com.linkedin.restli.internal.server.model.ResourceModel;
@@ -27,22 +26,16 @@
 import com.linkedin.restli.restspec.RestSpecCodec;
 import com.linkedin.restli.server.RestLiConfig;
 import com.linkedin.restli.server.util.FileClassNameScanner;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
-import org.apache.commons.io.output.NullWriter;
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +52,7 @@ public class RestLiResourceModelExporter
 
   /**
    * @param apiName the name of the API
-   * @param classpath classpath to to load the resources. this is purely for Javadoc Doclet {@link RestLiDoclet}
+   * @param classpath classpath to load the resources. this is purely for Javadoc Doclet {@link RestLiDoclet}
    * @param sourcePaths paths to scan for resource Java source files. this is purely for Javadoc Doclet {@link RestLiDoclet}
    * @param resourcePackages packages to scan for resources
    * @param outdir directory in which to output the IDL files
@@ -110,7 +103,7 @@ public GeneratorResult export(String apiName,
 
   /**
    * @param apiName the name of the API
-   * @param classpath classpath to to load the resources. this is purely for Javadoc Doclet {@link RestLiDoclet}
+   * @param classpath classpath to load the resources. this is purely for Javadoc Doclet {@link RestLiDoclet}
    * @param sourcePaths paths to scan for resource Java source files. this is purely for Javadoc Doclet {@link RestLiDoclet}
    *                    if both resourcePackages and resourceClasses is null, all classes defined in the directories will be scanned
    * @param resourcePackages packages to scan for resources