Merge pull request #217 from BingAds/v13.0.24.1

v13.0.24.1

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</version>
+  <version>13.0.24.1</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</version>
+    <version>13.0.24.1</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/internal/ServiceFactoryImpl.java

@@ -27,7 +27,7 @@
 
 public class ServiceFactoryImpl implements ServiceFactory {
 
-    public static final String VERSION = "13.0.24";
+    public static final String VERSION = "13.0.24.1";
 
     private static final int DEFAULT_WS_CREATE_TIMEOUT_IN_SECOND = 60;
 

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

@@ -1423,7 +1423,7 @@ public void accept(String v, BulkCampaign c) {
                         if (setting == null) {
                             return;
                         }
-                        ((NewCustomerAcquisitionGoalSetting)setting).setNewCustomerAcquisitionGoalId(v == null ? null : Long.parseLong(v));
+                        ((NewCustomerAcquisitionGoalSetting)setting).setNewCustomerAcquisitionGoalId(v == null || v.isEmpty() ? null : Long.parseLong(v));
                     }
                 }
         ));

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

@@ -50,6 +50,8 @@
  */
 public class BulkKeyword extends SingleRecordBulkEntity {
 
+    private Long campaignId;
+	
     private Long adGroupId;
 
     private Keyword keyword;
@@ -81,6 +83,26 @@ public void accept(String v, BulkKeyword c) {
                     }
                 }
         ));
+        
+        m.add(new SimpleBulkMapping<BulkKeyword, Long>(StringTable.CampaignId,
+                new Function<BulkKeyword, Long>() {
+                    @Override
+                    public Long apply(BulkKeyword c) {
+                        return c.getCampaignId();
+                    }
+                },
+                new BiConsumer<String, BulkKeyword>() {
+                    @Override
+                    public void accept(String v, BulkKeyword c) {
+                        c.setCampaignId(StringExtensions.<Long>parseOptional(v, new Function<String, Long>() {
+                            @Override
+                            public Long apply(String value) {
+                                return Long.parseLong(value);
+                            }
+                        }));
+                    }
+                }
+        ));
 
         m.add(new SimpleBulkMapping<BulkKeyword, Long>(StringTable.ParentId,
                 new Function<BulkKeyword, Long>() {
@@ -487,6 +509,28 @@ public void writeAdditionalData(BulkObjectWriter writer) throws IOException {
             BulkKeywordBidSuggestion.writeIfNotNull(getBidSuggestions().getFirstPage(), writer);
         }
     }
+    
+    /**
+     * Gets the identifier of the campaign that contains the keyword.
+     *
+     * <p>
+     *     Corresponds to the 'Campaign Id' field in the bulk file.
+     * </p>
+     */
+    public Long getCampaignId() {
+        return campaignId;
+    }
+
+    /**
+     * Sets the identifier of the ad group that contains the keyword.
+     *
+     * <p>
+     *     Corresponds to the 'Campaign Id' field in the bulk file.
+     * </p>
+     */
+    public void setCampaignId(Long campaignId) {
+        this.campaignId = campaignId;
+    }
 
     /**
      * Gets the identifier of the ad group that contains the keyword.

src/test/java/com/microsoft/bingads/v13/api/test/entities/campaign/read/BulkCampaignReadFromRowValuesNewCustomerAcquisitionGoalSettingsTest.java

@@ -49,11 +49,18 @@ public static Collection<Object[]> data() {
         setting2.setNewCustomerAcquisitionBidOnlyMode(true);
         setting2.setNewCustomerAcquisitionGoalId(Long.MAX_VALUE);
         setting2.setType("NewCustomerAcquisitionGoalSetting");
+        
+        NewCustomerAcquisitionGoalSetting setting3 = new NewCustomerAcquisitionGoalSetting();
+        setting3.setAdditionalConversionValue(null);
+        setting3.setNewCustomerAcquisitionBidOnlyMode(false);
+        setting3.setNewCustomerAcquisitionGoalId(null);
+        setting3.setType("NewCustomerAcquisitionGoalSetting");
 
         return Arrays.asList(
                 new Object[][]{
                         {"PerformanceMax", "123.45", "false", "123", Collections.singletonList(setting1)},
                         {"PerformanceMax", "123.45", "true", "9223372036854775807", Collections.singletonList(setting2)},
+                        {"PerformanceMax", "", "", "", Collections.singletonList(setting3)}
                 }
         );
     }

src/test/java/com/microsoft/bingads/v13/api/test/entities/keyword/read/BulkKeywordReadFromRowValuesCampaignIdTest.java

@@ -0,0 +1,35 @@
+package com.microsoft.bingads.v13.api.test.entities.keyword.read;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import com.microsoft.bingads.internal.functionalinterfaces.Function;
+import com.microsoft.bingads.v13.api.test.entities.keyword.BulkKeywordTest;
+import com.microsoft.bingads.v13.bulk.entities.BulkKeyword;
+
+public class BulkKeywordReadFromRowValuesCampaignIdTest extends BulkKeywordTest {
+
+    @Parameter(value = 1)
+    public Long expectedResult;
+
+    @Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+            {"123", 123L},
+            {"9223372036854775807", 9223372036854775807L},});
+    }
+
+    @Test
+    public void testRead() {
+        this.<Long>testReadProperty("Campaign Id", this.datum, this.expectedResult, new Function<BulkKeyword, Long>() {
+            @Override
+            public Long apply(BulkKeyword c) {
+                return c.getCampaignId();
+            }
+        });
+    }
+}

src/test/java/com/microsoft/bingads/v13/api/test/entities/keyword/read/BulkKeywordReadTests.java

@@ -20,7 +20,8 @@
     BulkKeywordReadFromRowValuesStatusTest.class,
     BulkKeywordReadFromRowValuesTextTest.class,
     BulkKeywordReadFromRowValuesBidStrategyTypeTest.class,
-	BulkKeywordReadFromRowValuesFinalUrlSuffixTest.class})
+	BulkKeywordReadFromRowValuesFinalUrlSuffixTest.class,
+	BulkKeywordReadFromRowValuesCampaignIdTest.class})
 public class BulkKeywordReadTests {
 
 }

src/test/java/com/microsoft/bingads/v13/api/test/entities/keyword/write/BulkKeywordWriteTests.java

@@ -16,7 +16,8 @@
     BulkKeywordWriteToRowValuesStatusTest.class,
     BulkKeywordWriteToRowValuesTextTest.class,
     BulkKeywordWriteToRowValuesBidStrategyTypeTest.class,
-	BulkKeywordWriteToRowValuesFinalUrlSuffixTest.class})
+	BulkKeywordWriteToRowValuesFinalUrlSuffixTest.class,
+	BulkKeywordWriteToRowValuesCampaignIdTest.class})
 public class BulkKeywordWriteTests {
 
 }

src/test/java/com/microsoft/bingads/v13/api/test/entities/keyword/write/BulkKeywordWriteToRowValuesCampaignIdTest.java

@@ -0,0 +1,39 @@
+package com.microsoft.bingads.v13.api.test.entities.keyword.write;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import com.microsoft.bingads.internal.functionalinterfaces.BiConsumer;
+import com.microsoft.bingads.v13.api.test.entities.keyword.BulkKeywordTest;
+import com.microsoft.bingads.v13.bulk.entities.BulkKeyword;
+
+@RunWith(Parameterized.class)
+public class BulkKeywordWriteToRowValuesCampaignIdTest extends BulkKeywordTest {
+
+    @Parameter(value = 1)
+    public Long propertyValue;
+
+    @Parameters
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+            {"123", 123L},
+            {"9223372036854775807", 9223372036854775807L}
+        });
+    }
+
+    @Test
+    public void testWrite() {
+        this.<Long>testWriteProperty("Campaign Id", this.datum, this.propertyValue, new BiConsumer<BulkKeyword, Long>() {
+            @Override
+            public void accept(BulkKeyword c, Long v) {
+                c.setCampaignId(v);
+            }
+        });
+    }
+}