Merge pull request #72 from microsoftgraph/java7

Target Java 7

Author: Caitlin Bales (MSFT)

build.gradle

@@ -1,9 +1,9 @@
-/*
+-/*
  * This build file was generated by the Gradle 'init' task.
  *
  * This generated file contains a sample Java Library project to get you started.
  * For more details take a look at the Java Libraries chapter in the Gradle
- * user guide available at https://docs.gradle.org/3.5/userguide/java_library_plugin.html
+ * user guide available at https://docs.gradle.org/4.5/userguide/java_library_plugin.html
  */
 
 // Apply the java-library plugin to add support for Java Library
@@ -25,7 +25,7 @@ dependencies {
     api 'org.apache.commons:commons-math3:3.6.1'
 
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation 'com.google.guava:guava:21.0'
+    implementation 'com.google.guava:guava:20.0'
 
     // Use JUnit test framework
     testImplementation 'junit:junit:4.12'
@@ -35,25 +35,39 @@ dependencies {
     compile 'com.sun.jersey:jersey-server:1.19.4'
 }
 
+
 publishing {
+
     publications {
+
         maven(MavenPublication) {
+
             groupId 'com.microsoft.graph'
+
             artifactId 'microsoft-graph'
-            version '0.1-SNAPSHOT'
+
+            version '${mavenMajorVersion}.${mavenMinorVersion}-SNAPSHOT'
 
             from components.java
-            
+
             artifact sourceJar
+
         }
+
     }
+
 }
 
 task sourceJar(type: Jar) {
   classifier = 'sources'
   from sourceSets.main.allJava
 }
 
+compileJava {
+  sourceCompatibility = 1.7
+  targetCompatibility = 1.7
+}
+
 def getVersionCode() {
     return mavenMajorVersion.toInteger() * 10000 + mavenMinorVersion.toInteger() * 100 + mavenPatchVersion.toInteger()
 }

src/main/java/com/microsoft/graph/serializer/ByteArraySerializer.java

@@ -22,9 +22,8 @@
 
 package com.microsoft.graph.serializer;
 
-import java.util.Base64;
-import java.util.Base64.Decoder;
-import java.util.Base64.Encoder;
+import com.google.common.io.BaseEncoding;
+
 import java.text.ParseException;
 
 /**
@@ -46,8 +45,7 @@ private ByteArraySerializer() {
      * @throws ParseException if there is any problem processing the value
      */
     public static byte[] deserialize(final String strVal) throws ParseException {
-    	Decoder base64Decoder = Base64.getDecoder();
-    	return base64Decoder.decode(strVal);
+    	return BaseEncoding.base64().decode(strVal);
     }
 
     /**
@@ -57,7 +55,6 @@ public static byte[] deserialize(final String strVal) throws ParseException {
      * @return    the string
      */
     public static String serialize(final byte[] src) {
-    	Encoder base64Encoder = Base64.getEncoder();
-        return base64Encoder.encodeToString(src);
+        return BaseEncoding.base64().encode(src);
     }
 }

src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java

@@ -159,7 +159,7 @@ private JsonObject getChildAdditionalData(IJsonBackedObject serializableObject,
 					Iterator<Entry<String, Object>> it = serializableChildren.entrySet().iterator();
 
 					while (it.hasNext()) {
-						HashMap.Entry<String, Object> pair = (HashMap.Entry<String, Object>)it.next();
+						Map.Entry<String, Object> pair = (Map.Entry<String, Object>)it.next();
 						Object child = pair.getValue();
 
 						// If the item is a valid Graph object, add its additional data

src/test/java/com/microsoft/graph/functional/SharePointTests.java

@@ -10,7 +10,6 @@
 import org.junit.*;
 import static org.junit.Assert.*;
 
-import java.util.Base64;
 import java.util.LinkedList;
 import java.util.List;
 

src/test/java/com/microsoft/graph/functional/WebhooksTests.java

@@ -6,7 +6,6 @@
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-import java.util.Base64;
 import java.util.Calendar;
 
 @Ignore