Merge pull request #296 from microsoftgraph/dev

baywet · web-flow · commit 412abea1ef77 · 2020-09-18T13:57:31.000-04:00
master updates
diff --git a/Templates/Java/models_extensions/BaseEntity.java.tt b/Templates/Java/models_extensions/BaseEntity.java.tt
@@ -7,11 +7,11 @@
 <#=host.CreatePackageDefForEntity()#>
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
+<# if(((OdcmClass)c).IsOpen && !((OdcmClass)c).Properties.Any()) { #>
 import java.util.HashMap;
-import java.util.Map;
+<# } #>
 
 <#=TypeHelperJava.CreateClassDef(c.TypeName(), c.BaseClassName(), "IJsonBackedObject")#>
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Call.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Call.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/CloudCommunications.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/CloudCommunications.java
@@ -18,11 +18,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/DerivedComplexTypeRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/DerivedComplexTypeRequest.java
@@ -13,11 +13,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EmptyBaseComplexTypeRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EmptyBaseComplexTypeRequest.java
@@ -11,11 +11,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EmptyComplexType.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EmptyComplexType.java
@@ -11,11 +11,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Endpoint.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Endpoint.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Entity.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Entity.java
@@ -11,11 +11,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EntityType2.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EntityType2.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EntityType3.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/EntityType3.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Identity.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Identity.java
@@ -11,11 +11,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/IdentitySet.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/IdentitySet.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/OnenotePage.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/OnenotePage.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/PlannerGroup.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/PlannerGroup.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Recipient.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Recipient.java
@@ -11,11 +11,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/ResponseObject.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/ResponseObject.java
@@ -11,11 +11,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Schedule.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/Schedule.java
@@ -18,11 +18,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/SingletonEntity1.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/SingletonEntity1.java
@@ -13,11 +13,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/SingletonEntity2.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/SingletonEntity2.java
@@ -13,11 +13,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/TestEntity.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/TestEntity.java
@@ -15,11 +15,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/TestType.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/TestType.java
@@ -13,11 +13,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/TimeOff.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/TimeOff.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/TimeOffRequest.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph/models/extensions/TimeOffRequest.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/CallRecord.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/CallRecord.java
@@ -21,11 +21,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/ClientUserAgent.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/ClientUserAgent.java
@@ -14,11 +14,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/DeviceInfo.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/DeviceInfo.java
@@ -11,11 +11,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Endpoint.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Endpoint.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/FailureInfo.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/FailureInfo.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/FeedbackTokenSet.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/FeedbackTokenSet.java
@@ -11,11 +11,9 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
 import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Media.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Media.java
@@ -14,11 +14,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/MediaStream.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/MediaStream.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/NetworkInfo.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/NetworkInfo.java
@@ -14,11 +14,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Option.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Option.java
@@ -12,11 +12,8 @@
 
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.annotations.Expose;
-import java.util.HashMap;
-import java.util.Map;
 
 // **NOTE** This file was generated by a tool and any changes will be overwritten.
 
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/ParticipantEndpoint.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/ParticipantEndpoint.java
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Photo.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Photo.java
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Segment.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Segment.java
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/ServiceEndpoint.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/ServiceEndpoint.java
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/ServiceUserAgent.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/ServiceUserAgent.java
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Session.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/Session.java
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/SingletonEntity1.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/SingletonEntity1.java
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/UserAgent.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/UserAgent.java
diff --git a/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/UserFeedback.java b/test/Typewriter.Test/TestDataJava/com/microsoft/graph2/callrecords/models/extensions/UserFeedback.java
