Skip to content

Commit e12e6a0

Browse files
author
Nakul Sabharwal
committed
Merge branch 'dev' of https://github.com/microsoftgraph/msgraph-sdk-java into core-integration
2 parents 4246dc8 + 39e4534 commit e12e6a0

File tree

265 files changed

+16202
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+16202
-70
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ repository {
1818
1919
dependency {
2020
// Include the sdk as a dependency
21-
compile('com.microsoft.graph:microsoft-graph:1.1.+')
21+
compile('com.microsoft.graph:microsoft-graph:1.3.+')
2222
}
2323
```
2424

@@ -28,7 +28,7 @@ Add the dependency in `dependencies` in pom.xml
2828
<dependency>
2929
<groupId>com.microsoft.graph</groupId>
3030
<artifactId>microsoft-graph</artifactId>
31-
<version>1.1.0</version>
31+
<version>1.3.0</version>
3232
</dependency>
3333
```
3434

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mavenBintraySnapshotUrl = http://oss.jfrog.org/artifactory/oss-snapshot-local
2626
mavenGroupId = com.microsoft.graph
2727
mavenArtifactId = microsoft-graph
2828
mavenMajorVersion = 1
29-
mavenMinorVersion = 1
29+
mavenMinorVersion = 3
3030
mavenPatchVersion = 0
3131
mavenArtifactSuffix =
3232
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven

‎src/main/java/com/microsoft/graph/core/Constants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ private Constants() {
1212
public static final String APPID = "app-id";
1313
public static final String USERNAME = "[email protected]";
1414
public static final String PASSWORD = "password";
15-
public static final String VERSION_NAME = "1.1.0";
15+
public static final String VERSION_NAME = "1.3.0";
1616
}

‎src/main/java/com/microsoft/graph/http/GraphServiceException.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,10 @@ public static <T> GraphServiceException createFromConnection(final IHttpRequest
313313
}
314314

315315
final String responseMessage = connection.getResponseMessage();
316-
final String rawOutput = DefaultHttpProvider.streamToString(connection.getInputStream());
316+
String rawOutput = "{}";
317+
if(connection.getInputStream() != null) {
318+
rawOutput = DefaultHttpProvider.streamToString(connection.getInputStream());
319+
}
317320
GraphErrorResponse error;
318321
try {
319322
error = serializer.deserializeObject(rawOutput, GraphErrorResponse.class, connection.getResponseHeaders());

‎src/main/java/com/microsoft/graph/models/extensions/AccessAction.java‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
// ------------------------------------------------------------------------------
2+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
3+
// ------------------------------------------------------------------------------
4+
5+
package com.microsoft.graph.models.extensions;
6+
import com.microsoft.graph.concurrency.*;
7+
import com.microsoft.graph.core.*;
8+
import com.microsoft.graph.http.*;
9+
import com.microsoft.graph.options.*;
10+
import com.microsoft.graph.serializer.*;
11+
import java.util.Arrays;
12+
import java.util.EnumSet;
13+
14+
15+
import com.google.gson.JsonObject;
16+
import com.google.gson.JsonElement;
17+
import com.google.gson.annotations.*;
18+
import java.util.HashMap;
19+
import java.util.Map;
20+
21+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
22+
23+
/**
24+
* The class for the Access Action.
25+
*/
26+
public class AccessAction implements IJsonBackedObject {
27+
28+
@SerializedName("@odata.type")
29+
@Expose
30+
public String oDataType;
31+
32+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
33+
34+
@Override
35+
public final AdditionalDataManager additionalDataManager() {
36+
return additionalDataManager;
37+
}
38+
39+
40+
/**
41+
* The raw representation of this class
42+
*/
43+
private JsonObject rawObject;
44+
45+
/**
46+
* The serializer
47+
*/
48+
private ISerializer serializer;
49+
50+
/**
51+
* Gets the raw representation of this class
52+
*
53+
* @return the raw representation of this class
54+
*/
55+
public JsonObject getRawObject() {
56+
return rawObject;
57+
}
58+
59+
/**
60+
* Gets serializer
61+
*
62+
* @return the serializer
63+
*/
64+
protected ISerializer getSerializer() {
65+
return serializer;
66+
}
67+
68+
/**
69+
* Sets the raw JSON object
70+
*
71+
* @param serializer the serializer
72+
* @param json the JSON object to set this object to
73+
*/
74+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
75+
this.serializer = serializer;
76+
rawObject = json;
77+
78+
}
79+
}

‎src/main/java/com/microsoft/graph/models/extensions/Alert.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.microsoft.graph.models.extensions.CloudAppSecurityState;
1414
import com.microsoft.graph.models.generated.AlertFeedback;
1515
import com.microsoft.graph.models.extensions.FileSecurityState;
16+
import com.microsoft.graph.models.extensions.AlertHistoryState;
1617
import com.microsoft.graph.models.extensions.HostSecurityState;
1718
import com.microsoft.graph.models.extensions.MalwareState;
1819
import com.microsoft.graph.models.extensions.NetworkConnection;
@@ -161,6 +162,14 @@ public class Alert extends Entity implements IJsonBackedObject {
161162
@Expose
162163
public java.util.List<FileSecurityState> fileStates;
163164

165+
/**
166+
* The History States.
167+
*
168+
*/
169+
@SerializedName("historyStates")
170+
@Expose
171+
public java.util.List<AlertHistoryState> historyStates;
172+
164173
/**
165174
* The Host States.
166175
* Security-related stateful information generated by the provider about the host(s) related to this alert.

‎src/main/java/com/microsoft/graph/models/extensions/AlertHistoryState.java‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
// ------------------------------------------------------------------------------
2+
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
3+
// ------------------------------------------------------------------------------
4+
5+
package com.microsoft.graph.models.extensions;
6+
import com.microsoft.graph.concurrency.*;
7+
import com.microsoft.graph.core.*;
8+
import com.microsoft.graph.http.*;
9+
import com.microsoft.graph.options.*;
10+
import com.microsoft.graph.serializer.*;
11+
import java.util.Arrays;
12+
import java.util.EnumSet;
13+
import com.microsoft.graph.models.generated.AlertFeedback;
14+
import com.microsoft.graph.models.generated.AlertStatus;
15+
16+
17+
import com.google.gson.JsonObject;
18+
import com.google.gson.JsonElement;
19+
import com.google.gson.annotations.*;
20+
import java.util.HashMap;
21+
import java.util.Map;
22+
23+
// **NOTE** This file was generated by a tool and any changes will be overwritten.
24+
25+
/**
26+
* The class for the Alert History State.
27+
*/
28+
public class AlertHistoryState implements IJsonBackedObject {
29+
30+
@SerializedName("@odata.type")
31+
@Expose
32+
public String oDataType;
33+
34+
private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
35+
36+
@Override
37+
public final AdditionalDataManager additionalDataManager() {
38+
return additionalDataManager;
39+
}
40+
41+
/**
42+
* The App Id.
43+
*
44+
*/
45+
@SerializedName("appId")
46+
@Expose
47+
public String appId;
48+
49+
/**
50+
* The Assigned To.
51+
*
52+
*/
53+
@SerializedName("assignedTo")
54+
@Expose
55+
public String assignedTo;
56+
57+
/**
58+
* The Comments.
59+
*
60+
*/
61+
@SerializedName("comments")
62+
@Expose
63+
public java.util.List<String> comments;
64+
65+
/**
66+
* The Feedback.
67+
*
68+
*/
69+
@SerializedName("feedback")
70+
@Expose
71+
public AlertFeedback feedback;
72+
73+
/**
74+
* The Status.
75+
*
76+
*/
77+
@SerializedName("status")
78+
@Expose
79+
public AlertStatus status;
80+
81+
/**
82+
* The Updated Date Time.
83+
*
84+
*/
85+
@SerializedName("updatedDateTime")
86+
@Expose
87+
public java.util.Calendar updatedDateTime;
88+
89+
/**
90+
* The User.
91+
*
92+
*/
93+
@SerializedName("user")
94+
@Expose
95+
public String user;
96+
97+
98+
/**
99+
* The raw representation of this class
100+
*/
101+
private JsonObject rawObject;
102+
103+
/**
104+
* The serializer
105+
*/
106+
private ISerializer serializer;
107+
108+
/**
109+
* Gets the raw representation of this class
110+
*
111+
* @return the raw representation of this class
112+
*/
113+
public JsonObject getRawObject() {
114+
return rawObject;
115+
}
116+
117+
/**
118+
* Gets serializer
119+
*
120+
* @return the serializer
121+
*/
122+
protected ISerializer getSerializer() {
123+
return serializer;
124+
}
125+
126+
/**
127+
* Sets the raw JSON object
128+
*
129+
* @param serializer the serializer
130+
* @param json the JSON object to set this object to
131+
*/
132+
public void setRawObject(final ISerializer serializer, final JsonObject json) {
133+
this.serializer = serializer;
134+
rawObject = json;
135+
136+
}
137+
}

‎src/main/java/com/microsoft/graph/models/extensions/AndroidCompliancePolicy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ public class AndroidCompliancePolicy extends DeviceCompliancePolicy implements I
6363

6464
/**
6565
* The Password Expiration Days.
66-
* Number of days before the password expires. Valid values 1 to 65535
66+
* Number of days before the password expires. Valid values 1 to 365
6767
*/
6868
@SerializedName("passwordExpirationDays")
6969
@Expose
7070
public Integer passwordExpirationDays;
7171

7272
/**
7373
* The Password Previous Password Block Count.
74-
* Number of previous passwords to block.
74+
* Number of previous passwords to block. Valid values 1 to 24
7575
*/
7676
@SerializedName("passwordPreviousPasswordBlockCount")
7777
@Expose

‎src/main/java/com/microsoft/graph/models/extensions/AndroidGeneralDeviceConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public class AndroidGeneralDeviceConfiguration extends DeviceConfiguration imple
233233

234234
/**
235235
* The Password Sign In Failure Count Before Factory Reset.
236-
* Number of sign in failures allowed before factory reset. Valid values 4 to 11
236+
* Number of sign in failures allowed before factory reset. Valid values 1 to 16
237237
*/
238238
@SerializedName("passwordSignInFailureCountBeforeFactoryReset")
239239
@Expose

‎src/main/java/com/microsoft/graph/models/extensions/AndroidWorkProfileCompliancePolicy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class AndroidWorkProfileCompliancePolicy extends DeviceCompliancePolicy i
7171

7272
/**
7373
* The Password Previous Password Block Count.
74-
* Number of previous passwords to block.
74+
* Number of previous passwords to block. Valid values 1 to 24
7575
*/
7676
@SerializedName("passwordPreviousPasswordBlockCount")
7777
@Expose

0 commit comments

Comments
 (0)