@@ -100,24 +100,12 @@ public class DataCatalogClient implements BackgroundResource {
100100 private final DataCatalogSettings settings ;
101101 private final DataCatalogStub stub ;
102102
103- private static final PathTemplate LOCATION_PATH_TEMPLATE =
104- PathTemplate .createWithoutUrlEncoding ("projects/{project}/locations/{location}" );
105-
106103 private static final PathTemplate ENTRY_PATH_TEMPLATE =
107104 PathTemplate .createWithoutUrlEncoding (
108105 "projects/{project}/locations/{location}/entryGroups/{entry_group}/entries/{entry}" );
109106
110- /**
111- * Formats a string containing the fully-qualified path to represent a location resource.
112- *
113- * @deprecated Use the {@link LocationName} class instead.
114- */
115- @ Deprecated
116- public static final String formatLocationName (String project , String location ) {
117- return LOCATION_PATH_TEMPLATE .instantiate (
118- "project" , project ,
119- "location" , location );
120- }
107+ private static final PathTemplate LOCATION_PATH_TEMPLATE =
108+ PathTemplate .createWithoutUrlEncoding ("projects/{project}/locations/{location}" );
121109
122110 /**
123111 * Formats a string containing the fully-qualified path to represent a entry resource.
@@ -135,23 +123,15 @@ public static final String formatEntryName(
135123 }
136124
137125 /**
138- * Parses the project from the given fully-qualified path which represents a location resource.
139- *
140- * @deprecated Use the {@link LocationName} class instead.
141- */
142- @ Deprecated
143- public static final String parseProjectFromLocationName (String locationName ) {
144- return LOCATION_PATH_TEMPLATE .parse (locationName ).get ("project" );
145- }
146-
147- /**
148- * Parses the location from the given fully-qualified path which represents a location resource.
126+ * Formats a string containing the fully-qualified path to represent a location resource.
149127 *
150128 * @deprecated Use the {@link LocationName} class instead.
151129 */
152130 @ Deprecated
153- public static final String parseLocationFromLocationName (String locationName ) {
154- return LOCATION_PATH_TEMPLATE .parse (locationName ).get ("location" );
131+ public static final String formatLocationName (String project , String location ) {
132+ return LOCATION_PATH_TEMPLATE .instantiate (
133+ "project" , project ,
134+ "location" , location );
155135 }
156136
157137 /**
@@ -194,6 +174,26 @@ public static final String parseEntryFromEntryName(String entryName) {
194174 return ENTRY_PATH_TEMPLATE .parse (entryName ).get ("entry" );
195175 }
196176
177+ /**
178+ * Parses the project from the given fully-qualified path which represents a location resource.
179+ *
180+ * @deprecated Use the {@link LocationName} class instead.
181+ */
182+ @ Deprecated
183+ public static final String parseProjectFromLocationName (String locationName ) {
184+ return LOCATION_PATH_TEMPLATE .parse (locationName ).get ("project" );
185+ }
186+
187+ /**
188+ * Parses the location from the given fully-qualified path which represents a location resource.
189+ *
190+ * @deprecated Use the {@link LocationName} class instead.
191+ */
192+ @ Deprecated
193+ public static final String parseLocationFromLocationName (String locationName ) {
194+ return LOCATION_PATH_TEMPLATE .parse (locationName ).get ("location" );
195+ }
196+
197197 /** Constructs an instance of DataCatalogClient with default settings. */
198198 public static final DataCatalogClient create () throws IOException {
199199 return create (DataCatalogSettings .newBuilder ().build ());
0 commit comments