Skip to content

Commit ba2f93e

Browse files
authored
Merge pull request #32 from microsoftgraph/feature/2-3-0-updates
feature/2 3 0 updates
2 parents 1f1c398 + d05bdc5 commit ba2f93e

File tree

9,003 files changed

+39753
-54362
lines changed

Some content is hidden

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

9,003 files changed

+39753
-54362
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,3 @@ updates:
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 10
8-
- package-ecosystem: maven
9-
directory: "/"
10-
schedule:
11-
interval: daily
12-
open-pull-requests-limit: 10

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ hs_err_pid*
3333
/target/
3434
/pom.xml
3535
local.properties
36+
.idea

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"java.configuration.updateBuildConfiguration": "automatic"
2+
"java.configuration.updateBuildConfiguration": "automatic",
3+
"git.ignoreLimitWarning": true
34
}

build.gradle

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ plugins {
1616
id 'com.jfrog.bintray' version '1.8.5'
1717
}
1818

19+
java {
20+
modularity.inferModulePath = true
21+
}
22+
1923
// In this section you declare where to find the dependencies of your project
2024
repositories {
2125
// Use jcenter for resolving your dependencies.
@@ -31,12 +35,12 @@ dependencies {
3135
// Use JUnit test framework
3236
testImplementation 'junit:junit:4.13'
3337

34-
implementation 'com.google.code.gson:gson:2.8.6'
38+
api 'com.google.code.gson:gson:2.8.6'
3539

3640
implementation 'com.squareup.okhttp3:okhttp:3.12.1'
3741

3842
// Core Http library
39-
implementation 'com.microsoft.graph:microsoft-graph-core:1.0.5'
43+
api 'com.microsoft.graph:microsoft-graph-core:1.0.5'
4044
}
4145

4246
def pomConfig = {
@@ -54,12 +58,20 @@ def pomConfig = {
5458
//Maven Central Release: publishMavenCentralReleasePublicationToMaven2Repository
5559
//Bintray Snapshot: publishSnapshotPublicationToMaven3Repository
5660

61+
tasks.jar {
62+
manifest {
63+
attributes('Automatic-Module-Name': project.property('mavenGroupId'))
64+
}
65+
}
66+
5767
task sourceJar(type: Jar) {
68+
outputs.cacheIf { true }
5869
from sourceSets.main.allJava
5970
archiveClassifier = 'sources'
6071
}
6172

6273
task javadocJar(type: Jar, dependsOn: javadoc) {
74+
outputs.cacheIf { true }
6375
from javadoc.destinationDir
6476
archiveClassifier = 'javadoc'
6577
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
# The size of the library demands a large amount of RAM to build. Increase as necessary if you get GC errors
2121
## linux requires 10G, OSX requires 11G
2222
org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx2g
23+
org.gradle.parallel=true
2324
org.gradle.caching=true
2425

2526
mavenGroupId = com.microsoft.graph
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626

2727
/**
2828
* Provides authentication for a requests before it is sent by an HTTP provider
29+
* @deprecated use ICoreAuthenticationProvider instead
2930
*/
31+
@Deprecated
3032
public interface IAuthenticationProvider {
3133

3234
/**

src/main/java/com/microsoft/graph/callrecords/models/extensions/CallRecord.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110
import com.microsoft.graph.callrecords.models.generated.Modality;
1211
import com.microsoft.graph.models.extensions.IdentitySet;
1312
import com.microsoft.graph.callrecords.models.generated.CallType;
1413
import com.microsoft.graph.callrecords.models.extensions.Session;
1514
import com.microsoft.graph.models.extensions.Entity;
16-
import com.microsoft.graph.callrecords.requests.extensions.SessionCollectionResponse;
1715
import com.microsoft.graph.callrecords.requests.extensions.SessionCollectionPage;
1816

1917

@@ -150,19 +148,7 @@ public void setRawObject(final ISerializer serializer, final JsonObject json) {
150148

151149

152150
if (json.has("sessions")) {
153-
final SessionCollectionResponse response = new SessionCollectionResponse();
154-
if (json.has("sessions@odata.nextLink")) {
155-
response.nextLink = json.get("sessions@odata.nextLink").getAsString();
156-
}
157-
158-
final JsonObject[] sourceArray = serializer.deserializeObject(json.get("sessions").toString(), JsonObject[].class);
159-
final Session[] array = new Session[sourceArray.length];
160-
for (int i = 0; i < sourceArray.length; i++) {
161-
array[i] = serializer.deserializeObject(sourceArray[i].toString(), Session.class);
162-
array[i].setRawObject(serializer, sourceArray[i]);
163-
}
164-
response.value = Arrays.asList(array);
165-
sessions = new SessionCollectionPage(response, null);
151+
sessions = serializer.deserializeObject(json.get("sessions").toString(), SessionCollectionPage.class);
166152
}
167153
}
168154
}

src/main/java/com/microsoft/graph/callrecords/models/extensions/ClientUserAgent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110
import com.microsoft.graph.callrecords.models.generated.ClientPlatform;
1211
import com.microsoft.graph.callrecords.models.generated.ProductFamily;

src/main/java/com/microsoft/graph/callrecords/models/extensions/DeviceInfo.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.microsoft.graph.serializer.ISerializer;
77
import com.microsoft.graph.serializer.IJsonBackedObject;
88
import com.microsoft.graph.serializer.AdditionalDataManager;
9-
import java.util.Arrays;
109
import java.util.EnumSet;
1110

1211

0 commit comments

Comments
 (0)