Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d907262
Update generated files with build 1000979
Feb 14, 2019
decf5d5
Merge pull request #222 from microsoftgraph/v1.0/pipelinebuild/1000979
deepak2016 Feb 26, 2019
9c751de
Update generated files with build 1078570
Mar 12, 2019
2c700db
Merge pull request #226 from microsoftgraph/v1.0/pipelinebuild/1078570
deepak2016 Mar 13, 2019
1f5f5e3
Updated version to 1.2.0
Mar 18, 2019
0bbc495
Merge pull request #229 from microsoftgraph/version-update
NakulSabharwal Mar 18, 2019
b026900
Updated version 1.2.0 in readme
NakulSabharwal Mar 18, 2019
6700cc7
Merge pull request #230 from microsoftgraph/update-readme
NakulSabharwal Mar 18, 2019
717c95f
Update generated files with build 1122970
Mar 26, 2019
e2b3fd3
Merge pull request #235 from microsoftgraph/v1.0/pipelinebuild/1122970
deepak2016 Apr 2, 2019
1e4e077
Update generated files with build 1145804
Apr 2, 2019
1521f78
Merge pull request #238 from microsoftgraph/v1.0/pipelinebuild/1145804
NakulSabharwal Apr 25, 2019
5b63f00
Updated version to 1.3.0
Apr 26, 2019
01e31b1
Merge pull request #242 from microsoftgraph/version-update
NakulSabharwal Apr 26, 2019
e660cb5
Updated readme version 1.3.0
NakulSabharwal Apr 26, 2019
9690e30
Merge pull request #243 from microsoftgraph/version
NakulSabharwal Apr 29, 2019
f51c55b
Update generated files with build 1237799
Apr 30, 2019
2825520
Update generated files with build 1261620
May 7, 2019
65ff27d
Merge pull request #245 from microsoftgraph/v1.0/pipelinebuild/1237799
NakulSabharwal May 8, 2019
f32266b
Merge branch 'dev' into v1.0/pipelinebuild/1261620
NakulSabharwal May 8, 2019
eda89fb
Merge pull request #247 from microsoftgraph/v1.0/pipelinebuild/1261620
NakulSabharwal May 8, 2019
497cfce
Null check while creating GraphError when body is empty.
May 15, 2019
39e4534
Merge pull request #248 from microsoftgraph/emptyErrorBug
NakulSabharwal May 15, 2019
11ae2e9
Version update to 1.4.0
May 20, 2019
aaa05d1
Merge pull request #249 from microsoftgraph/version-update-may
NakulSabharwal May 20, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repository {

dependency {
// Include the sdk as a dependency
compile('com.microsoft.graph:microsoft-graph:1.1.+')
compile('com.microsoft.graph:microsoft-graph:1.3.+')
}
```

Expand All @@ -28,7 +28,7 @@ Add the dependency in `dependencies` in pom.xml
<dependency>
<groupId>com.microsoft.graph</groupId>
<artifactId>microsoft-graph</artifactId>
<version>1.1.0</version>
<version>1.3.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ mavenBintraySnapshotUrl = http://oss.jfrog.org/artifactory/oss-snapshot-local
mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph
mavenMajorVersion = 1
mavenMinorVersion = 1
mavenMinorVersion = 4
mavenPatchVersion = 0
mavenArtifactSuffix =
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/microsoft/graph/core/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ private Constants() {
public static final String APPID = "app-id";
public static final String USERNAME = "user@email.com";
public static final String PASSWORD = "password";
public static final String VERSION_NAME = "1.1.0";
public static final String VERSION_NAME = "1.4.0";
}
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,10 @@ public static <T> GraphServiceException createFromConnection(final IHttpRequest
}

final String responseMessage = connection.getResponseMessage();
final String rawOutput = DefaultHttpProvider.streamToString(connection.getInputStream());
String rawOutput = "{}";
if(connection.getInputStream() != null) {
rawOutput = DefaultHttpProvider.streamToString(connection.getInputStream());
}
GraphErrorResponse error;
try {
error = serializer.deserializeObject(rawOutput, GraphErrorResponse.class, connection.getResponseHeaders());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
// ------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
// ------------------------------------------------------------------------------

package com.microsoft.graph.models.extensions;
import com.microsoft.graph.concurrency.*;
import com.microsoft.graph.core.*;
import com.microsoft.graph.http.*;
import com.microsoft.graph.options.*;
import com.microsoft.graph.serializer.*;
import java.util.Arrays;
import java.util.EnumSet;


import com.google.gson.JsonObject;
import com.google.gson.JsonElement;
import com.google.gson.annotations.*;
import java.util.HashMap;
import java.util.Map;

// **NOTE** This file was generated by a tool and any changes will be overwritten.

/**
* The class for the Access Action.
*/
public class AccessAction implements IJsonBackedObject {

@SerializedName("@odata.type")
@Expose
public String oDataType;

private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);

@Override
public final AdditionalDataManager additionalDataManager() {
return additionalDataManager;
}


/**
* The raw representation of this class
*/
private JsonObject rawObject;

/**
* The serializer
*/
private ISerializer serializer;

/**
* Gets the raw representation of this class
*
* @return the raw representation of this class
*/
public JsonObject getRawObject() {
return rawObject;
}

/**
* Gets serializer
*
* @return the serializer
*/
protected ISerializer getSerializer() {
return serializer;
}

/**
* Sets the raw JSON object
*
* @param serializer the serializer
* @param json the JSON object to set this object to
*/
public void setRawObject(final ISerializer serializer, final JsonObject json) {
this.serializer = serializer;
rawObject = json;

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.microsoft.graph.models.extensions.CloudAppSecurityState;
import com.microsoft.graph.models.generated.AlertFeedback;
import com.microsoft.graph.models.extensions.FileSecurityState;
import com.microsoft.graph.models.extensions.AlertHistoryState;
import com.microsoft.graph.models.extensions.HostSecurityState;
import com.microsoft.graph.models.extensions.MalwareState;
import com.microsoft.graph.models.extensions.NetworkConnection;
Expand Down Expand Up @@ -161,6 +162,14 @@ public class Alert extends Entity implements IJsonBackedObject {
@Expose
public java.util.List<FileSecurityState> fileStates;

/**
* The History States.
*
*/
@SerializedName("historyStates")
@Expose
public java.util.List<AlertHistoryState> historyStates;

/**
* The Host States.
* Security-related stateful information generated by the provider about the host(s) related to this alert.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
// ------------------------------------------------------------------------------
// Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the MIT License. See License in the project root for license information.
// ------------------------------------------------------------------------------

package com.microsoft.graph.models.extensions;
import com.microsoft.graph.concurrency.*;
import com.microsoft.graph.core.*;
import com.microsoft.graph.http.*;
import com.microsoft.graph.options.*;
import com.microsoft.graph.serializer.*;
import java.util.Arrays;
import java.util.EnumSet;
import com.microsoft.graph.models.generated.AlertFeedback;
import com.microsoft.graph.models.generated.AlertStatus;


import com.google.gson.JsonObject;
import com.google.gson.JsonElement;
import com.google.gson.annotations.*;
import java.util.HashMap;
import java.util.Map;

// **NOTE** This file was generated by a tool and any changes will be overwritten.

/**
* The class for the Alert History State.
*/
public class AlertHistoryState implements IJsonBackedObject {

@SerializedName("@odata.type")
@Expose
public String oDataType;

private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);

@Override
public final AdditionalDataManager additionalDataManager() {
return additionalDataManager;
}

/**
* The App Id.
*
*/
@SerializedName("appId")
@Expose
public String appId;

/**
* The Assigned To.
*
*/
@SerializedName("assignedTo")
@Expose
public String assignedTo;

/**
* The Comments.
*
*/
@SerializedName("comments")
@Expose
public java.util.List<String> comments;

/**
* The Feedback.
*
*/
@SerializedName("feedback")
@Expose
public AlertFeedback feedback;

/**
* The Status.
*
*/
@SerializedName("status")
@Expose
public AlertStatus status;

/**
* The Updated Date Time.
*
*/
@SerializedName("updatedDateTime")
@Expose
public java.util.Calendar updatedDateTime;

/**
* The User.
*
*/
@SerializedName("user")
@Expose
public String user;


/**
* The raw representation of this class
*/
private JsonObject rawObject;

/**
* The serializer
*/
private ISerializer serializer;

/**
* Gets the raw representation of this class
*
* @return the raw representation of this class
*/
public JsonObject getRawObject() {
return rawObject;
}

/**
* Gets serializer
*
* @return the serializer
*/
protected ISerializer getSerializer() {
return serializer;
}

/**
* Sets the raw JSON object
*
* @param serializer the serializer
* @param json the JSON object to set this object to
*/
public void setRawObject(final ISerializer serializer, final JsonObject json) {
this.serializer = serializer;
rawObject = json;

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ public class AndroidCompliancePolicy extends DeviceCompliancePolicy implements I

/**
* The Password Expiration Days.
* Number of days before the password expires. Valid values 1 to 65535
* Number of days before the password expires. Valid values 1 to 365
*/
@SerializedName("passwordExpirationDays")
@Expose
public Integer passwordExpirationDays;

/**
* The Password Previous Password Block Count.
* Number of previous passwords to block.
* Number of previous passwords to block. Valid values 1 to 24
*/
@SerializedName("passwordPreviousPasswordBlockCount")
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public class AndroidGeneralDeviceConfiguration extends DeviceConfiguration imple

/**
* The Password Sign In Failure Count Before Factory Reset.
* Number of sign in failures allowed before factory reset. Valid values 4 to 11
* Number of sign in failures allowed before factory reset. Valid values 1 to 16
*/
@SerializedName("passwordSignInFailureCountBeforeFactoryReset")
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class AndroidWorkProfileCompliancePolicy extends DeviceCompliancePolicy i

/**
* The Password Previous Password Block Count.
* Number of previous passwords to block.
* Number of previous passwords to block. Valid values 1 to 24
*/
@SerializedName("passwordPreviousPasswordBlockCount")
@Expose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class AndroidWorkProfileGeneralDeviceConfiguration extends DeviceConfigur

/**
* The Password Sign In Failure Count Before Factory Reset.
* Number of sign in failures allowed before factory reset. Valid values 4 to 11
* Number of sign in failures allowed before factory reset. Valid values 1 to 16
*/
@SerializedName("passwordSignInFailureCountBeforeFactoryReset")
@Expose
Expand Down Expand Up @@ -272,7 +272,7 @@ public class AndroidWorkProfileGeneralDeviceConfiguration extends DeviceConfigur

/**
* The Work Profile Password Sign In Failure Count Before Factory Reset.
* Number of sign in failures allowed before work profile is removed and all corporate data deleted. Valid values 4 to 11
* Number of sign in failures allowed before work profile is removed and all corporate data deleted. Valid values 1 to 16
*/
@SerializedName("workProfilePasswordSignInFailureCountBeforeFactoryReset")
@Expose
Expand Down
Loading