Add constants for OkHttp @Named qualifier strings (#22379)

Introduce `OkHttpClientQualifiers` object with constants for all OkHttp
client dependency injection qualifiers. This replaces hardcoded strings
like `@Named("regular")` with type-safe constants like
`@Named(OkHttpClientQualifiers.REGULAR)`.

Changes:
- Add `OkHttpClientQualifiers.kt` with constants for all qualifier strings
- Update ~90 files to use full qualifiers instead of string literals
- Add required imports to all affected Java and Kotlin files

Author: oguzkocer

WordPress/src/main/java/org/wordpress/android/AppInitializer.kt

@@ -117,6 +117,7 @@ import java.io.File
 import java.io.IOException
 import java.net.CookieManager
 import java.util.Date
+import org.wordpress.android.fluxc.module.OkHttpClientQualifiers
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
@@ -209,7 +210,7 @@ class AppInitializer @Inject constructor(
     lateinit var tracker: Tracker
 
     @Inject
-    @Named("custom-ssl")
+    @Named(OkHttpClientQualifiers.CUSTOM_SSL)
     lateinit var requestQueue: RequestQueue
 
     @Inject

WordPress/src/main/java/org/wordpress/android/auth/WordPressCookieAuthenticator.kt

@@ -15,6 +15,7 @@ import okhttp3.Response
 import org.wordpress.android.fluxc.utils.PreferenceUtils.PreferenceUtilsWrapper
 import org.wordpress.android.util.AppLog
 import java.io.IOException
+import org.wordpress.android.fluxc.module.OkHttpClientQualifiers
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
@@ -30,7 +31,7 @@ import androidx.core.content.edit
  */
 @Singleton
 class WordPressCookieAuthenticator @Inject constructor(
-    @Named("regular") private val okHttpClient: OkHttpClient,
+    @Named(OkHttpClientQualifiers.REGULAR) private val okHttpClient: OkHttpClient,
     @Named("IO_THREAD") private val ioDispatcher: CoroutineDispatcher,
     private val preferenceUtils: PreferenceUtilsWrapper
 ) {

WordPress/src/main/java/org/wordpress/android/modules/WordPressGlideModule.kt

@@ -14,6 +14,7 @@ import org.wordpress.android.networking.GlideMShotsLoader
 import org.wordpress.android.networking.GlideRequestFactory
 import org.wordpress.android.networking.MShot
 import java.io.InputStream
+import org.wordpress.android.fluxc.module.OkHttpClientQualifiers
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -24,11 +25,11 @@ import javax.inject.Named
 @GlideModule
 class WordPressGlideModule : AppGlideModule() {
     @Inject
-    @Named("custom-ssl-custom-redirects")
+    @Named(OkHttpClientQualifiers.CUSTOM_SSL_CUSTOM_REDIRECTS)
     lateinit var requestQueue: RequestQueue
 
     @Inject
-    @Named("no-redirects")
+    @Named(OkHttpClientQualifiers.NO_REDIRECTS)
     lateinit var noRedirectsRequestQueue: RequestQueue
 
     @Inject

WordPress/src/main/java/org/wordpress/android/support/he/util/TempAttachmentsUtil.kt

@@ -12,13 +12,14 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import java.io.File
 import java.util.concurrent.TimeUnit
+import org.wordpress.android.fluxc.module.OkHttpClientQualifiers
 import javax.inject.Inject
 import javax.inject.Named
 import kotlin.collections.forEach
 
 class TempAttachmentsUtil @Inject constructor(
     @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher,
-    @Named("regular") private val okHttpClient: OkHttpClient,
+    @Named(OkHttpClientQualifiers.REGULAR) private val okHttpClient: OkHttpClient,
     private val appLogWrapper: AppLogWrapper,
     private val application: Application,
     private val accountStore: AccountStore

WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderWebView.java

@@ -20,6 +20,7 @@
 import org.wordpress.android.WordPress;
 import org.wordpress.android.fluxc.network.UserAgent;
 import org.wordpress.android.fluxc.store.AccountStore;
+import org.wordpress.android.fluxc.module.OkHttpClientQualifiers;
 import org.wordpress.android.ui.WPWebView;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.UrlUtils;
@@ -86,7 +87,7 @@ public interface ReaderWebViewPageFinishedListener {
 
     @Inject UserAgent mUserAgent;
     @Inject AccountStore mAccountStore;
-    @Inject @Named("regular") OkHttpClient mOkHttpClient;
+    @Inject @Named(OkHttpClientQualifiers.REGULAR) OkHttpClient mOkHttpClient;
 
     public ReaderWebView(Context context) {
         super(context);

WordPress/src/main/java/org/wordpress/android/util/WPWebViewClient.java

@@ -10,6 +10,7 @@
 import org.wordpress.android.WordPress;
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.fluxc.network.MemorizingTrustManager;
+import org.wordpress.android.fluxc.module.OkHttpClientQualifiers;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -40,7 +41,7 @@ public class WPWebViewClient extends URLFilteredWebViewClient {
     private final SiteModel mSite;
     private String mToken;
     @Inject protected MemorizingTrustManager mMemorizingTrustManager;
-    @Inject @Named("regular") protected OkHttpClient mOkHttpClient;
+    @Inject @Named(OkHttpClientQualifiers.REGULAR) protected OkHttpClient mOkHttpClient;
 
     public WPWebViewClient(SiteModel site, String token, List<String> urls,
                            ErrorManagedWebViewClientListener listener) {

libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/OkHttpClientModule.java

@@ -30,27 +30,27 @@
 public abstract class OkHttpClientModule {
     @Singleton
     @Provides
-    @Named("no-cookies")
+    @Named(OkHttpClientQualifiers.NO_COOKIES)
     public static OkHttpClient provideNoCookiesOkHttpClientBuilder(
-            @Named("regular") final OkHttpClient okHttpRegularClient) {
+            @Named(OkHttpClientQualifiers.REGULAR) final OkHttpClient okHttpRegularClient) {
         return okHttpRegularClient.newBuilder()
                                   .cookieJar(CookieJar.NO_COOKIES)
                                   .build();
     }
 
     @Provides
-    @Named("no-redirects")
+    @Named(OkHttpClientQualifiers.NO_REDIRECTS)
     public static OkHttpClient provideNoRedirectsOkHttpClientBuilder(
-            @Named("custom-ssl") final OkHttpClient okHttpRegularClient) {
+            @Named(OkHttpClientQualifiers.CUSTOM_SSL) final OkHttpClient okHttpRegularClient) {
         return okHttpRegularClient.newBuilder()
                                   .followRedirects(false)
                                   .build();
     }
 
     @Provides
-    @Named("custom-ssl-custom-redirects")
+    @Named(OkHttpClientQualifiers.CUSTOM_SSL_CUSTOM_REDIRECTS)
     public static OkHttpClient provideCustomRedirectsOkHttpClientBuilder(
-            @Named("custom-ssl") final OkHttpClient okHttpRegularClient) {
+            @Named(OkHttpClientQualifiers.CUSTOM_SSL) final OkHttpClient okHttpRegularClient) {
         OkHttpClient.Builder builder = okHttpRegularClient.newBuilder().followRedirects(false);
         CustomRedirectInterceptor customRedirectInterceptor = new CustomRedirectInterceptor();
         builder.addInterceptor(customRedirectInterceptor);
@@ -59,9 +59,9 @@ public static OkHttpClient provideCustomRedirectsOkHttpClientBuilder(
 
     @Singleton
     @Provides
-    @Named("custom-ssl")
+    @Named(OkHttpClientQualifiers.CUSTOM_SSL)
     public static OkHttpClient provideMediaOkHttpClientInstanceCustomSSL(
-            @Named("regular") final OkHttpClient okHttpClient,
+            @Named(OkHttpClientQualifiers.REGULAR) final OkHttpClient okHttpClient,
             final MemorizingTrustManager memorizingTrustManager) {
         final OkHttpClient.Builder builder = okHttpClient.newBuilder();
         try {
@@ -76,17 +76,21 @@ public static OkHttpClient provideMediaOkHttpClientInstanceCustomSSL(
         return builder.build();
     }
 
-    @Multibinds abstract @Named("interceptors") Set<Interceptor> interceptorSet();
+    @Multibinds
+    @Named(OkHttpClientQualifiers.INTERCEPTORS)
+    abstract Set<Interceptor> interceptorSet();
 
-    @Multibinds abstract @Named("network-interceptors") Set<Interceptor> networkInterceptorSet();
+    @Multibinds
+    @Named(OkHttpClientQualifiers.NETWORK_INTERCEPTORS)
+    abstract Set<Interceptor> networkInterceptorSet();
 
     @Singleton
     @Provides
-    @Named("regular")
+    @Named(OkHttpClientQualifiers.REGULAR)
     public static OkHttpClient provideMediaOkHttpClientInstance(
             final CookieJar cookieJar,
-            @Named("interceptors") Set<Interceptor> interceptors,
-            @Named("network-interceptors") Set<Interceptor> networkInterceptors) {
+            @Named(OkHttpClientQualifiers.INTERCEPTORS) Set<Interceptor> interceptors,
+            @Named(OkHttpClientQualifiers.NETWORK_INTERCEPTORS) Set<Interceptor> networkInterceptors) {
         final OkHttpClient.Builder builder = new OkHttpClient.Builder();
 
         for (Interceptor interceptor : interceptors) {

libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/OkHttpClientQualifiers.kt

@@ -0,0 +1,17 @@
+package org.wordpress.android.fluxc.module
+
+/**
+ * Constants for @Named qualifiers used with OkHttpClient and RequestQueue dependency injection.
+ *
+ * These constants should be used instead of hardcoded strings to prevent typos
+ * and enable easier refactoring.
+ */
+object OkHttpClientQualifiers {
+    const val REGULAR = "regular"
+    const val CUSTOM_SSL = "custom-ssl"
+    const val NO_REDIRECTS = "no-redirects"
+    const val NO_COOKIES = "no-cookies"
+    const val CUSTOM_SSL_CUSTOM_REDIRECTS = "custom-ssl-custom-redirects"
+    const val INTERCEPTORS = "interceptors"
+    const val NETWORK_INTERCEPTORS = "network-interceptors"
+}

libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/ReleaseNetworkModule.java

@@ -56,43 +56,46 @@ private RequestQueue createRequestQueue(Network network, Context appContext) {
     }
 
     @Singleton
-    @Named("regular")
+    @Named(OkHttpClientQualifiers.REGULAR)
     @Provides
-    public RequestQueue provideRequestQueue(@Named("regular") OkHttpClient okHttpClient,
+    public RequestQueue provideRequestQueue(@Named(OkHttpClientQualifiers.REGULAR) OkHttpClient okHttpClient,
                                             Context appContext) {
         return newRequestQueue(okHttpClient, appContext);
     }
 
     @Singleton
-    @Named("no-redirects")
+    @Named(OkHttpClientQualifiers.NO_REDIRECTS)
     @Provides
-    public RequestQueue provideNoRedirectsRequestQueue(@Named("no-redirects") OkHttpClient okHttpClient,
-                                                       Context appContext) {
+    public RequestQueue provideNoRedirectsRequestQueue(
+            @Named(OkHttpClientQualifiers.NO_REDIRECTS) OkHttpClient okHttpClient,
+            Context appContext) {
         return newRetryOnRedirectRequestQueue(okHttpClient, appContext);
     }
 
     @Singleton
-    @Named("custom-ssl")
+    @Named(OkHttpClientQualifiers.CUSTOM_SSL)
     @Provides
-    public RequestQueue provideRequestQueueCustomSSL(@Named("custom-ssl") OkHttpClient okHttpClient,
-                                                     Context appContext) {
+    public RequestQueue provideRequestQueueCustomSSL(
+            @Named(OkHttpClientQualifiers.CUSTOM_SSL) OkHttpClient okHttpClient,
+            Context appContext) {
         return newRequestQueue(okHttpClient, appContext);
     }
 
     @Singleton
-    @Named("custom-ssl-custom-redirects")
+    @Named(OkHttpClientQualifiers.CUSTOM_SSL_CUSTOM_REDIRECTS)
     @Provides
     public RequestQueue provideRequestQueueCustomSSLWithRedirects(
-            @Named("custom-ssl-custom-redirects") OkHttpClient okHttpClient,
+            @Named(OkHttpClientQualifiers.CUSTOM_SSL_CUSTOM_REDIRECTS) OkHttpClient okHttpClient,
             Context appContext) {
         return newRequestQueue(okHttpClient, appContext);
     }
 
     @Singleton
-    @Named("no-cookies")
+    @Named(OkHttpClientQualifiers.NO_COOKIES)
     @Provides
-    public RequestQueue provideRequestQueueNoCookies(@Named("no-cookies") OkHttpClient okHttpClient,
-                                                     Context appContext) {
+    public RequestQueue provideRequestQueueNoCookies(
+            @Named(OkHttpClientQualifiers.NO_COOKIES) OkHttpClient okHttpClient,
+            Context appContext) {
         return newRequestQueue(okHttpClient, appContext);
     }
 

libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/discovery/DiscoveryWPAPIRestClient.java

@@ -12,6 +12,7 @@
 import org.wordpress.android.fluxc.network.rest.wpapi.BaseWPAPIRestClient;
 import org.wordpress.android.fluxc.network.rest.wpapi.OnWPAPIErrorListener;
 import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIGsonRequest;
+import org.wordpress.android.fluxc.module.OkHttpClientQualifiers;
 import org.wordpress.android.util.AppLog;
 
 import java.util.List;
@@ -30,7 +31,7 @@
 public class DiscoveryWPAPIRestClient extends BaseWPAPIRestClient {
     @Inject public DiscoveryWPAPIRestClient(
             Dispatcher dispatcher,
-            @Named("custom-ssl") RequestQueue requestQueue,
+            @Named(OkHttpClientQualifiers.CUSTOM_SSL) RequestQueue requestQueue,
             UserAgent userAgent) {
         super(dispatcher, requestQueue, userAgent);
     }