Skip to content

Commit

Permalink
Merge pull request #1440 from microsoftgraph/v1.0/pipelinebuild/114201
Browse files Browse the repository at this point in the history
Generated  models and request builders
  • Loading branch information
ramsessanchez authored May 12, 2023
2 parents 5bb65a7 + aab2dd5 commit ac9c75c
Show file tree
Hide file tree
Showing 40 changed files with 1,147 additions and 57 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

## [5.57.0] - 2023-05-12

### Added

- CrossTenantUserSyncInbound model.
- CrossTenantIdentitySyncPolicyPartner model and related requests.
- The following models have been added to the externalConnectors namespace:
- ActivitySettings
- DisplayTemplate
- ItemIdResolver
- PropertyRule
- RuleOperation
- SearchSettings
- UrlMatchInfo
- UrlToItemResolverBase.

## [5.56.0] - 2023-05-03

### Added
Expand Down
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:5.56.0'
implementation 'com.microsoft.graph:microsoft-graph:5.57.0'
// Uncomment the line below if you are building an android application
//implementation 'com.google.guava:guava:30.1.1-android'
// This dependency is only needed if you are using the TokenCrendentialAuthProvider
Expand All @@ -36,7 +36,7 @@ Add the dependency in `dependencies` in pom.xml
<!-- Include the sdk as a dependency -->
<groupId>com.microsoft.graph</groupId>
<artifactId>microsoft-graph</artifactId>
<version>5.56.0</version>
<version>5.57.0</version>
</dependency>
<dependency>
<!-- This dependency is only needed if you are using the TokenCredentialAuthProvider -->
Expand Down Expand Up @@ -187,5 +187,6 @@ 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 @@ -26,7 +26,7 @@ org.gradle.caching=true
mavenGroupId = com.microsoft.graph
mavenArtifactId = microsoft-graph
mavenMajorVersion = 5
mavenMinorVersion = 56
mavenMinorVersion = 57
mavenPatchVersion = 0
mavenArtifactSuffix =

Expand Down Expand Up @@ -110,5 +110,6 @@ mavenCentralPublishingEnabled=false






Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// 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.externalconnectors.models;
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.http.BaseCollectionPage;
import com.microsoft.graph.externalconnectors.models.UrlToItemResolverBase;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;

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

/**
* The class for the Activity Settings.
*/
public class ActivitySettings implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
public String oDataType;

private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);

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

/**
* The Url To Item Resolvers.
* Specifies configurations to identify an externalItem based on a shared URL.
*/
@SerializedName(value = "urlToItemResolvers", alternate = {"UrlToItemResolvers"})
@Expose
@Nullable
public java.util.List<UrlToItemResolverBase> urlToItemResolvers;


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

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// 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.externalconnectors.models;
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.http.BaseCollectionPage;
import com.microsoft.graph.externalconnectors.models.PropertyRule;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;

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

/**
* The class for the Display Template.
*/
public class DisplayTemplate implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
public String oDataType;

private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);

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

/**
* The Id.
* The text identifier for the display template; for example, contosoTickets. Maximum 16 characters. Only alphanumeric characters allowed.
*/
@SerializedName(value = "id", alternate = {"Id"})
@Expose
@Nullable
public String id;

/**
* The Layout.
* The definition of the content's appearance, represented by an Adaptive Card, which is a JSON-serialized card object model.
*/
@SerializedName(value = "layout", alternate = {"Layout"})
@Expose
@Nullable
public com.google.gson.JsonElement layout;

/**
* The Priority.
* Defines the priority of a display template. A display template with priority 1 is evaluated before a template with priority 4. Gaps in priority values are supported. Must be positive value.
*/
@SerializedName(value = "priority", alternate = {"Priority"})
@Expose
@Nullable
public Integer priority;

/**
* The Rules.
* Specifies additional rules for selecting this display template based on the item schema. Optional.
*/
@SerializedName(value = "rules", alternate = {"Rules"})
@Expose
@Nullable
public java.util.List<PropertyRule> rules;


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

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
import com.microsoft.graph.serializer.AdditionalDataManager;
import java.util.EnumSet;
import com.microsoft.graph.http.BaseCollectionPage;
import com.microsoft.graph.externalconnectors.models.ActivitySettings;
import com.microsoft.graph.externalconnectors.models.Configuration;
import com.microsoft.graph.externalconnectors.models.SearchSettings;
import com.microsoft.graph.externalconnectors.models.ConnectionState;
import com.microsoft.graph.externalconnectors.models.Schema;
import com.microsoft.graph.models.Entity;
Expand All @@ -32,6 +34,15 @@
public class ExternalConnection extends Entity implements IJsonBackedObject {


/**
* The Activity Settings.
* Collects configurable settings related to activities involving connector content.
*/
@SerializedName(value = "activitySettings", alternate = {"ActivitySettings"})
@Expose
@Nullable
public ActivitySettings activitySettings;

/**
* The Configuration.
* Specifies additional application IDs that are allowed to manage the connection and to index content in the connection. Optional.
Expand Down Expand Up @@ -59,6 +70,15 @@ public class ExternalConnection extends Entity implements IJsonBackedObject {
@Nullable
public String name;

/**
* The Search Settings.
* The settings configuring the search experience for content in this connection, such as the display templates for search results.
*/
@SerializedName(value = "searchSettings", alternate = {"SearchSettings"})
@Expose
@Nullable
public SearchSettings searchSettings;

/**
* The State.
* Indicates the current state of the connection. Possible values are: draft, ready, obsolete, limitExceeded, unknownFutureValue.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// 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.externalconnectors.models;
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.externalconnectors.models.UrlMatchInfo;
import com.microsoft.graph.externalconnectors.models.UrlToItemResolverBase;


import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.google.gson.annotations.Expose;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;

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

/**
* The class for the Item Id Resolver.
*/
public class ItemIdResolver extends UrlToItemResolverBase implements IJsonBackedObject {


/**
* The Item Id.
* Pattern that specifies how to form the ID of the external item that the URL represents. The named groups from the regular expression in urlPattern within the urlMatchInfo can be referenced by inserting the group name inside curly brackets.
*/
@SerializedName(value = "itemId", alternate = {"ItemId"})
@Expose
@Nullable
public String itemId;

/**
* The Url Match Info.
* Configurations to match and resolve URL.
*/
@SerializedName(value = "urlMatchInfo", alternate = {"UrlMatchInfo"})
@Expose
@Nullable
public UrlMatchInfo urlMatchInfo;


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

}
}
Loading

0 comments on commit ac9c75c

Please sign in to comment.