Remove unnecessary annotations due to recent restriction of adding ne… (

#843)
linkedin · Sep 24, 2022 · aab9f24 · aab9f24
1 parent 26f2a02
commit aab9f24
Show file tree

Hide file tree

Showing 191 changed files with 867 additions and 2,797 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,10 @@ and what APIs have changed, if applicable.
 
 ## [Unreleased]
 
+## [29.39.2] - 2022-09-22
+Remove unnessary extra IDL annotations due to recent restriction of adding new method into bridged service and emit resourceC
+lass for javaparser to use to update rest.li resource.
+
 ## [29.39.1] - 2022-09-20
 Expose an easy way to override validation options for ActionArgumentBuilder
 

diff --git a/restli-common/src/main/pegasus/com/linkedin/restli/restspec/ActionSchema.pdl b/restli-common/src/main/pegasus/com/linkedin/restli/restspec/ActionSchema.pdl
@@ -15,17 +15,6 @@ record ActionSchema includes CustomAnnotationSchema, ServiceErrorsSchema, Succes
    */
   javaMethodName: optional string
 
-  /**
-   * Java method type for this finder method
-   */
-  javaMethodType: optional JavaMethodType = "SYNC"
-
-  /**
-   * True if the java implementation of this method returns the result wrapper (aka ActionResult). False, if
-   * it returns List.
-   */
-  javaReturnsResultWrapper: optional boolean = false
-
   /**
    * Placeholder indicating if this action is read-only or not. This is not enforced by the framework
    * and is just a marker.

diff --git a/restli-common/src/main/pegasus/com/linkedin/restli/restspec/FinderSchema.pdl b/restli-common/src/main/pegasus/com/linkedin/restli/restspec/FinderSchema.pdl
@@ -15,17 +15,6 @@ record FinderSchema includes CustomAnnotationSchema, ServiceErrorsSchema, Succes
    */
   javaMethodName: optional string
 
-  /**
-   * Java method type for this finder method
-   */
-  javaMethodType: optional JavaMethodType = "SYNC"
-
-  /**
-   * True if the java implementation of this method returns the result wrapper (aka CollectionResult). False, if
-   * it returns List.
-   */
-  javaReturnsResultWrapper: optional boolean = false
-
   /**
    * Documentation for this finder
    */

diff --git a/restli-common/src/main/pegasus/com/linkedin/restli/restspec/JavaMethodType.pdl b/restli-common/src/main/pegasus/com/linkedin/restli/restspec/JavaMethodType.pdl
diff --git a/restli-common/src/main/pegasus/com/linkedin/restli/restspec/ResourceSchema.pdl b/restli-common/src/main/pegasus/com/linkedin/restli/restspec/ResourceSchema.pdl
@@ -56,6 +56,11 @@ record ResourceSchema includes CustomAnnotationSchema {
    */
   doc: optional string
 
+  /**
+   * Full qualified Rest.li resource class name
+   */
+  resourceClass: optional string
+
   /**
    * details of collection, if this resource is a collection
    */

diff --git a/restli-common/src/main/pegasus/com/linkedin/restli/restspec/RestMethodSchema.pdl b/restli-common/src/main/pegasus/com/linkedin/restli/restspec/RestMethodSchema.pdl
@@ -15,18 +15,6 @@ record RestMethodSchema includes CustomAnnotationSchema, ServiceErrorsSchema, Su
    */
   javaMethodName: optional string
 
-  /**
-   * Java method type for this rest method
-   */
-  javaMethodType: optional JavaMethodType = "SYNC"
-
-  /**
-   * True if the java implementation of this method returns the result wrapper (aka CollectionResult for GET_ALL, or
-   * GetResult for GET or BatchResult for Batch_GET). False, if it returns the result as is. This is only applicable
-   * for read methods (GET/BATCH_GET/GET_ALL).
-   */
-  javaReturnsResultWrapper: optional boolean
-
   /**
    * Documentation for this rest method
    */

diff --git a/restli-example-api/src/main/idl/com.linkedin.restli.example.photos.albumEntry.restspec.json b/restli-example-api/src/main/idl/com.linkedin.restli.example.photos.albumEntry.restspec.json
@@ -4,6 +4,7 @@
   "path" : "/albumEntry",
   "schema" : "com.linkedin.restli.example.AlbumEntry",
   "doc" : "Many-many association between photos and albums.\n\n <pre>\n   new AlbumEntryBuilders().findBySearch()\n     .albumIdParam(5)\n     .photoIdParam(100)\n     .build();\n </pre>\n\ngenerated from: com.linkedin.restli.example.impl.AlbumEntryResource",
+  "resourceClass" : "com.linkedin.restli.example.impl.AlbumEntryResource",
   "association" : {
     "serviceErrors" : [ {
       "status" : 422,
@@ -35,6 +36,7 @@
       } ],
       "success" : [ 200 ],
       "method" : "get",
+      "javaMethodName" : "get",
       "doc" : "Retrieve the photo's album entry"
     }, {
       "serviceErrors" : [ {
@@ -51,6 +53,7 @@
       } ],
       "success" : [ 204 ],
       "method" : "update",
+      "javaMethodName" : "update",
       "doc" : "Add the specified photo to the specified album.\n If a matching pair of IDs already exists, this changes the add date."
     }, {
       "serviceErrors" : [ {
@@ -67,9 +70,11 @@
       } ],
       "success" : [ 204, 200 ],
       "method" : "delete",
+      "javaMethodName" : "delete",
       "doc" : "Remove the specified photo from the specified album"
     }, {
-      "method" : "batch_get"
+      "method" : "batch_get",
+      "javaMethodName" : "batchGet"
     } ],
     "finders" : [ {
       "serviceErrors" : [ {
@@ -87,6 +92,7 @@
       } ],
       "success" : [ 200 ],
       "name" : "search",
+      "javaMethodName" : "search",
       "doc" : "Find all entries matching the given album and photo IDs. <code>null</code> is treated\n as a wildcard.",
       "parameters" : [ {
         "name" : "albumId",
@@ -114,6 +120,7 @@
         "parameters" : [ "albumId", "photoId" ]
       } ],
       "name" : "purge",
+      "javaMethodName" : "purge",
       "doc" : "Delete all entries in the db with matching album/photo IDs. If either albumId or photoId\n params are not supplied they are treated as a wildcard.",
       "parameters" : [ {
         "name" : "albumId",

diff --git a/restli-example-api/src/main/idl/com.linkedin.restli.example.photos.albums.restspec.json b/restli-example-api/src/main/idl/com.linkedin.restli.example.photos.albums.restspec.json
@@ -4,23 +4,29 @@
   "path" : "/albums",
   "schema" : "com.linkedin.restli.example.Album",
   "doc" : "generated from: com.linkedin.restli.example.impl.AlbumResource",
+  "resourceClass" : "com.linkedin.restli.example.impl.AlbumResource",
   "collection" : {
     "identifier" : {
       "name" : "albumsId",
       "type" : "long"
     },
     "supports" : [ "create", "delete", "get", "update" ],
     "methods" : [ {
-      "method" : "create"
+      "method" : "create",
+      "javaMethodName" : "create"
     }, {
-      "method" : "get"
+      "method" : "get",
+      "javaMethodName" : "get"
     }, {
-      "method" : "update"
+      "method" : "update",
+      "javaMethodName" : "update"
     }, {
-      "method" : "delete"
+      "method" : "delete",
+      "javaMethodName" : "delete"
     } ],
     "actions" : [ {
       "name" : "purge",
+      "javaMethodName" : "purge",
       "returns" : "int"
     } ],
     "entity" : {

diff --git a/restli-example-api/src/main/idl/com.linkedin.restli.example.photos.photos.restspec.json b/restli-example-api/src/main/idl/com.linkedin.restli.example.photos.photos.restspec.json
@@ -4,27 +4,35 @@
   "path" : "/photos",
   "schema" : "com.linkedin.restli.example.Photo",
   "doc" : "generated from: com.linkedin.restli.example.impl.PhotoResource",
+  "resourceClass" : "com.linkedin.restli.example.impl.PhotoResource",
   "collection" : {
     "identifier" : {
       "name" : "photosId",
       "type" : "long"
     },
     "supports" : [ "batch_get", "create", "delete", "get", "partial_update", "update" ],
     "methods" : [ {
-      "method" : "create"
+      "method" : "create",
+      "javaMethodName" : "create"
     }, {
-      "method" : "get"
+      "method" : "get",
+      "javaMethodName" : "get"
     }, {
-      "method" : "update"
+      "method" : "update",
+      "javaMethodName" : "update"
     }, {
-      "method" : "partial_update"
+      "method" : "partial_update",
+      "javaMethodName" : "update"
     }, {
-      "method" : "delete"
+      "method" : "delete",
+      "javaMethodName" : "delete"
     }, {
-      "method" : "batch_get"
+      "method" : "batch_get",
+      "javaMethodName" : "batchGet"
     } ],
     "finders" : [ {
       "name" : "titleAndOrFormat",
+      "javaMethodName" : "find",
       "parameters" : [ {
         "name" : "title",
         "type" : "string",
@@ -38,6 +46,7 @@
     } ],
     "batchFinders" : [ {
       "name" : "searchPhotos",
+      "javaMethodName" : "searchPhotos",
       "parameters" : [ {
         "name" : "criteria",
         "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.restli.example.PhotoCriteria\" }"
@@ -51,6 +60,7 @@
     } ],
     "actions" : [ {
       "name" : "purge",
+      "javaMethodName" : "purge",
       "returns" : "int"
     } ],
     "entity" : {

diff --git a/...example-api/src/main/snapshot/com.linkedin.restli.example.photos.albumEntry.snapshot.json b/...example-api/src/main/snapshot/com.linkedin.restli.example.photos.albumEntry.snapshot.json
@@ -31,6 +31,7 @@
     "path" : "/albumEntry",
     "schema" : "com.linkedin.restli.example.AlbumEntry",
     "doc" : "Many-many association between photos and albums.\n\n <pre>\n   new AlbumEntryBuilders().findBySearch()\n     .albumIdParam(5)\n     .photoIdParam(100)\n     .build();\n </pre>\n\ngenerated from: com.linkedin.restli.example.impl.AlbumEntryResource",
+    "resourceClass" : "com.linkedin.restli.example.impl.AlbumEntryResource",
     "association" : {
       "serviceErrors" : [ {
         "status" : 422,
@@ -62,6 +63,7 @@
         } ],
         "success" : [ 200 ],
         "method" : "get",
+        "javaMethodName" : "get",
         "doc" : "Retrieve the photo's album entry"
       }, {
         "serviceErrors" : [ {
@@ -78,6 +80,7 @@
         } ],
         "success" : [ 204 ],
         "method" : "update",
+        "javaMethodName" : "update",
         "doc" : "Add the specified photo to the specified album.\n If a matching pair of IDs already exists, this changes the add date."
       }, {
         "serviceErrors" : [ {
@@ -94,9 +97,11 @@
         } ],
         "success" : [ 204, 200 ],
         "method" : "delete",
+        "javaMethodName" : "delete",
         "doc" : "Remove the specified photo from the specified album"
       }, {
-        "method" : "batch_get"
+        "method" : "batch_get",
+        "javaMethodName" : "batchGet"
       } ],
       "finders" : [ {
         "serviceErrors" : [ {
@@ -114,6 +119,7 @@
         } ],
         "success" : [ 200 ],
         "name" : "search",
+        "javaMethodName" : "search",
         "doc" : "Find all entries matching the given album and photo IDs. <code>null</code> is treated\n as a wildcard.",
         "parameters" : [ {
           "name" : "albumId",
@@ -141,6 +147,7 @@
           "parameters" : [ "albumId", "photoId" ]
         } ],
         "name" : "purge",
+        "javaMethodName" : "purge",
         "doc" : "Delete all entries in the db with matching album/photo IDs. If either albumId or photoId\n params are not supplied they are treated as a wildcard.",
         "parameters" : [ {
           "name" : "albumId",

diff --git a/restli-example-api/src/main/snapshot/com.linkedin.restli.example.photos.albums.snapshot.json b/restli-example-api/src/main/snapshot/com.linkedin.restli.example.photos.albums.snapshot.json
@@ -25,23 +25,29 @@
     "path" : "/albums",
     "schema" : "com.linkedin.restli.example.Album",
     "doc" : "generated from: com.linkedin.restli.example.impl.AlbumResource",
+    "resourceClass" : "com.linkedin.restli.example.impl.AlbumResource",
     "collection" : {
       "identifier" : {
         "name" : "albumsId",
         "type" : "long"
       },
       "supports" : [ "create", "delete", "get", "update" ],
       "methods" : [ {
-        "method" : "create"
+        "method" : "create",
+        "javaMethodName" : "create"
       }, {
-        "method" : "get"
+        "method" : "get",
+        "javaMethodName" : "get"
       }, {
-        "method" : "update"
+        "method" : "update",
+        "javaMethodName" : "update"
       }, {
-        "method" : "delete"
+        "method" : "delete",
+        "javaMethodName" : "delete"
       } ],
       "actions" : [ {
         "name" : "purge",
+        "javaMethodName" : "purge",
         "returns" : "int"
       } ],
       "entity" : {

diff --git a/restli-example-api/src/main/snapshot/com.linkedin.restli.example.photos.photos.snapshot.json b/restli-example-api/src/main/snapshot/com.linkedin.restli.example.photos.photos.snapshot.json
@@ -77,27 +77,35 @@
     "path" : "/photos",
     "schema" : "com.linkedin.restli.example.Photo",
     "doc" : "generated from: com.linkedin.restli.example.impl.PhotoResource",
+    "resourceClass" : "com.linkedin.restli.example.impl.PhotoResource",
     "collection" : {
       "identifier" : {
         "name" : "photosId",
         "type" : "long"
       },
       "supports" : [ "batch_get", "create", "delete", "get", "partial_update", "update" ],
       "methods" : [ {
-        "method" : "create"
+        "method" : "create",
+        "javaMethodName" : "create"
       }, {
-        "method" : "get"
+        "method" : "get",
+        "javaMethodName" : "get"
       }, {
-        "method" : "update"
+        "method" : "update",
+        "javaMethodName" : "update"
       }, {
-        "method" : "partial_update"
+        "method" : "partial_update",
+        "javaMethodName" : "update"
       }, {
-        "method" : "delete"
+        "method" : "delete",
+        "javaMethodName" : "delete"
       }, {
-        "method" : "batch_get"
+        "method" : "batch_get",
+        "javaMethodName" : "batchGet"
       } ],
       "finders" : [ {
         "name" : "titleAndOrFormat",
+        "javaMethodName" : "find",
         "parameters" : [ {
           "name" : "title",
           "type" : "string",
@@ -111,6 +119,7 @@
       } ],
       "batchFinders" : [ {
         "name" : "searchPhotos",
+        "javaMethodName" : "searchPhotos",
         "parameters" : [ {
           "name" : "criteria",
           "type" : "{ \"type\" : \"array\", \"items\" : \"com.linkedin.restli.example.PhotoCriteria\" }"
@@ -124,6 +133,7 @@
       } ],
       "actions" : [ {
         "name" : "purge",
+        "javaMethodName" : "purge",
         "returns" : "int"
       } ],
       "entity" : {