Merge pull request #27 from valpackett/master

fix build
ddsky · Jul 19, 2024 · d017101 · d017101
2 parents 9a7e16a + b961f48
commit d017101
Show file tree

Hide file tree

Showing 458 changed files with 2,091 additions and 14,332 deletions.
diff --git a/android/.openapi-generator/FILES b/android/.openapi-generator/FILES
@@ -148,7 +148,6 @@ docs/SearchRestaurants200ResponseRestaurantsInnerAddress.md
 docs/SearchRestaurants200ResponseRestaurantsInnerLocalHours.md
 docs/SearchRestaurants200ResponseRestaurantsInnerLocalHoursOperational.md
 docs/SearchResult.md
-docs/SearchResultDataPointsInner.md
 docs/SearchSiteContent200Response.md
 docs/SummarizeRecipe200Response.md
 docs/TalkToChatbot200Response.md
@@ -317,7 +316,6 @@ src/main/java/com/spoonacular/client/model/SearchRestaurants200ResponseRestauran
 src/main/java/com/spoonacular/client/model/SearchRestaurants200ResponseRestaurantsInnerLocalHours.java
 src/main/java/com/spoonacular/client/model/SearchRestaurants200ResponseRestaurantsInnerLocalHoursOperational.java
 src/main/java/com/spoonacular/client/model/SearchResult.java
-src/main/java/com/spoonacular/client/model/SearchResultDataPointsInner.java
 src/main/java/com/spoonacular/client/model/SearchSiteContent200Response.java
 src/main/java/com/spoonacular/client/model/SummarizeRecipe200Response.java
 src/main/java/com/spoonacular/client/model/TalkToChatbot200Response.java

diff --git a/android/README.md b/android/README.md
@@ -328,7 +328,6 @@ Class | Method | HTTP request | Description
  - [SearchRestaurants200ResponseRestaurantsInnerLocalHours](docs/SearchRestaurants200ResponseRestaurantsInnerLocalHours.md)
  - [SearchRestaurants200ResponseRestaurantsInnerLocalHoursOperational](docs/SearchRestaurants200ResponseRestaurantsInnerLocalHoursOperational.md)
  - [SearchResult](docs/SearchResult.md)
- - [SearchResultDataPointsInner](docs/SearchResultDataPointsInner.md)
  - [SearchSiteContent200Response](docs/SearchSiteContent200Response.md)
  - [SummarizeRecipe200Response](docs/SummarizeRecipe200Response.md)
  - [TalkToChatbot200Response](docs/TalkToChatbot200Response.md)

diff --git a/android/docs/SearchResult.md b/android/docs/SearchResult.md
@@ -6,7 +6,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**dataPoints** | [**List&lt;SearchResultDataPointsInner&gt;**](SearchResultDataPointsInner.md) |  |  [optional]
 **image** | **String** |  |  [optional]
 **link** | **String** |  |  [optional]
 **name** | **String** |  | 

diff --git a/android/docs/SearchResultDataPointsInner.md b/android/docs/SearchResultDataPointsInner.md
diff --git a/android/src/main/java/com/spoonacular/client/JsonUtil.java b/android/src/main/java/com/spoonacular/client/JsonUtil.java
@@ -613,10 +613,6 @@ public static Type getListTypeForDeserialization(Class cls) {
       return new TypeToken<List<SearchResult>>(){}.getType();
     }
 
-    if ("SearchResultDataPointsInner".equalsIgnoreCase(className)) {
-      return new TypeToken<List<SearchResultDataPointsInner>>(){}.getType();
-    }
-
     if ("SearchSiteContent200Response".equalsIgnoreCase(className)) {
       return new TypeToken<List<SearchSiteContent200Response>>(){}.getType();
     }
@@ -1199,10 +1195,6 @@ public static Type getTypeForDeserialization(Class cls) {
       return new TypeToken<SearchResult>(){}.getType();
     }
 
-    if ("SearchResultDataPointsInner".equalsIgnoreCase(className)) {
-      return new TypeToken<SearchResultDataPointsInner>(){}.getType();
-    }
-
     if ("SearchSiteContent200Response".equalsIgnoreCase(className)) {
       return new TypeToken<SearchSiteContent200Response>(){}.getType();
     }

diff --git a/android/src/main/java/com/spoonacular/client/model/SearchResult.java b/android/src/main/java/com/spoonacular/client/model/SearchResult.java
@@ -12,9 +12,7 @@
 
 package com.spoonacular.client.model;
 
-import com.spoonacular.client.model.SearchResultDataPointsInner;
 import java.math.BigDecimal;
-import java.util.*;
 import io.swagger.annotations.*;
 import com.google.gson.annotations.SerializedName;
 
@@ -24,8 +22,6 @@
 @ApiModel(description = "")
 public class SearchResult {
 
-  @SerializedName("dataPoints")
-  private List<SearchResultDataPointsInner> dataPoints = null;
   @SerializedName("image")
   private String image = null;
   @SerializedName("link")
@@ -43,16 +39,6 @@ public class SearchResult {
   @SerializedName("relevance")
   private BigDecimal relevance = null;
 
-  /**
-   **/
-  @ApiModelProperty(value = "")
-  public List<SearchResultDataPointsInner> getDataPoints() {
-    return dataPoints;
-  }
-  public void setDataPoints(List<SearchResultDataPointsInner> dataPoints) {
-    this.dataPoints = dataPoints;
-  }
-
   /**
    **/
   @ApiModelProperty(value = "")
@@ -143,8 +129,7 @@ public boolean equals(Object o) {
       return false;
     }
     SearchResult searchResult = (SearchResult) o;
-    return (this.dataPoints == null ? searchResult.dataPoints == null : this.dataPoints.equals(searchResult.dataPoints)) &&
-        (this.image == null ? searchResult.image == null : this.image.equals(searchResult.image)) &&
+    return (this.image == null ? searchResult.image == null : this.image.equals(searchResult.image)) &&
         (this.link == null ? searchResult.link == null : this.link.equals(searchResult.link)) &&
         (this.name == null ? searchResult.name == null : this.name.equals(searchResult.name)) &&
         (this.type == null ? searchResult.type == null : this.type.equals(searchResult.type)) &&
@@ -157,7 +142,6 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     int result = 17;
-    result = 31 * result + (this.dataPoints == null ? 0: this.dataPoints.hashCode());
     result = 31 * result + (this.image == null ? 0: this.image.hashCode());
     result = 31 * result + (this.link == null ? 0: this.link.hashCode());
     result = 31 * result + (this.name == null ? 0: this.name.hashCode());
@@ -174,7 +158,6 @@ public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class SearchResult {\n");
 
-    sb.append("  dataPoints: ").append(dataPoints).append("\n");
     sb.append("  image: ").append(image).append("\n");
     sb.append("  link: ").append(link).append("\n");
     sb.append("  name: ").append(name).append("\n");

diff --git a/android/src/main/java/com/spoonacular/client/model/SearchResultDataPointsInner.java b/android/src/main/java/com/spoonacular/client/model/SearchResultDataPointsInner.java
diff --git a/angular/.openapi-generator/FILES b/angular/.openapi-generator/FILES
@@ -155,7 +155,6 @@ model/searchRestaurants200ResponseRestaurantsInnerAddress.ts
 model/searchRestaurants200ResponseRestaurantsInnerLocalHours.ts
 model/searchRestaurants200ResponseRestaurantsInnerLocalHoursOperational.ts
 model/searchResult.ts
-model/searchResultDataPointsInner.ts
 model/searchSiteContent200Response.ts
 model/summarizeRecipe200Response.ts
 model/talkToChatbot200Response.ts

diff --git a/angular/model/models.ts b/angular/model/models.ts
@@ -137,7 +137,6 @@ export * from './searchRestaurants200ResponseRestaurantsInnerAddress';
 export * from './searchRestaurants200ResponseRestaurantsInnerLocalHours';
 export * from './searchRestaurants200ResponseRestaurantsInnerLocalHoursOperational';
 export * from './searchResult';
-export * from './searchResultDataPointsInner';
 export * from './searchSiteContent200Response';
 export * from './summarizeRecipe200Response';
 export * from './talkToChatbot200Response';

diff --git a/angular/model/searchResult.ts b/angular/model/searchResult.ts
@@ -9,14 +9,12 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-import { SearchResultDataPointsInner } from './searchResultDataPointsInner';
 
 
 /**
  * 
  */
 export interface SearchResult { 
-    dataPoints?: Array<SearchResultDataPointsInner>;
     image?: string;
     link?: string | null;
     name: string;

diff --git a/angular/model/searchResultDataPointsInner.ts b/angular/model/searchResultDataPointsInner.ts
diff --git a/build.ps1 b/build.ps1
@@ -30,7 +30,7 @@ Remove-Item -Path kotlin -Recurse -Force
 Remove-Item -Path elm -Recurse -Force
 
 java -jar $GEN generate -i $SPEC -g java --enable-post-process-file --api-package com.spoonacular --artifact-version $VERSION --additional-properties "packageVersion=${VERSION},project-name=spoonacular,packageName=spoonacular" --model-package com.spoonacular.client.model  --invoker-package com.spoonacular.client --group-id com.spoonacular --git-repo-id=spoonacular-api-clients/tree/master/java/ --git-user-id=ddsky --artifact-id java-client --additional-properties hideGenerationTimestamp=true -o java -c java-config.json
-java -jar $GEN generate -i $SPEC -g javascript --artifact-version $VERSION --additional-properties projectVersion=${VERSION},projectName=spoonacular --git-repo-id=spoonacular-api-clients/tree/master/javascript/ --git-user-id=ddsky --artifact-id javascript-client -o javascript
+java -jar $GEN generate -i $SPEC -g javascript --artifact-version $VERSION --additional-properties "packageVersion=${VERSION},projectName=spoonacular" --git-repo-id=spoonacular-api-clients/tree/master/javascript/ --git-user-id=ddsky --artifact-id javascript-client -o javascript
 java -jar $GEN generate -i $SPEC -g typescript --artifact-version $VERSION --additional-properties "packageVersion=${VERSION},project-name=spoonacular,packageName=spoonacular"  --git-repo-id=spoonacular-api-clients/tree/master/typescript/ --git-user-id=ddsky --artifact-id typescript-client -o typescript
 java -jar $GEN generate -i $SPEC -g typescript-angular --artifact-version $VERSION --additional-properties "packageVersion=${VERSION},project-name=spoonacular,packageName=spoonacular"  --git-repo-id=spoonacular-api-clients/tree/master/angular/ --git-user-id=ddsky --artifact-id angular-client -o angular --additional-properties "npmName=spoonacular-angular"
 java -jar $GEN generate -i $SPEC -g android --artifact-version $VERSION --api-package com.spoonacular --model-package com.spoonacular.client.model --invoker-package com.spoonacular.client --group-id com.spoonacular --additional-properties "packageVersion=${VERSION},project-name=spoonacular,packageName=spoonacular"  --git-repo-id=spoonacular-api-clients/tree/master/android/ --git-user-id=ddsky --artifact-id android-client -o android --additional-properties "androidGradleVersion=7.4.2,useAndroidMavenGradlePlugin=false"

diff --git a/clojure/.openapi-generator/FILES b/clojure/.openapi-generator/FILES
@@ -150,7 +150,6 @@ src/spoonacular_api/specs/search_restaurants_200_response_restaurants_inner_addr
 src/spoonacular_api/specs/search_restaurants_200_response_restaurants_inner_local_hours.clj
 src/spoonacular_api/specs/search_restaurants_200_response_restaurants_inner_local_hours_operational.clj
 src/spoonacular_api/specs/search_result.clj
-src/spoonacular_api/specs/search_result_data_points_inner.clj
 src/spoonacular_api/specs/search_site_content_200_response.clj
 src/spoonacular_api/specs/summarize_recipe_200_response.clj
 src/spoonacular_api/specs/talk_to_chatbot_200_response.clj

diff --git a/clojure/src/spoonacular_api/api/default.clj b/clojure/src/spoonacular_api/api/default.clj
@@ -41,7 +41,6 @@
             [spoonacular-api.specs.get-meal-plan-template-200-response-days-inner :refer :all]
             [spoonacular-api.specs.map-ingredients-to-grocery-products-request :refer :all]
             [spoonacular-api.specs.search-all-food-200-response-search-results-inner :refer :all]
-            [spoonacular-api.specs.search-result-data-points-inner :refer :all]
             [spoonacular-api.specs.product-information :refer :all]
             [spoonacular-api.specs.search-restaurants-200-response-restaurants-inner :refer :all]
             [spoonacular-api.specs.compute-ingredient-amount-200-response :refer :all]

diff --git a/clojure/src/spoonacular_api/api/ingredients.clj b/clojure/src/spoonacular_api/api/ingredients.clj
@@ -41,7 +41,6 @@
             [spoonacular-api.specs.get-meal-plan-template-200-response-days-inner :refer :all]
             [spoonacular-api.specs.map-ingredients-to-grocery-products-request :refer :all]
             [spoonacular-api.specs.search-all-food-200-response-search-results-inner :refer :all]
-            [spoonacular-api.specs.search-result-data-points-inner :refer :all]
             [spoonacular-api.specs.product-information :refer :all]
             [spoonacular-api.specs.search-restaurants-200-response-restaurants-inner :refer :all]
             [spoonacular-api.specs.compute-ingredient-amount-200-response :refer :all]

diff --git a/clojure/src/spoonacular_api/api/meal_planning.clj b/clojure/src/spoonacular_api/api/meal_planning.clj
@@ -41,7 +41,6 @@
             [spoonacular-api.specs.get-meal-plan-template-200-response-days-inner :refer :all]
             [spoonacular-api.specs.map-ingredients-to-grocery-products-request :refer :all]
             [spoonacular-api.specs.search-all-food-200-response-search-results-inner :refer :all]
-            [spoonacular-api.specs.search-result-data-points-inner :refer :all]
             [spoonacular-api.specs.product-information :refer :all]
             [spoonacular-api.specs.search-restaurants-200-response-restaurants-inner :refer :all]
             [spoonacular-api.specs.compute-ingredient-amount-200-response :refer :all]

diff --git a/clojure/src/spoonacular_api/api/menu_items.clj b/clojure/src/spoonacular_api/api/menu_items.clj
@@ -41,7 +41,6 @@
             [spoonacular-api.specs.get-meal-plan-template-200-response-days-inner :refer :all]
             [spoonacular-api.specs.map-ingredients-to-grocery-products-request :refer :all]
             [spoonacular-api.specs.search-all-food-200-response-search-results-inner :refer :all]
-            [spoonacular-api.specs.search-result-data-points-inner :refer :all]
             [spoonacular-api.specs.product-information :refer :all]
             [spoonacular-api.specs.search-restaurants-200-response-restaurants-inner :refer :all]
             [spoonacular-api.specs.compute-ingredient-amount-200-response :refer :all]

diff --git a/clojure/src/spoonacular_api/api/misc.clj b/clojure/src/spoonacular_api/api/misc.clj
@@ -41,7 +41,6 @@
             [spoonacular-api.specs.get-meal-plan-template-200-response-days-inner :refer :all]
             [spoonacular-api.specs.map-ingredients-to-grocery-products-request :refer :all]
             [spoonacular-api.specs.search-all-food-200-response-search-results-inner :refer :all]
-            [spoonacular-api.specs.search-result-data-points-inner :refer :all]
             [spoonacular-api.specs.product-information :refer :all]
             [spoonacular-api.specs.search-restaurants-200-response-restaurants-inner :refer :all]
             [spoonacular-api.specs.compute-ingredient-amount-200-response :refer :all]

diff --git a/clojure/src/spoonacular_api/api/products.clj b/clojure/src/spoonacular_api/api/products.clj
@@ -41,7 +41,6 @@
             [spoonacular-api.specs.get-meal-plan-template-200-response-days-inner :refer :all]
             [spoonacular-api.specs.map-ingredients-to-grocery-products-request :refer :all]
             [spoonacular-api.specs.search-all-food-200-response-search-results-inner :refer :all]
-            [spoonacular-api.specs.search-result-data-points-inner :refer :all]
             [spoonacular-api.specs.product-information :refer :all]
             [spoonacular-api.specs.search-restaurants-200-response-restaurants-inner :refer :all]
             [spoonacular-api.specs.compute-ingredient-amount-200-response :refer :all]

diff --git a/clojure/src/spoonacular_api/api/recipes.clj b/clojure/src/spoonacular_api/api/recipes.clj
@@ -41,7 +41,6 @@
             [spoonacular-api.specs.get-meal-plan-template-200-response-days-inner :refer :all]
             [spoonacular-api.specs.map-ingredients-to-grocery-products-request :refer :all]
             [spoonacular-api.specs.search-all-food-200-response-search-results-inner :refer :all]
-            [spoonacular-api.specs.search-result-data-points-inner :refer :all]
             [spoonacular-api.specs.product-information :refer :all]
             [spoonacular-api.specs.search-restaurants-200-response-restaurants-inner :refer :all]
             [spoonacular-api.specs.compute-ingredient-amount-200-response :refer :all]

diff --git a/clojure/src/spoonacular_api/api/wine.clj b/clojure/src/spoonacular_api/api/wine.clj
@@ -41,7 +41,6 @@
             [spoonacular-api.specs.get-meal-plan-template-200-response-days-inner :refer :all]
             [spoonacular-api.specs.map-ingredients-to-grocery-products-request :refer :all]
             [spoonacular-api.specs.search-all-food-200-response-search-results-inner :refer :all]
-            [spoonacular-api.specs.search-result-data-points-inner :refer :all]
             [spoonacular-api.specs.product-information :refer :all]
             [spoonacular-api.specs.search-restaurants-200-response-restaurants-inner :refer :all]
             [spoonacular-api.specs.compute-ingredient-amount-200-response :refer :all]