- port from v1

Author: baywet

.github/workflows/conflicting-pr-label.yml

@@ -0,0 +1,34 @@
+# This is a basic workflow to help you get started with Actions
+
+name: PullRequestConflicting
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master, dev ]
+  pull_request:
+    types: [synchronize]
+    branches: [ master, dev ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    - name: check if prs are dirty
+      uses: eps1lon/actions-label-merge-conflict@releases/2.x
+      if: env.LABELING_TOKEN != '' && env.LABELING_TOKEN != null
+      id: check
+      with:
+        dirtyLabel: "conflicting"
+        repoToken: "${{ secrets.GITHUB_TOKEN  }}"
+        continueOnMissingPermissions: true
+        commentOnDirty: 'This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.'
+        commentOnClean: 'Conflicts have been resolved. A maintainer will take a look shortly.'
+      env:
+        LABELING_TOKEN: ${{secrets.GITHUB_TOKEN }}

README.md

@@ -45,7 +45,7 @@ Register your application by following the steps at [Register your app with the
 
 An instance of the **GraphServiceClient** class handles building requests, sending them to the Microsoft Graph API, and processing the responses. To create a new instance of this class, you need to provide an instance of `IAuthenticationProvider`, which can authenticate requests to Microsoft Graph.
 
-For an example of authentication in a client application, see the [MSGraph SDK Android MSA Auth for Android Adapter](https://github.com/microsoftgraph/msgraph-sdk-android-msa-auth-for-android-adapter).
+For an example of authentication in a Java desktop client application, see the [Preview msgraph-sdk-java-auth](https://github.com/microsoftgraph/msgraph-sdk-android-msa-auth-for-android-adapter) and for an Android application see [Preview msgraph-sdk-android-auth](https://github.com/microsoftgraph/msgraph-sdk-android-auth).
 
 ### 2.3 Get a GraphServiceClient object
 After you have set the correct application ID and URL, you must get a **GraphServiceClient** object to make requests against the service. The SDK stores the account information for you, but when a user signs in for the first time, it invokes the UI to get the user's account information.

msgraph-beta-sdk-java.yml

@@ -0,0 +1,16 @@
+page_type: sample
+products:
+  - office-365
+  - ms-graph
+languages:
+  - java
+extensions:
+  contentType: sdks
+  technologies:
+    - Microsoft Graph
+    - Microsoft identity platform
+  platforms:
+    - Android
+  createdDate: '8/19/2020 10:20:15 AM'
+title: Microsoft Graph Beta SDK for Java
+description: Microsoft Graph Beta SDK for Java and Android

src/main/java/com/microsoft/graph/http/DefaultHttpProvider.java

@@ -98,7 +98,7 @@ public class DefaultHttpProvider implements IHttpProvider {
     private IConnectionConfig connectionConfig;
 
     /**
-     * Creates the DefaultHttpProvider
+     * Creates the DefaultHttpProvider using a DefaultConnectionFactory.
      *
      * @param serializer             the serializer
      * @param authenticationProvider the authentication provider
@@ -109,11 +109,28 @@ public DefaultHttpProvider(final ISerializer serializer,
                                final IAuthenticationProvider authenticationProvider,
                                final IExecutors executors,
                                final ILogger logger) {
+        this(serializer, authenticationProvider, executors, logger, new DefaultConnectionFactory());
+    }
+
+    /**
+     * Creates the DefaultHttpProvider
+     *
+     * @param serializer             the serializer
+     * @param authenticationProvider the authentication provider
+     * @param executors              the executors
+     * @param logger                 the logger for diagnostic information
+     * @param connectionFactory      an IConnectionFactory to create outgoing connections
+     */
+    public DefaultHttpProvider(final ISerializer serializer,
+                               final IAuthenticationProvider authenticationProvider,
+                               final IExecutors executors,
+                               final ILogger logger,
+                               final IConnectionFactory connectionFactory) {
         this.serializer = serializer;
         this.authenticationProvider = authenticationProvider;
         this.executors = executors;
         this.logger = logger;
-        connectionFactory = new DefaultConnectionFactory();
+        this.connectionFactory = connectionFactory;
     }
 
     /**