Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {

dependencies {
// Include the sdk as a dependency
implementation 'com.microsoft.graph:microsoft-graph:2.7.0'
implementation 'com.microsoft.graph:microsoft-graph:2.7.1'
}
```

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

Expand Down Expand Up @@ -118,3 +118,4 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the [MI




3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph
mavenMajorVersion = 2
mavenMinorVersion = 7
mavenPatchVersion = 0
mavenPatchVersion = 1
mavenArtifactSuffix =

#These values are used to run functional tests
Expand All @@ -44,3 +44,4 @@ mavenCentralPublishingEnabled=false




11 changes: 6 additions & 5 deletions src/main/java/com/microsoft/graph/core/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public final class Constants {
private Constants() {
}

public static final String APPROOT = "approot";
/**
* The content type header
Expand All @@ -18,20 +18,21 @@ private Constants() {
*/
public static final String JSON_CONTENT_TYPE = "application/json";
/**
* The binary content type header's value
* The binary content type header's value
*/
public static final String BINARY_CONTENT_TYPE = "application/octet-stream";

// Constants for functional tests
// TO-DO: document how to register an application for functional
// TO-DO: document how to register an application for functional
// testing purposes
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 TENANTID = "tenantid";
public static final String CLIENTSECRET = "clientsecret";
public static final String VERSION_NAME = "2.7.0";
public static final String VERSION_NAME = "2.7.1";
}




Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ public class Application extends DirectoryObject implements IJsonBackedObject {

/**
* The Owners.
* Directory objects that are owners of the application. The owners are a set of non-admin users who are allowed to modify this object. Requires version 2013-11-08 or newer. Read-only. Nullable.
* Directory objects that are owners of the application. Read-only. Nullable.
*/
public DirectoryObjectCollectionPage owners;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
// Template Source: BaseEntity.java.tt
// ------------------------------------------------------------------------------
// 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.serializer.ISerializer;
import com.microsoft.graph.serializer.IJsonBackedObject;
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;
import com.microsoft.graph.models.extensions.Fido2AuthenticationMethod;
import com.microsoft.graph.models.extensions.AuthenticationMethod;
import com.microsoft.graph.models.extensions.MicrosoftAuthenticatorAuthenticationMethod;
import com.microsoft.graph.models.extensions.WindowsHelloForBusinessAuthenticationMethod;
import com.microsoft.graph.models.extensions.Entity;
import com.microsoft.graph.requests.extensions.Fido2AuthenticationMethodCollectionPage;
import com.microsoft.graph.requests.extensions.AuthenticationMethodCollectionPage;
import com.microsoft.graph.requests.extensions.MicrosoftAuthenticatorAuthenticationMethodCollectionPage;
import com.microsoft.graph.requests.extensions.WindowsHelloForBusinessAuthenticationMethodCollectionPage;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;

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

/**
* The class for the Authentication.
*/
public class Authentication extends Entity implements IJsonBackedObject {


/**
* The Fido2Methods.
*
*/
@SerializedName(value = "fido2Methods", alternate = {"Fido2Methods"})
@Expose
public Fido2AuthenticationMethodCollectionPage fido2Methods;

/**
* The Methods.
*
*/
@SerializedName(value = "methods", alternate = {"Methods"})
@Expose
public AuthenticationMethodCollectionPage methods;

/**
* The Microsoft Authenticator Methods.
*
*/
@SerializedName(value = "microsoftAuthenticatorMethods", alternate = {"MicrosoftAuthenticatorMethods"})
@Expose
public MicrosoftAuthenticatorAuthenticationMethodCollectionPage microsoftAuthenticatorMethods;

/**
* The Windows Hello For Business Methods.
*
*/
@SerializedName(value = "windowsHelloForBusinessMethods", alternate = {"WindowsHelloForBusinessMethods"})
@Expose
public WindowsHelloForBusinessAuthenticationMethodCollectionPage windowsHelloForBusinessMethods;


/**
* 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;


if (json.has("fido2Methods")) {
fido2Methods = serializer.deserializeObject(json.get("fido2Methods").toString(), Fido2AuthenticationMethodCollectionPage.class);
}

if (json.has("methods")) {
methods = serializer.deserializeObject(json.get("methods").toString(), AuthenticationMethodCollectionPage.class);
}

if (json.has("microsoftAuthenticatorMethods")) {
microsoftAuthenticatorMethods = serializer.deserializeObject(json.get("microsoftAuthenticatorMethods").toString(), MicrosoftAuthenticatorAuthenticationMethodCollectionPage.class);
}

if (json.has("windowsHelloForBusinessMethods")) {
windowsHelloForBusinessMethods = serializer.deserializeObject(json.get("windowsHelloForBusinessMethods").toString(), WindowsHelloForBusinessAuthenticationMethodCollectionPage.class);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// Template Source: BaseEntity.java.tt
// ------------------------------------------------------------------------------
// 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.serializer.ISerializer;
import com.microsoft.graph.serializer.IJsonBackedObject;
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;
import com.microsoft.graph.models.extensions.Entity;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;

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

/**
* The class for the Authentication Method.
*/
public class AuthenticationMethod extends Entity implements IJsonBackedObject {



/**
* 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
@@ -0,0 +1,75 @@
// Template Source: BaseEntity.java.tt
// ------------------------------------------------------------------------------
// 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.serializer.ISerializer;
import com.microsoft.graph.serializer.IJsonBackedObject;
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;
import com.microsoft.graph.models.generated.AuthenticationMethodState;
import com.microsoft.graph.models.extensions.Entity;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;

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

/**
* The class for the Authentication Method Configuration.
*/
public class AuthenticationMethodConfiguration extends Entity implements IJsonBackedObject {


/**
* The State.
*
*/
@SerializedName(value = "state", alternate = {"State"})
@Expose
public AuthenticationMethodState state;


/**
* 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;

}
}
Loading