From 4e339c31a200d0648f1fdf82ae10b09114c93b93 Mon Sep 17 00:00:00 2001
From: twilio-dx <team_interfaces+github@twilio.com>
Date: Tue, 1 Jul 2025 16:30:09 +0530
Subject: [PATCH 1/2] chore: fix double encoding of path params in case of
 phone number format

---
 src/main/resources/twilio-java/generate_uri.mustache | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/resources/twilio-java/generate_uri.mustache b/src/main/resources/twilio-java/generate_uri.mustache
index 6ff4664d9..d13772007 100644
--- a/src/main/resources/twilio-java/generate_uri.mustache
+++ b/src/main/resources/twilio-java/generate_uri.mustache
@@ -12,10 +12,5 @@
     {{/vendorExtensions.x-is-account-sid}}
 {{/allParams}}
 {{#requiredParams}}
-    {{#vendorExtensions.x-is-phone-number-format}}
-        path = path.replace("{"+"{{baseName}}"+"}", this.{{paramName}}.encode("utf-8"));
-    {{/vendorExtensions.x-is-phone-number-format}}
-    {{^vendorExtensions.x-is-phone-number-format}}
         path = path.replace("{"+"{{baseName}}"+"}", this.{{paramName}}.toString());
-    {{/vendorExtensions.x-is-phone-number-format}}
 {{/requiredParams}}

From afcc585e1c73339dcdc771435391b04cf30e3c8c Mon Sep 17 00:00:00 2001
From: manisha1997 <singhmanisha.250025@gmail.com>
Date: Wed, 2 Jul 2025 16:02:19 +0530
Subject: [PATCH 2/2] chore: remove redundant code

---
 src/main/resources/twilio-java/generate_uri.mustache | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/twilio-java/generate_uri.mustache b/src/main/resources/twilio-java/generate_uri.mustache
index d13772007..b74368824 100644
--- a/src/main/resources/twilio-java/generate_uri.mustache
+++ b/src/main/resources/twilio-java/generate_uri.mustache
@@ -11,6 +11,8 @@
         path = path.replace("{"+"{{baseName}}"+"}", this.{{paramName}}.toString());
     {{/vendorExtensions.x-is-account-sid}}
 {{/allParams}}
-{{#requiredParams}}
-        path = path.replace("{"+"{{baseName}}"+"}", this.{{paramName}}.toString());
-{{/requiredParams}}
+{{#pathParams}}
+  {{^vendorExtensions.x-is-account-sid}}
+        path = path.replace("{"+"{{baseName}}"+"}", this.path{{baseName}}.toString());
+  {{/vendorExtensions.x-is-account-sid}}
+{{/pathParams}}