Merge pull request #43 from microsoftgraph/feature/v1-refresh

- updates with latest non-gen changes from v1

Author: baywet

.azure-pipelines/generate-beta-models.yml

@@ -107,6 +107,14 @@ steps:
     workingDirectory: '$(Build.SourcesDirectory)' # Set the root for a multi-repo pipeline. /s
   enabled: true
 
+- task: PowerShell@2
+  displayName: 'Increment minor version number'
+  inputs:
+    targetType: filePath
+    filePath: '$(Build.SourcesDirectory)/msgraph-beta-sdk-java/Scripts/incrementMinorVersion.ps1'
+    workingDirectory: '$(Build.SourcesDirectory)/msgraph-beta-sdk-java/Scripts'
+  enabled: true
+
 - task: PowerShell@2
   displayName: 'Copy generated requests and models into the repo'
   inputs:

.editorconfig

@@ -0,0 +1,5 @@
+[*.java]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @baywet @ddyett @MichaelMainer @nikithauc @zengin 

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,4 +16,6 @@ Fixes #
 
 <!-- Optional. Provide related links. This might be other pull requests, code files, StackOverflow posts. Delete this section if it is not used. -->
 ### Other links
+
+<!-- Is this PR adding a new hand crafted extension class? If so, please update $filesThatShouldNotBeDeleted variable in .azure-pipelines/generate-beta-models.yml file, so that it doesn't get deleted by auto generation pipeline.-->
 -

.github/dependabot.yml

@@ -5,3 +5,8 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.github/workflows/create-beta-pull-request.yml

@@ -37,7 +37,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         MESSAGE_TITLE: Generated beta models and request builders using Typewriter
-        MESSAGE_BODY: "This pull request was automatically created by the GitHub Action, **${{github.workflow}}**. \n\n The commit hash is _${{github.sha}}_. \n\n **Important** Check for unexpected deletions or changes in this PR. \n\n - [ ] update version in gradle.properties and Constants.java. \n\n cc: @darrelmiller"
+        MESSAGE_BODY: "This pull request was automatically created by the GitHub Action, **${{github.workflow}}**. \n\n The commit hash is _${{github.sha}}_. \n\n **Important** Check for unexpected deletions or changes in this PR. \n\n cc: @darrelmiller"
         REVIEWERS: peombwa,ddyett,zengin,nikithauc,baywet
         ASSIGNEDTO: baywet
         LABELS: generated

.github/workflows/type-summary.yml

@@ -0,0 +1,37 @@
+name: "update type summary"
+
+on:
+  push:
+    paths:
+      - '**/*.java'
+      - '**/*.yml'
+
+jobs:
+  update-type-summary:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 15
+    - name: Add execution right to the script
+      run: chmod +x gradlew
+      working-directory: ./typesummary
+    - name: Build and run type summary project
+      run: ./gradlew --no-daemon run --args='-o ${{ github.workspace }}/typeSummary.txt'
+      working-directory: ./typesummary
+    - name: Get branch name
+      run: |
+        $branchName = $Env:GITHUB_REF.replace("refs/heads/", "")
+        echo "CURRENT_BRANCH=${branchName}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+      shell: pwsh
+    - name: push
+      uses: github-actions-x/[email protected]
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        push-branch: ${{ env.CURRENT_BRANCH }}
+        commit-message: '- updates types summary'
+        force-add: 'true'
+        files: typeSummary.txt
+        name: Microsoft Graph DevX Tooling
+        email: [email protected]

.gitignore

@@ -31,6 +31,5 @@ hs_err_pid*
 
 # Maven
 /target/
-/pom.xml
 local.properties
 .idea

README.md

@@ -2,8 +2,7 @@
 
 [![Download](https://api.bintray.com/packages/microsoftgraph/Maven/microsoft-graph-beta/images/download.svg) ](https://bintray.com/microsoftgraph/Maven/microsoft-graph/_latestVersion)
 
-
-Get started with the Microsoft Graph SDK for Java by integrating the [Microsoft Graph API](https://graph.microsoft.io/en-us/getting-started) into your Java application!
+Get started with the Microsoft Graph SDK for Java by integrating the [Microsoft Graph API](https://developer.microsoft.com/en-us/graph/get-started/java) into your Java application!
 
 > **Note:** this SDK allows you to build applications using the [beta](https://docs.microsoft.com/en-us/graph/use-the-api#version) of Microsoft Graph. If you want to use the production supported Microsoft Graph APIs under v1.0, use our [v1.0 SDK](https://github.com/microsoftgraph/msgraph-sdk-java) instead.
 

Scripts/incrementMinorVersion.ps1

@@ -0,0 +1,59 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+<#
+.Synopsis
+    Increment the minor version string in the gradle.properties if the major,
+    minor, or patch version hasn't been manually updated.
+.Description
+    Assumptions:
+        Targets Gradle.properties
+        This script assumes it is run from the repo root.
+        Minor version is typically auto-incremented.
+
+#>
+
+function Update-ReadmeVersion([string]$readmeFilePath, [version]$version) {
+	$readmeFileContent = Get-Content -Path $readmeFilePath -Raw
+	$readmeFileContent = $readmeFileContent -replace "\d{1,}\.\d{1,}\.\d{1,}", $version.ToString()
+	Set-Content -Path $readmeFilePath $readmeFileContent
+}
+
+function Update-TelemetryVersion([string]$telemetryFilePath, [version]$version) {
+	$telemetryFileContent = Get-Content -Path $telemetryFilePath -Raw
+	$telemetryFileContent = $telemetryFileContent -replace "\d{1,}\.\d{1,}\.\d{1,}", $version.ToString()
+	Set-Content -Path $telemetryFilePath $telemetryFileContent
+}
+
+function Update-PackageVersion([string]$propertiesFilePath, [version]$version) {
+	$propertiesFileContent = Get-Content -Path $propertiesFilePath -Raw
+	$propertiesFileContent = $propertiesFileContent -replace "mavenMajorVersion\s+=\s+\d{1,}", "mavenMajorVersion = $($version.Major)"
+	$propertiesFileContent = $propertiesFileContent -replace "mavenMinorVersion\s+=\s+\d{1,}", "mavenMinorVersion = $($version.Minor)"
+	$propertiesFileContent = $propertiesFileContent -replace "mavenPatchVersion\s+=\s+\d{1,}", "mavenPatchVersion = $($version.Build)"
+	Set-Content -Path $propertiesFilePath $propertiesFileContent
+}
+function Get-CurrentTelemetryVersion([string]$telemetryFilePath) {
+	$telemetryFileContent = Get-Content -Path $telemetryFilePath -Raw
+	if($telemetryFileContent -match "(\d{1,}\.\d{1,}\.\d{1,})") {
+		return [version]::Parse($Matches[1])
+	} else {
+		Write-Error "Invalid version number format"
+		return $null;
+	}
+}
+
+function Update-MinorVersionNumber([version]$currentVersion) {
+	return [version]::new($currentVersion.Major, $currentVersion.Minor + 1, 0);
+}
+
+function Update-MinorVersion() {
+	$readmeFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../readme.md"
+	$propertiesFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../gradle.properties"
+	$telemetryFilePath = Join-Path -Path $PWD.ToString() -ChildPath "../src/main/java/com/microsoft/graph/core/Constants.java"
+	$currentVersion = Get-CurrentTelemetryVersion -telemetryFilePath $telemetryFilePath
+	$nextVersion = Update-MinorVersionNumber -currentVersion $currentVersion
+	Update-ReadmeVersion -version $nextVersion -readmeFilePath $readmeFilePath
+	Update-TelemetryVersion -version $nextVersion -telemetryFilePath $telemetryFilePath
+	Update-PackageVersion -version $nextVersion -propertiesFilePath $propertiesFilePath
+}
+Update-MinorVersion