Merge pull request #218 from BingAds/v13.0.24.2

v13.0.24.2

Author: xinyuwen2

README.md

@@ -16,7 +16,7 @@ The Bing Ads Java SDK includes and depends on the microsoft.bingads Maven artifa
 <dependency>
   <groupId>com.microsoft.bingads</groupId>
   <artifactId>microsoft.bingads</artifactId>
-  <version>13.0.24.1</version>
+  <version>13.0.24.2</version>
 </dependency>
 ```
 If you are not using a Maven project, you must include the correct version of each dependency. You can review the complete list of Bing Ads Java SDK dependencies at the [Maven Repository](http://mvnrepository.com/artifact/com.microsoft.bingads/microsoft.bingads/).

pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.microsoft.bingads</groupId>
-    <version>13.0.24.1</version>
+    <version>13.0.24.2</version>
     <name>Bing Ads Java SDK</name>
     <description>The Bing Ads Java SDK is a library improving developer experience when working with the Bing Ads services by providing high-level access to features such as Bulk API, OAuth Authorization and SOAP API.</description>
     <url>https://github.com/BingAds/BingAds-Java-SDK</url>

src/main/java/com/microsoft/bingads/RestfulServiceFactory.java

@@ -8,6 +8,7 @@
 import com.microsoft.bingads.internal.restful.BulkService;
 import com.microsoft.bingads.internal.restful.CustomerManagementService;
 import com.microsoft.bingads.internal.restful.CustomerBillingService;
+import com.microsoft.bingads.internal.IRestfulServiceFactory;
 import com.microsoft.bingads.internal.restful.AdInsightService;
 import com.microsoft.bingads.v13.bulk.IBulkService;
 import com.microsoft.bingads.v13.campaignmanagement.ICampaignManagementService;
@@ -16,9 +17,9 @@
 import com.microsoft.bingads.v13.customerbilling.ICustomerBillingService;
 import com.microsoft.bingads.v13.adinsight.IAdInsightService;
 
-public class RestfulServiceFactory {
+public class RestfulServiceFactory implements IRestfulServiceFactory {
 
-    public static <T> T createServiceClient(Map<String, String> headers, ApiEnvironment environment, Class<T> serviceInterface, Supplier<T> createSoapPort) {
+    public <T> T createServiceClient(Map<String, String> headers, ApiEnvironment environment, Class<T> serviceInterface, Supplier<T> createSoapPort) {
         if (serviceInterface == ICampaignManagementService.class) {
             return serviceInterface.cast(new CampaignManagementService(headers, environment, () -> (ICampaignManagementService)createSoapPort.get()));
         }

src/main/java/com/microsoft/bingads/ServiceClient.java

@@ -11,10 +11,12 @@
 import jakarta.xml.ws.handler.PortInfo;
 
 import com.microsoft.bingads.internal.HeaderHandler;
+import com.microsoft.bingads.internal.IRestfulServiceFactory;
 import com.microsoft.bingads.internal.MessageHandler;
 import com.microsoft.bingads.internal.OAuthWithAuthorizationCode;
 import com.microsoft.bingads.internal.ServiceFactory;
 import com.microsoft.bingads.internal.ServiceFactoryFactory;
+import com.microsoft.bingads.internal.RestfulServiceFactoryFactory;
 import com.microsoft.bingads.internal.ServiceUtils;
 import com.microsoft.bingads.internal.utilities.Lazy;
 import com.microsoft.bingads.v13.adinsight.IAdInsightService;
@@ -47,6 +49,7 @@ public class ServiceClient<T> {
 
     private final Class<T> serviceInterface;
     private final ServiceFactory serviceFactory;
+    private final IRestfulServiceFactory restfulServiceFactory;
     private ApiEnvironment environment;
     private final Lazy<Service> service;
 
@@ -106,6 +109,8 @@ public ServiceClient(AuthorizationData authorizationData, ApiEnvironment environ
         this.environment = environment;
 
         serviceFactory = ServiceFactoryFactory.createServiceFactory();
+        
+        restfulServiceFactory = RestfulServiceFactoryFactory.createServiceFactory();
 
         service = new Lazy<Service>(() -> {
             Service newService = serviceFactory.createService(this.serviceInterface, this.environment);
@@ -172,6 +177,6 @@ T createSoapPort(Map<String, String> headers) {
     }
 
     T createRestService(Map<String, String> headers) {        
-        return RestfulServiceFactory.createServiceClient(headers, environment, serviceInterface, () -> createSoapPort(headers));
+        return restfulServiceFactory.createServiceClient(headers, environment, serviceInterface, () -> createSoapPort(headers));
     }
 }

src/main/java/com/microsoft/bingads/internal/IRestfulServiceFactory.java

@@ -0,0 +1,11 @@
+package com.microsoft.bingads.internal;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+import com.microsoft.bingads.ApiEnvironment;
+
+public interface IRestfulServiceFactory {
+    
+	<T> T createServiceClient(Map<String, String> headers, ApiEnvironment environment, Class<T> serviceInterface, Supplier<T> createSoapPort);
+}

src/main/java/com/microsoft/bingads/internal/RestfulServiceFactoryFactory.java

@@ -0,0 +1,21 @@
+package com.microsoft.bingads.internal;
+
+import com.microsoft.bingads.RestfulServiceFactory;
+import com.microsoft.bingads.internal.functionalinterfaces.Supplier;
+
+public class RestfulServiceFactoryFactory {
+    
+    private static Supplier<IRestfulServiceFactory> customServiceFactorySupplier;
+    
+    public static Supplier<IRestfulServiceFactory> getCustomServiceFactorySupplier() {
+        return customServiceFactorySupplier;
+    }
+    
+    public static void setCustomServiceFactorySupplier(Supplier<IRestfulServiceFactory> value) {
+        customServiceFactorySupplier = value;
+    }
+    
+    public static IRestfulServiceFactory createServiceFactory() {        
+        return customServiceFactorySupplier == null ? new RestfulServiceFactory() : customServiceFactorySupplier.get();
+    }
+}

src/main/java/com/microsoft/bingads/internal/ServiceUtils.java

@@ -10,6 +10,9 @@
 
 import com.microsoft.bingads.ApiEnvironment;
 import com.microsoft.bingads.InternalException;
+import com.microsoft.bingads.v13.bulk.IBulkService;
+import com.microsoft.bingads.v13.campaignmanagement.ICampaignManagementService;
+import com.microsoft.bingads.v13.reporting.IReportingService;
 
 /**
  * Reserved for internal use. 
@@ -105,6 +108,13 @@ public static boolean getEnableRestApi() {
     }
 
     public static boolean getDisableRestApi(Class<?> serviceInterface) {
+    	if (serviceInterface == ICampaignManagementService.class ||
+    		serviceInterface == IBulkService.class ||
+    		serviceInterface == IReportingService.class)
+    	{
+    		return false;
+    	}
+    	
         String propertyValue = getPropertyValue(serviceInterface.getSimpleName() + ".DisableRestApi");
 
         if (propertyValue == null) {

src/main/java/com/microsoft/bingads/v13/bulk/entities/BulkKeyword.java

@@ -50,7 +50,7 @@
  */
 public class BulkKeyword extends SingleRecordBulkEntity {
 
-    private Long campaignId;
+	private Long campaignId;
 
     private Long adGroupId;
 

src/test/java/com/microsoft/bingads/v13/api/test/operations/FakeApiTest.java

@@ -16,27 +16,29 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import com.microsoft.bingads.internal.IRestfulServiceFactory;
+import com.microsoft.bingads.internal.RestfulServiceFactoryFactory;
 import com.microsoft.bingads.internal.ServiceFactory;
 import com.microsoft.bingads.internal.ServiceFactoryFactory;
 import com.microsoft.bingads.internal.functionalinterfaces.Supplier;
 
 public class FakeApiTest {   
     @Before
-    public void setUp() {        
-        System.setProperty("com.microsoft.bingads.ICampaignManagementService.DisableRestApi", "true");
-        System.setProperty("com.microsoft.bingads.IBulkService.DisableRestApi", "true");
-        System.setProperty("com.microsoft.bingads.IReportingService.DisableRestApi", "true");
-        System.setProperty("com.microsoft.bingads.ICustomerManagementService.DisableRestApi", "true");
-        System.setProperty("com.microsoft.bingads.ICustomerBillingService.DisableRestApi", "true");
-        System.setProperty("com.microsoft.bingads.IAdInsightService.DisableRestApi", "true");
-
+    public void setUp() {
         ServiceFactoryFactory.setCustomServiceFactorySupplier(new Supplier<ServiceFactory>() {
             @Override
             public ServiceFactory get() {
                 return new FakeServiceFactory();
             }
         });
 
+        RestfulServiceFactoryFactory.setCustomServiceFactorySupplier(new Supplier<IRestfulServiceFactory>() {
+            @Override
+            public IRestfulServiceFactory get() {
+                return new FakeServiceFactory();
+            }
+        });
+        
         FakeBulkService.reset();
     }
 

src/test/java/com/microsoft/bingads/v13/api/test/operations/FakeBulkService.java

@@ -12,9 +12,11 @@
 import jakarta.xml.ws.EndpointReference;
 import jakarta.xml.ws.Response;
 
+import com.microsoft.bingads.ApiEnvironment;
 import com.microsoft.bingads.internal.ServiceUtils;
 import com.microsoft.bingads.internal.functionalinterfaces.Consumer;
 import com.microsoft.bingads.internal.functionalinterfaces.Supplier;
+import com.microsoft.bingads.internal.restful.BulkService;
 import com.microsoft.bingads.v13.bulk.AdApiFaultDetail_Exception;
 import com.microsoft.bingads.v13.bulk.ApiFaultDetail_Exception;
 import com.microsoft.bingads.v13.bulk.DownloadCampaignsByAccountIdsRequest;
@@ -31,9 +33,14 @@
 import com.microsoft.bingads.v13.bulk.UploadEntityRecordsRequest;
 import com.microsoft.bingads.v13.bulk.UploadEntityRecordsResponse;
 
-public class FakeBulkService implements IBulkService, BindingProvider {
+public class FakeBulkService extends BulkService implements IBulkService, BindingProvider {
 
-    private static Consumer<GetBulkDownloadStatusRequest> onGetBulkDownloadStatus;
+    public FakeBulkService(Map<String, String> headers, ApiEnvironment env,
+			java.util.function.Supplier<IBulkService> fallbackService) {
+		super(headers, env, fallbackService);
+	}
+
+	private static Consumer<GetBulkDownloadStatusRequest> onGetBulkDownloadStatus;
     private static Supplier<GetBulkDownloadStatusResponse> getBulkDownloadStatusResponse;    
 
     private static Supplier<GetBulkUploadStatusResponse> getBulkUploadStatusResponse;