Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
15 changes: 12 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ jacoco {
toolVersion = "0.8.7"
}

//Prevent javadocs from failing build
tasks.withType(Javadoc) {
failOnError false
options.addStringOption('Xdoclint:none', '-quiet')
Comment thread
ramsessanchez marked this conversation as resolved.
Outdated
options.addStringOption('encoding', 'UTF-8')
options.addStringOption('charSet', 'UTF-8')
}


spotbugsMain {
excludeFilter = file("spotBugsExcludeFilter.xml")
reports {
Expand Down Expand Up @@ -74,7 +83,7 @@ sourceSets {
repositories {
// You can declare any Maven/Ivy/file repository here.
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } // for jacoco, until 0.8.7 gets released
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }// for jacoco, until 0.8.7 gets released
}

apply from: "gradle/dependencies.gradle"
Expand Down Expand Up @@ -212,8 +221,8 @@ def fixAscNames = { name ->
}

compileJava {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = '17'
targetCompatibility = '17'
}

def getVersionCode() {
Expand Down
7 changes: 7 additions & 0 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,11 @@ dependencies {
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.0'
testCompileOnly 'net.jcip:jcip-annotations:1.0'
testCompileOnly 'com.github.spotbugs:spotbugs-annotations:4.7.0'

implementation 'com.microsoft.kiota:microsoft-kiota-abstractions:0.0.1-SNAPSHOT'
implementation 'com.microsoft.kiota:microsoft-kiota-authentication-azure:0.0.1-SNAPSHOT'
implementation 'com.microsoft.kiota:microsoft-kiota-http-okHttp:0.0.1-SNAPSHOT'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-json:0.0.1-SNAPSHOT'
implementation 'com.microsoft.kiota:microsoft-kiota-serialization-text:0.0.1-SNAPSHOT'

}
26 changes: 12 additions & 14 deletions src/main/java/com/microsoft/graph/Requests/BaseClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,28 @@ class BaseClient implements IBaseClient{
setRequestAdapter(requestAdapter);
}

/**BaseClient Constructors for use with baseUrl */
BaseClient(@Nullable String baseUrl, @Nonnull AuthenticationProvider authenticationProvider) {
this(new BaseGraphRequestAdapter(authenticationProvider, baseUrl));
BaseClient(@Nonnull AuthenticationProvider authenticationProvider) {
this(new BaseGraphRequestAdapter(authenticationProvider));
}

BaseClient(@Nullable String baseUrl, @Nonnull OkHttpClient client) {
this(baseUrl, client, null);
BaseClient(@Nonnull AuthenticationProvider authenticationProvider, @Nonnull String baseUrl) {
this(new BaseGraphRequestAdapter(authenticationProvider, baseUrl));
}

BaseClient(@Nullable String baseUrl, @Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions) {
this(new BaseGraphRequestAdapter(client, graphClientOptions, baseUrl));
BaseClient(@Nonnull AuthenticationProvider authenticationProvider, @Nonnull BaseGraphRequestAdapter.Clouds nationalCloud, @Nonnull String version){
this(new BaseGraphRequestAdapter(authenticationProvider, nationalCloud, version));
}

/**BaseClient constructors for use with specific national cloud and version */
BaseClient(@Nonnull BaseGraphRequestAdapter.Clouds nationalCloud, @Nonnull String version, @Nonnull AuthenticationProvider authenticationProvider){
this(new BaseGraphRequestAdapter(authenticationProvider, nationalCloud, version));
BaseClient(@Nonnull AuthenticationProvider authenticationProvider, @Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions) {
this(new BaseGraphRequestAdapter(authenticationProvider,client, graphClientOptions));
}

BaseClient(@Nonnull BaseGraphRequestAdapter.Clouds nationalCloud, @Nonnull String version, @Nonnull OkHttpClient client){
this(nationalCloud, version, client, null);
BaseClient(@Nonnull AuthenticationProvider authenticationProvider, @Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions, @Nonnull String baseUrl) {
this(new BaseGraphRequestAdapter(authenticationProvider, client, graphClientOptions, baseUrl));
}

BaseClient(@Nonnull BaseGraphRequestAdapter.Clouds nationalCloud, @Nonnull String version, @Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions) {
this(new BaseGraphRequestAdapter(client, graphClientOptions, nationalCloud, version));
BaseClient(@Nonnull AuthenticationProvider authenticationProvider, @Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions, @Nullable BaseGraphRequestAdapter.Clouds nationalCloud, @Nullable String version) {
this(new BaseGraphRequestAdapter(authenticationProvider,client, graphClientOptions, nationalCloud, version));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.microsoft.graph.Requests;

import com.microsoft.graph.core.ClientException;
import com.microsoft.kiota.authentication.AnonymousAuthenticationProvider;
import com.microsoft.kiota.authentication.AuthenticationProvider;
import com.microsoft.kiota.http.OkHttpRequestAdapter;
Expand Down Expand Up @@ -43,20 +44,28 @@ public BaseGraphRequestAdapter(@Nonnull final AuthenticationProvider authenticat
}
}

BaseGraphRequestAdapter(@Nonnull final AuthenticationProvider authenticationProvider){
this(authenticationProvider, null, null, null, null, null);
}

public BaseGraphRequestAdapter(@Nonnull final AuthenticationProvider authenticationProvider, @Nonnull String baseUrl) {
this(authenticationProvider, null, null, null, null, baseUrl);
}

public BaseGraphRequestAdapter(@Nonnull final AuthenticationProvider authenticationProvider, @Nonnull Clouds nationalCloud, @Nonnull String version) {
public BaseGraphRequestAdapter(@Nonnull final AuthenticationProvider authenticationProvider, @Nullable Clouds nationalCloud, @Nullable String version) {
this(authenticationProvider, determineBaseAddress(nationalCloud, version));
}

public BaseGraphRequestAdapter(@Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions, @Nonnull String baseUrl) {
this(new AnonymousAuthenticationProvider(), null, null, client,graphClientOptions, baseUrl);
BaseGraphRequestAdapter(@Nonnull AuthenticationProvider authenticationProvider, @Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions) {
this(authenticationProvider, client, graphClientOptions, null, null);
}

public BaseGraphRequestAdapter(@Nonnull AuthenticationProvider authenticationProvider, @Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions, @Nonnull String baseUrl) {
this(authenticationProvider, null, null, client,graphClientOptions, baseUrl);
}

public BaseGraphRequestAdapter(@Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions, @Nonnull Clouds nationalCloud, @Nonnull String version) {
this(client,graphClientOptions, determineBaseAddress(nationalCloud, version));
public BaseGraphRequestAdapter(@Nonnull final AuthenticationProvider authenticationProvider, @Nonnull OkHttpClient client, @Nullable GraphClientOptions graphClientOptions, @Nullable Clouds nationalCloud, @Nullable String version) {
this(authenticationProvider, client, graphClientOptions , determineBaseAddress(nationalCloud, version));
}

private static String determineBaseAddress(@Nullable Clouds nationalCloud, @Nullable String version) throws IllegalArgumentException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public static OkHttpClient.Builder create(@Nullable GraphClientOptions options)
public static Interceptor[] createDefaultGraphInterceptors(@Nullable GraphClientOptions graphClientOptions) {
List<Interceptor> handlers = new ArrayList<>();
handlers.add(new GraphTelemetryHandler(graphClientOptions));
handlers.add(new CompressionHandler());
Comment thread
ramsessanchez marked this conversation as resolved.
Outdated
for(final Interceptor interceptor: KiotaClientFactory.CreateDefaultInterceptors()) {
handlers.add(interceptor);
}
Expand Down