Merge pull request #190 from BingAds/v13.0.20.2

V13.0.20.2
BingAds · May 9, 2024 · f7989fc · f7989fc
2 parents e66576e + dc3114d
commit f7989fc
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 58 deletions.
diff --git a/README.md b/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.20.1</version>
+  <version>13.0.20.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/).
diff --git a/examples/BingAdsDesktopApp/pom.xml b/examples/BingAdsDesktopApp/pom.xml
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>com.microsoft.bingads</groupId>
             <artifactId>microsoft.bingads</artifactId>
-            <version>13.0.20.1</version>
+            <version>13.0.20.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/examples/BingAdsDesktopApp/pom_for_java1.8.xml b/examples/BingAdsDesktopApp/pom_for_java1.8.xml
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>com.microsoft.bingads</groupId>
             <artifactId>microsoft.bingads</artifactId>
-            <version>13.0.20.1</version>
+            <version>13.0.20.2</version>
   			<exclusions>
                 <!-- Exclude CXF, which does not support Java 8 -->
                 <exclusion>

diff --git a/pom.xml b/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.20.1</version>
+    <version>13.0.20.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>

diff --git a/src/main/java/com/microsoft/bingads/internal/ServiceFactoryImpl.java b/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.20.1";
+    public static final String VERSION = "13.0.20.2";
 
     private static final int DEFAULT_WS_CREATE_TIMEOUT_IN_SECOND = 60;
 

diff --git a/src/main/java/com/microsoft/bingads/internal/restful/adaptor/CalendarDeserializer.java b/src/main/java/com/microsoft/bingads/internal/restful/adaptor/CalendarDeserializer.java
@@ -1,23 +1,11 @@
 package com.microsoft.bingads.internal.restful.adaptor;
 
 import java.io.IOException;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.Instant;
 import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 
@@ -35,29 +23,7 @@ public CalendarDeserializer(Class<?> t) {
 
     @Override
 	public Calendar deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-    	String str = p.getText();
-    	str = str.replaceAll("\\.\\d+", "");
-    	try {
-    		String dateTime = str.substring(0, 19); //yyyy-MM-ddTHH:mm:ss
-        	String zone = str.length() > 19 ? str.substring(19, str.length()) : null;
-    		Calendar calendar = Calendar.getInstance();
-    		TimeZone timeZone = TimeZone.getTimeZone("UTC");
-    		if (zone == null || zone.contains("Z")) {
-    			calendar.setTimeZone(timeZone);
-    		}
-    		else if (zone != null && (zone.contains("+") || zone.contains("-"))) {
-    			timeZone = TimeZone.getTimeZone("GMT" + zone.substring(0, 3));
-
-    		}
-    		formatter.setTimeZone(timeZone);
-			calendar.setTimeZone(timeZone);
-    		Date date = formatter.parse(dateTime);
-    		calendar.setTime(date);
-            return calendar;
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-
+    	return jakarta.xml.bind.DatatypeConverter.parseDate(p.getText());
 	}
 
 }
diff --git a/src/main/java/com/microsoft/bingads/internal/restful/adaptor/CalendarSerializer.java b/src/main/java/com/microsoft/bingads/internal/restful/adaptor/CalendarSerializer.java
@@ -3,23 +3,10 @@
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
+
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
 
@@ -37,9 +24,6 @@ public CalendarSerializer(Class t) {
 
 	@Override
 	public void serialize(Calendar value, JsonGenerator gen, SerializerProvider provider) throws IOException {
-		formatter.setTimeZone(value.getTimeZone());
-		String zone = value.getTimeZone().getID().replaceAll("GMT", "").replaceAll("UTC", "");
-		Date date = value.getTime();
-		gen.writeString(formatter.format(value.getTime()) + zone);
+		gen.writeString(jakarta.xml.bind.DatatypeConverter.printDateTime(value));
 	}
 }