CHANGELOG.md

@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+## [0.4.0] - 2023-03-22
+
+### Added
+
+- Added a base request builder and request configuration class to reduce the amount of code being generated.
+
 ## [0.3.3] - 2023-03-20
 
 ### Changed

components/abstractions/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.6"
         classpath "com.android.tools.build:gradle:7.4.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }

components/abstractions/build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '5.0.13'
+    id 'com.github.spotbugs' version '5.0.14'
     id "org.sonarqube" version "4.0.0.2929"
 }
 

components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestBuilder.java

@@ -0,0 +1,43 @@
+package com.microsoft.kiota;
+
+import java.util.HashMap;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+/** Base class for request builders */
+public abstract class BaseRequestBuilder {
+    /** Path parameters for the request */
+    @Nonnull
+    protected HashMap<String, Object> pathParameters;
+    /** The request adapter to use to execute the requests. */
+    @Nonnull
+    protected RequestAdapter requestAdapter;
+    /** Url template to use to build the URL for the current request builder */
+    @Nonnull
+    protected String urlTemplate;
+    private BaseRequestBuilder(@Nonnull final RequestAdapter requestAdapter, @Nonnull final String urlTemplate) {
+        this(requestAdapter, urlTemplate, new HashMap<String, Object>());
+    }
+    /**
+     * Instantiates a new BaseRequestBuilder and sets the default values.
+     * @param requestAdapter The request adapter to use to execute the requests.
+     * @param urlTemplate Url template to use to build the URL for the current request builder
+     * @param pathParameters Path parameters for the request
+     */
+    protected BaseRequestBuilder(@Nonnull final RequestAdapter requestAdapter, @Nonnull final String urlTemplate, @Nonnull final HashMap<String, Object> pathParameters) {
+        this.requestAdapter = Objects.requireNonNull(requestAdapter);
+        this.urlTemplate = Objects.requireNonNull(urlTemplate);
+        this.pathParameters = new HashMap<String, Object>(Objects.requireNonNull(pathParameters));
+    }
+    /**
+     * Instantiates a new BaseRequestBuilder and sets the default values.
+     * @param requestAdapter The request adapter to use to execute the requests.
+     * @param urlTemplate Url template to use to build the URL for the current request builder
+     * @param rawUrl the raw url to use for the request
+     */
+    protected BaseRequestBuilder(@Nonnull final RequestAdapter requestAdapter, @Nonnull final String urlTemplate, @Nonnull final String rawUrl) {
+        this(requestAdapter, urlTemplate);
+        this.pathParameters.put(RequestInformation.RAW_URL_KEY, Objects.requireNonNull(rawUrl));
+    }
+}

components/abstractions/src/main/java/com/microsoft/kiota/BaseRequestConfiguration.java

@@ -0,0 +1,15 @@
+package com.microsoft.kiota;
+
+import java.util.Collections;
+
+import javax.annotation.Nullable;
+
+/** Base class for request configuration */
+public abstract class BaseRequestConfiguration {
+    /** Request headers */
+    @Nullable
+    public RequestHeaders headers = new RequestHeaders();
+    /** Request options */
+    @Nullable
+    public java.util.List<RequestOption> options = Collections.emptyList();
+}

components/abstractions/src/main/java/com/microsoft/kiota/RequestInformation.java

@@ -82,7 +82,7 @@ public void setUri(@Nonnull final URI uri) {
             pathParameters.clear();
         }
     }
-    private static String RAW_URL_KEY = "request-raw-url";
+    static String RAW_URL_KEY = "request-raw-url";
     /** The HTTP method for the request */
     @Nullable
     public HttpMethod httpMethod;

components/authentication/azure/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.6"
         classpath "com.android.tools.build:gradle:7.4.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }

components/authentication/azure/build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '5.0.13'
+    id 'com.github.spotbugs' version '5.0.14'
     id "org.sonarqube" version "4.0.0.2929"
 }
 

components/http/okHttp/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.6"
         classpath "com.android.tools.build:gradle:7.4.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }

components/http/okHttp/build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '5.0.13'
+    id 'com.github.spotbugs' version '5.0.14'
     id "org.sonarqube" version "4.0.0.2929"
 }
 

components/serialization/form/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.6"
         classpath "com.android.tools.build:gradle:7.4.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }

components/serialization/form/build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '5.0.13'
+    id 'com.github.spotbugs' version '5.0.14'
     id "org.sonarqube" version "4.0.0.2929"
 }
 

components/serialization/json/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.6"
         classpath "com.android.tools.build:gradle:7.4.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }

components/serialization/json/build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '5.0.13'
+    id 'com.github.spotbugs' version '5.0.14'
     id "org.sonarqube" version "4.0.0.2929"
 }
 

components/serialization/text/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.4"
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.12.6"
         classpath "com.android.tools.build:gradle:7.4.2"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
     }

components/serialization/text/build.gradle

@@ -6,7 +6,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
-    id 'com.github.spotbugs' version '5.0.13'
+    id 'com.github.spotbugs' version '5.0.14'
     id "org.sonarqube" version "4.0.0.2929"
 }
 

gradle.properties

@@ -25,8 +25,8 @@ org.gradle.caching=true
 
 mavenGroupId         = com.microsoft.kiota
 mavenMajorVersion = 0
-mavenMinorVersion = 3
-mavenPatchVersion = 3
+mavenMinorVersion = 4
+mavenPatchVersion = 0
 mavenArtifactSuffix = 
 
 #These values are used to run functional tests