Merge pull request #10 from LSafer-Agile/master

Updated the 'wrapper.set(...)' and 'wrapper.get(...)' utility functions

Author: LSafer

src/main/java/org/cufy/http/wrapper/EndpointContext.java

@@ -0,0 +1,67 @@
+/*
+ *	Copyright 2021-2022 Cufy and ProgSpaceSA
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *	    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ */
+package org.cufy.http.wrapper;
+
+import org.cufy.http.Endpoint;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * An extended version of {@link EndpointWrapper}.
+ *
+ * @param <E>    the type of the endpoint.
+ * @param <Self> the type of this wrapper.
+ * @author LSafer
+ * @version 1.0.0
+ * @since 1.0.0 ~2022.01.06
+ */
+public interface EndpointContext<E extends Endpoint, Self extends EndpointContext<E, Self>> extends EndpointWrapper<E, Self> {
+	/**
+	 * Invoke the given {@code getter} with this as the parameter and return the result of
+	 * the invocation.
+	 *
+	 * @param getter the getter to be invoked.
+	 * @param <T>    the type of the result.
+	 * @return the result of invoking the given {@code getter}.
+	 * @throws NullPointerException if the given {@code getter} is null.
+	 * @since 1.0.0 ~2022.01.06
+	 */
+	@Contract(pure = true)
+	default <T> T get(@NotNull Function<Self, T> getter) {
+		Objects.requireNonNull(getter, "getter");
+		return getter.apply((Self) this);
+	}
+
+	/**
+	 * Invoke the given {@code setter} with this as the parameter.
+	 *
+	 * @param setter the setter to be invoked.
+	 * @return this.
+	 * @throws NullPointerException if the given {@code setter} is null.
+	 * @since 1.0.0 ~2022.01.06
+	 */
+	@NotNull
+	@Contract(value = "_->this", mutates = "this")
+	default Self set(@NotNull Consumer<Self> setter) {
+		Objects.requireNonNull(setter, "setter");
+		setter.accept((Self) this);
+		return (Self) this;
+	}
+}

src/main/java/org/cufy/http/wrapper/RequestContext.java

@@ -30,7 +30,7 @@
  * @since 0.3.0 ~2021.12.12
  */
 public interface RequestContext<E extends Endpoint, R extends ResponseContext<E, Self, R>, Self extends RequestContext<E, R, Self>>
-		extends RequestExtension<Self>, EndpointWrapper<E, Self>, ExtrasExtension<Self> {
+		extends RequestExtension<Self>, EndpointContext<E, Self>, ExtrasExtension<Self> {
 	/**
 	 * Return the response wrapper instance of this.
 	 * <br>

src/main/java/org/cufy/http/wrapper/ResponseContext.java

@@ -30,7 +30,7 @@
  * @since 0.3.0 ~2021.12.12
  */
 public interface ResponseContext<E extends Endpoint, R extends RequestContext<E, Self, R>, Self extends ResponseContext<E, R, Self>>
-		extends ResponseExtension<Self>, EndpointWrapper<E, Self>, ExtrasExtension<Self> {
+		extends ResponseExtension<Self>, EndpointContext<E, Self>, ExtrasExtension<Self> {
 	/**
 	 * Return the request wrapper instance of this.
 	 * <br>

src/main/java/org/cufy/http/wrapper/extensions.kt

@@ -217,19 +217,3 @@ operator fun <E : Endpoint, R : RequestContext<E, T, R>, T : ResponseContext<E,
  */
 operator fun <E : Endpoint, R : RequestContext<E, T, R>, T : ResponseContext<E, R, T>> T.component2(): T =
     this
-
-/**
- * Invoke the given [setter] with this as the receiver and the endpoint as the parameter.
- */
-fun <E : Endpoint, T : EndpointWrapper<E, T>> T.set(setter: T.(E) -> Unit): T {
-    setter(this, this.endpoint)
-    return this
-}
-
-/**
- * Invoke the given [getter] with this as the receiver and the endpoint as the parameter
- * and return the invocation result.
- */
-fun <E : Endpoint, T : EndpointWrapper<E, T>, V> T.get(getter: T.(E) -> V): V {
-    return getter(this, this.endpoint)
-}