Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
2c5146d
demonstration of BaseRequest generic type
davidmoten Feb 8, 2018
90ae368
remove super change
davidmoten Feb 8, 2018
2fd03be
remove cast
davidmoten Feb 8, 2018
dbfc57e
update javadoc of BaseRequest with generic type
davidmoten Feb 8, 2018
415da5d
demo change to BaseCollectionRequest
davidmoten Aug 23, 2018
55e4732
more demo changes
davidmoten Aug 23, 2018
e246eea
Merge branch 'feature/v3' into demo-fix-collection-typing
baywet Oct 7, 2020
3f5d2f7
Merge branch 'feature/v3' into demo-fix-collection-typing
baywet Oct 7, 2020
27d47b0
Merge branch 'feature/v3' into demo-fix-collection-typing
baywet Oct 8, 2020
03b978c
Merge branch 'base-request-generic-type' into demo-fix-collection-typing
baywet Oct 8, 2020
c49b963
- updates models for genericity
baywet Oct 9, 2020
b7a75a0
- adds new generic infrastructure
baywet Oct 9, 2020
3e8db4d
- implements missing method for Graph Error Response
baywet Oct 13, 2020
f7f603d
- updates code gen files after generic types adjustments
baywet Oct 13, 2020
c4a6b5b
- updates unit test to remove reerences to collection pages
baywet Oct 13, 2020
f9be397
- removes useless interface
baywet Oct 13, 2020
9cbaf95
- adds missing docs
baywet Oct 13, 2020
f8e43f9
- updates pom versions to match actual
baywet Oct 14, 2020
22159e3
- removes use of deprecated API
baywet Oct 14, 2020
0dbfba3
- fixes null reference exceptions for unit test
baywet Oct 14, 2020
aaf2d0c
- backtracks page collections deletion
baywet Oct 15, 2020
92a11b5
- coge generation update
baywet Oct 16, 2020
af5b342
- updates infrastructure to accept page collection types
baywet Oct 16, 2020
6b30bd3
- codegen: removes unecessary unchecked suppression
baywet Oct 19, 2020
950d7f7
- adds missing param for javdoc
baywet Oct 19, 2020
e7f6983
- fixes collection page tests and removes unecessary mock class
baywet Oct 22, 2020
9aeed21
- removes unecessary warning suppression
baywet Oct 22, 2020
6870bb3
- fixes a bug where get on collection requests would fail
baywet Oct 22, 2020
148944e
- reverts from generic calsses to typed to workaround type erasure
baywet Oct 22, 2020
8c641f6
- removes unecessary mock class
baywet Oct 22, 2020
d158f18
- fixes collection request tests
baywet Oct 22, 2020
47de4b6
- switches to default tasks for source and doc jars
baywet Oct 22, 2020
5ab1313
- codegen update: moves odata constants to higher classes
baywet Oct 22, 2020
c131931
- adds odata query options in base requests
baywet Oct 22, 2020
e46e03f
- codegen update collection response refactoring
baywet Oct 22, 2020
c17fc3a
- adds a base collection response class to avoid lots of code duplica…
baywet Oct 22, 2020
c42338b
- codegen update reverts changes to collection pages to include reque…
baywet Oct 22, 2020
311708f
- reverts changes to collection pages to include request builder gene…
baywet Oct 22, 2020
f4d5765
- updates tests for basecollection page revert
baywet Oct 22, 2020
ac156d0
- codegen update additional constructor for collection pages
baywet Oct 23, 2020
a9747c9
- adds additional constructors for delta collection pages
baywet Oct 23, 2020
b9a9333
- codegen update: fixes page collection type for reference requests
baywet Oct 23, 2020
eb4ac1c
- adds missing param documenation
baywet Oct 23, 2020
e1987a2
- fixes type implementation for custom Request builder
baywet Oct 23, 2020
ce3c0bd
- fixes a bug where classes would not be found because of type erasure
baywet Oct 23, 2020
23895dd
- fixes a bug where response would not be returned if it didn't have …
baywet Oct 23, 2020
060d769
- codegen update unecessary class references removal
baywet Oct 23, 2020
4364484
- removes unecessary references to classes
baywet Oct 23, 2020
aaa3315
- fixes wrong return type for collections with references
baywet Oct 23, 2020
ab65885
- adds documentation for known error codes
baywet Oct 26, 2020
1361e46
- adds missing javadoc
baywet Oct 26, 2020
1fd01ab
- codegen update missing javadoc
baywet Oct 27, 2020
97c609f
- adds missing javadoc
baywet Oct 27, 2020
1904758
- codegen: fixes with reference requests
baywet Oct 28, 2020
0b7fde1
- fixes with references request infrastructure
baywet Oct 28, 2020
7d34ba7
- codegen update: generic type for stream request builders
baywet Nov 10, 2020
4962c1b
- linting: removes unused variable
baywet Nov 10, 2020
510898b
- codegen: fixes with references request builders
baywet Nov 10, 2020
06f0af0
Merge branch 'feature/v3' into demo-fix-collection-typing
baywet Nov 18, 2020
6c33f72
Merge branch 'feature/v3' into demo-fix-collection-typing
baywet Nov 20, 2020
f83bea1
- updates types summary
Nov 20, 2020
c7ac617
- fixes a bug where reference request would return a null pointer exc…
baywet Nov 20, 2020
46d9116
- improves unit test for getNExtPage references return type
baywet Nov 20, 2020
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
22 changes: 2 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ plugins {

java {
modularity.inferModulePath = true
withSourcesJar()
withJavadocJar()
}

sourceSets {
Expand Down Expand Up @@ -59,18 +61,6 @@ tasks.jar {
}
}

task sourceJar(type: Jar) {
outputs.cacheIf { true }
from sourceSets.main.allJava
archiveClassifier = 'sources'
}

task javadocJar(type: Jar, dependsOn: javadoc) {
outputs.cacheIf { true }
from javadoc.destinationDir
archiveClassifier = 'javadoc'
}

publishing {

publications {
Expand All @@ -80,8 +70,6 @@ publishing {
artifactId project.property('mavenArtifactId')
version "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
from components.java
artifact sourceJar
artifact javadocJar
pom.withXml {
def root = asNode()
root.appendNode('name', 'Microsoft Graph SDK for Java')
Expand All @@ -102,8 +90,6 @@ publishing {
def pomFile = file("${project.buildDir}/generated-pom.xml")
writeTo(pomFile)
}
artifact sourceJar
artifact javadocJar
}

mavenCentralRelease(MavenPublication) {
Expand All @@ -116,8 +102,6 @@ publishing {
def pomFile = file("${project.buildDir}/generated-pom.xml")
writeTo(pomFile)
}
artifact sourceJar
artifact javadocJar
}
}
repositories {
Expand Down Expand Up @@ -240,8 +224,6 @@ def getVersionName() {

artifacts {
archives jar
archives sourceJar
archives javadocJar
}

def customizePom(pom) {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
<version>23.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand All @@ -25,7 +25,7 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>gson</artifactId>
<version>3.12.1</version>
<version>4.9.0</version>
</dependency>
<dependency>
<groupId>com.microsoft.graph</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
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.callrecords.models.generated.Modality;
import com.microsoft.graph.models.extensions.IdentitySet;
import com.microsoft.graph.callrecords.models.generated.CallType;
Expand Down Expand Up @@ -145,8 +146,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/
public class DeviceInfo implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
Expand Down Expand Up @@ -250,8 +251,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/
public class Endpoint implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
Expand Down Expand Up @@ -71,8 +72,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/
public class FailureInfo implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
Expand Down Expand Up @@ -80,8 +81,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/
public class FeedbackTokenSet implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
Expand Down Expand Up @@ -62,8 +63,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
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.callrecords.models.extensions.DeviceInfo;
import com.microsoft.graph.callrecords.models.extensions.NetworkInfo;
import com.microsoft.graph.callrecords.models.extensions.MediaStream;
Expand All @@ -25,6 +26,7 @@
*/
public class Media implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
Expand Down Expand Up @@ -118,8 +120,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/
public class MediaStream implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
Expand Down Expand Up @@ -287,8 +288,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*/
public class NetworkInfo implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
Expand Down Expand Up @@ -280,8 +281,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
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.callrecords.models.extensions.Endpoint;
import com.microsoft.graph.callrecords.models.extensions.FailureInfo;
import com.microsoft.graph.callrecords.models.extensions.Media;
Expand Down Expand Up @@ -107,8 +108,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
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.callrecords.models.extensions.Endpoint;
import com.microsoft.graph.callrecords.models.extensions.FailureInfo;
import com.microsoft.graph.callrecords.models.generated.Modality;
Expand Down Expand Up @@ -118,8 +119,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/
public class UserAgent implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
Expand Down Expand Up @@ -79,8 +80,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/
public class UserFeedback implements IJsonBackedObject {

/** the OData type of the object as returned by the service */
@SerializedName("@odata.type")
@Expose
@Nullable
Expand Down Expand Up @@ -90,8 +91,9 @@ public JsonObject getRawObject() {
*
* @return the serializer
*/
@Override
@Nullable
protected ISerializer getSerializer() {
public ISerializer getSerializer() {
return serializer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
import com.microsoft.graph.callrecords.requests.extensions.CallRecordCollectionRequestBuilder;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;
import com.microsoft.graph.http.BaseCollectionPage;
import com.microsoft.graph.callrecords.requests.extensions.CallRecordCollectionPage;
import com.microsoft.graph.callrecords.requests.extensions.CallRecordCollectionResponse;
import com.microsoft.graph.http.BaseCollectionPage;

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

Expand All @@ -25,6 +24,16 @@ public class CallRecordCollectionPage extends BaseCollectionPage<CallRecord, Cal
* @param builder the request builder for the next collection page
*/
public CallRecordCollectionPage(@Nonnull final CallRecordCollectionResponse response, @Nonnull final CallRecordCollectionRequestBuilder builder) {
super(response.value, builder, response.additionalDataManager());
super(response, builder);
}

/**
* Creates the collection page for CallRecord
*
* @param pageContents the contents of this page
* @param nextRequestBuilder the request builder for the next page
*/
public CallRecordCollectionPage(@Nonnull final java.util.List<CallRecord> pageContents, @Nullable final CallRecordCollectionRequestBuilder nextRequestBuilder) {
super(pageContents, nextRequestBuilder);
}
}
Loading