-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from microsoftgraph/feature/v1.0-fixes-updates
- syncs bugfixes from v1 2.1.0
- Loading branch information
Showing
26 changed files
with
581 additions
and
124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,5 +28,7 @@ private Constants() { | |
| public static final String APPID = "app-id"; | ||
| public static final String USERNAME = "[email protected]"; | ||
| public static final String PASSWORD = "password"; | ||
| public static final String TENANTID = "tenantid"; | ||
| public static final String CLIENTSECRET = "clientsecret"; | ||
| public static final String VERSION_NAME = "0.1.0"; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
src/main/java/com/microsoft/graph/serializer/AttachmentCollectionPageSerializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| // ------------------------------------------------------------------------------ | ||
| // Copyright (c) 2017 Microsoft Corporation | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sub-license, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
| // ------------------------------------------------------------------------------ | ||
|
|
||
| package com.microsoft.graph.serializer; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import com.google.gson.JsonArray; | ||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.JsonObject; | ||
| import com.google.gson.JsonParseException; | ||
| import com.google.gson.JsonParser; | ||
| import com.microsoft.graph.logger.ILogger; | ||
| import com.microsoft.graph.models.extensions.Attachment; | ||
| import com.microsoft.graph.requests.extensions.AttachmentCollectionPage; | ||
| import com.microsoft.graph.requests.extensions.AttachmentCollectionResponse; | ||
|
|
||
| public class AttachmentCollectionPageSerializer { | ||
|
|
||
| private static DefaultSerializer serializer; | ||
|
|
||
| /** | ||
| * Not available for instantiation | ||
| */ | ||
| private AttachmentCollectionPageSerializer() { | ||
| } | ||
|
|
||
| /** | ||
| * Serializes an AttachmentCollectionPage | ||
| * | ||
| * @param src the AttachmentCollectionPage variable for serialization | ||
| * @param logger the logger | ||
| * @return JsonElement of AttachmentCollectionPage | ||
| */ | ||
| public static JsonElement serialize(final AttachmentCollectionPage src, final ILogger logger) { | ||
| if(src == null) { | ||
| return null; | ||
| } | ||
| JsonArray jsonArray = new JsonArray(); | ||
| List<Attachment> attachments = src.getCurrentPage(); | ||
| serializer = new DefaultSerializer(logger); | ||
| String json; | ||
| JsonObject jsonObject; | ||
| for(Attachment attachment : attachments) { | ||
| jsonObject = new JsonObject(); | ||
| json = serializer.serializeObject(attachment); | ||
| jsonObject = (JsonObject)JsonParser.parseString(json); | ||
| jsonArray.add(jsonObject); | ||
| } | ||
| return jsonArray; | ||
| } | ||
|
|
||
| /** | ||
| * Deserializes the JsonElement | ||
| * | ||
| * @param json the source AttachmentCollectionPage's Json | ||
| * @param logger the logger | ||
| * @throws JsonParseException the parse exception | ||
| * @return the deserialized AttachmentCollectionPage | ||
| */ | ||
| public static AttachmentCollectionPage deserialize(final JsonElement json, final ILogger logger) throws JsonParseException { | ||
| if (json == null) { | ||
| return null; | ||
| } | ||
| final AttachmentCollectionResponse response = new AttachmentCollectionResponse(); | ||
| serializer = new DefaultSerializer(logger); | ||
| final JsonObject[] sourceArray = serializer.deserializeObject(json.toString(), JsonObject[].class); | ||
| final Attachment[] array = new Attachment[sourceArray.length]; | ||
| for (int i = 0; i < sourceArray.length; i++) { | ||
| array[i] = serializer.deserializeObject(sourceArray[i].toString(), Attachment.class); | ||
| array[i].setRawObject(serializer, sourceArray[i]); | ||
| } | ||
| response.value = Arrays.asList(array); | ||
| return new AttachmentCollectionPage(response, null); | ||
| } | ||
| } |
Oops, something went wrong.