refactor: Convert method bodies to single expression functions

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotation.kt

@@ -9,21 +9,13 @@ class MutableAnnotation(annotation: Annotation) : BaseAnnotation() {
     private val type = annotation.type
     private val _elements by lazy { annotation.elements.map { element -> element.toMutable() }.toMutableSet() }
 
-    override fun getType(): String {
+    override fun getType(): String = type
-        return type
-    }
 
-    override fun getElements(): MutableSet<MutableAnnotationElement> {
+    override fun getElements(): MutableSet<MutableAnnotationElement> = _elements
-        return _elements
-    }
 
-    override fun getVisibility(): Int {
+    override fun getVisibility(): Int = visibility
-        return visibility
-    }
 
     companion object {
-        fun Annotation.toMutable(): MutableAnnotation {
+        fun Annotation.toMutable(): MutableAnnotation = MutableAnnotation(this)
-            return MutableAnnotation(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableAnnotationElement.kt

@@ -18,17 +18,11 @@ class MutableAnnotationElement(annotationElement: AnnotationElement) : BaseAnnot
         this.value = value
     }
 
-    override fun getName(): String {
+    override fun getName(): String = name
-        return name
-    }
 
-    override fun getValue(): EncodedValue {
+    override fun getValue(): EncodedValue = value
-        return value
-    }
 
     companion object {
-        fun AnnotationElement.toMutable(): MutableAnnotationElement {
+        fun AnnotationElement.toMutable(): MutableAnnotationElement = MutableAnnotationElement(this)
-            return MutableAnnotationElement(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableClass.kt

@@ -8,7 +8,9 @@ import com.android.tools.smali.dexlib2.iface.ClassDef
 import com.android.tools.smali.dexlib2.util.FieldUtil
 import com.android.tools.smali.dexlib2.util.MethodUtil
 
-class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {
+class MutableClass(classDef: ClassDef) :
+    BaseTypeReference(),
+    ClassDef {
     // Class
     private var type = classDef.type
     private var sourceFile = classDef.sourceFile
@@ -46,57 +48,31 @@ class MutableClass(classDef: ClassDef) : ClassDef, BaseTypeReference() {
         this.superclass = superclass
     }
 
-    override fun getType(): String {
+    override fun getType(): String = type
-        return type
-    }
 
-    override fun getAccessFlags(): Int {
+    override fun getAccessFlags(): Int = accessFlags
-        return accessFlags
-    }
 
-    override fun getSourceFile(): String? {
+    override fun getSourceFile(): String? = sourceFile
-        return sourceFile
-    }
 
-    override fun getSuperclass(): String? {
+    override fun getSuperclass(): String? = superclass
-        return superclass
-    }
 
-    override fun getInterfaces(): MutableList<String> {
+    override fun getInterfaces(): MutableList<String> = _interfaces
-        return _interfaces
-    }
 
-    override fun getAnnotations(): MutableSet<MutableAnnotation> {
+    override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations
-        return _annotations
-    }
 
-    override fun getStaticFields(): MutableSet<MutableField> {
+    override fun getStaticFields(): MutableSet<MutableField> = _staticFields
-        return _staticFields
-    }
 
-    override fun getInstanceFields(): MutableSet<MutableField> {
+    override fun getInstanceFields(): MutableSet<MutableField> = _instanceFields
-        return _instanceFields
-    }
 
-    override fun getFields(): MutableSet<MutableField> {
+    override fun getFields(): MutableSet<MutableField> = _fields
-        return _fields
-    }
 
-    override fun getDirectMethods(): MutableSet<MutableMethod> {
+    override fun getDirectMethods(): MutableSet<MutableMethod> = _directMethods
-        return _directMethods
-    }
 
-    override fun getVirtualMethods(): MutableSet<MutableMethod> {
+    override fun getVirtualMethods(): MutableSet<MutableMethod> = _virtualMethods
-        return _virtualMethods
-    }
 
-    override fun getMethods(): MutableSet<MutableMethod> {
+    override fun getMethods(): MutableSet<MutableMethod> = _methods
-        return _methods
-    }
 
     companion object {
-        fun ClassDef.toMutable(): MutableClass {
+        fun ClassDef.toMutable(): MutableClass = MutableClass(this)
-            return MutableClass(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableField.kt

@@ -7,7 +7,9 @@ import com.android.tools.smali.dexlib2.HiddenApiRestriction
 import com.android.tools.smali.dexlib2.base.reference.BaseFieldReference
 import com.android.tools.smali.dexlib2.iface.Field
 
-class MutableField(field: Field) : Field, BaseFieldReference() {
+class MutableField(field: Field) :
+    BaseFieldReference(),
+    Field {
     private var definingClass = field.definingClass
     private var name = field.name
     private var type = field.type
@@ -37,37 +39,21 @@ class MutableField(field: Field) : Field, BaseFieldReference() {
         this.initialValue = initialValue
     }
 
-    override fun getDefiningClass(): String {
+    override fun getDefiningClass(): String = this.definingClass
-        return this.definingClass
-    }
 
-    override fun getName(): String {
+    override fun getName(): String = this.name
-        return this.name
-    }
 
-    override fun getType(): String {
+    override fun getType(): String = this.type
-        return this.type
-    }
 
-    override fun getAnnotations(): MutableSet<MutableAnnotation> {
+    override fun getAnnotations(): MutableSet<MutableAnnotation> = this._annotations
-        return this._annotations
-    }
 
-    override fun getAccessFlags(): Int {
+    override fun getAccessFlags(): Int = this.accessFlags
-        return this.accessFlags
-    }
 
-    override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> {
+    override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> = this._hiddenApiRestrictions
-        return this._hiddenApiRestrictions
-    }
 
-    override fun getInitialValue(): MutableEncodedValue? {
+    override fun getInitialValue(): MutableEncodedValue? = this.initialValue
-        return this.initialValue
-    }
 
     companion object {
-        fun Field.toMutable(): MutableField {
+        fun Field.toMutable(): MutableField = MutableField(this)
-            return MutableField(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethod.kt

@@ -7,7 +7,9 @@ import com.android.tools.smali.dexlib2.base.reference.BaseMethodReference
 import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
 import com.android.tools.smali.dexlib2.iface.Method
 
-class MutableMethod(method: Method) : Method, BaseMethodReference() {
+class MutableMethod(method: Method) :
+    BaseMethodReference(),
+    Method {
     private var definingClass = method.definingClass
     private var name = method.name
     private var accessFlags = method.accessFlags
@@ -36,45 +38,25 @@ class MutableMethod(method: Method) : Method, BaseMethodReference() {
         this.returnType = returnType
     }
 
-    override fun getDefiningClass(): String {
+    override fun getDefiningClass(): String = definingClass
-        return definingClass
-    }
 
-    override fun getName(): String {
+    override fun getName(): String = name
-        return name
-    }
 
-    override fun getParameterTypes(): MutableList<CharSequence> {
+    override fun getParameterTypes(): MutableList<CharSequence> = _parameterTypes
-        return _parameterTypes
-    }
 
-    override fun getReturnType(): String {
+    override fun getReturnType(): String = returnType
-        return returnType
-    }
 
-    override fun getAnnotations(): MutableSet<MutableAnnotation> {
+    override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations
-        return _annotations
-    }
 
-    override fun getAccessFlags(): Int {
+    override fun getAccessFlags(): Int = accessFlags
-        return accessFlags
-    }
 
-    override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> {
+    override fun getHiddenApiRestrictions(): MutableSet<HiddenApiRestriction> = _hiddenApiRestrictions
-        return _hiddenApiRestrictions
-    }
 
-    override fun getParameters(): MutableList<MutableMethodParameter> {
+    override fun getParameters(): MutableList<MutableMethodParameter> = _parameters
-        return _parameters
-    }
 
-    override fun getImplementation(): MutableMethodImplementation? {
+    override fun getImplementation(): MutableMethodImplementation? = _implementation
-        return _implementation
-    }
 
     companion object {
-        fun Method.toMutable(): MutableMethod {
+        fun Method.toMutable(): MutableMethod = MutableMethod(this)
-            return MutableMethod(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/MutableMethodParameter.kt

@@ -5,7 +5,9 @@ import com.android.tools.smali.dexlib2.base.BaseMethodParameter
 import com.android.tools.smali.dexlib2.iface.MethodParameter
 
 // TODO: finish overriding all members if necessary
-class MutableMethodParameter(parameter: MethodParameter) : MethodParameter, BaseMethodParameter() {
+class MutableMethodParameter(parameter: MethodParameter) :
+    BaseMethodParameter(),
+    MethodParameter {
     private var type = parameter.type
     private var name = parameter.name
     private var signature = parameter.signature
@@ -13,25 +15,15 @@ class MutableMethodParameter(parameter: MethodParameter) : MethodParameter, Base
         parameter.annotations.map { annotation -> annotation.toMutable() }.toMutableSet()
     }
 
-    override fun getType(): String {
+    override fun getType(): String = type
-        return type
-    }
 
-    override fun getName(): String? {
+    override fun getName(): String? = name
-        return name
-    }
 
-    override fun getSignature(): String? {
+    override fun getSignature(): String? = signature
-        return signature
-    }
 
-    override fun getAnnotations(): MutableSet<MutableAnnotation> {
+    override fun getAnnotations(): MutableSet<MutableAnnotation> = _annotations
-        return _annotations
-    }
 
     companion object {
-        fun MethodParameter.toMutable(): MutableMethodParameter {
+        fun MethodParameter.toMutable(): MutableMethodParameter = MutableMethodParameter(this)
-            return MutableMethodParameter(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableAnnotationEncodedValue.kt

@@ -14,21 +14,15 @@ class MutableAnnotationEncodedValue(annotationEncodedValue: AnnotationEncodedVal
         annotationEncodedValue.elements.map { annotationElement -> annotationElement.toMutable() }.toMutableSet()
     }
 
-    override fun getType(): String {
+    override fun getType(): String = this.type
-        return this.type
-    }
 
     fun setType(type: String) {
         this.type = type
     }
 
-    override fun getElements(): MutableSet<out AnnotationElement> {
+    override fun getElements(): MutableSet<out AnnotationElement> = _elements
-        return _elements
-    }
 
     companion object {
-        fun AnnotationEncodedValue.toMutable(): MutableAnnotationEncodedValue {
+        fun AnnotationEncodedValue.toMutable(): MutableAnnotationEncodedValue = MutableAnnotationEncodedValue(this)
-            return MutableAnnotationEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableArrayEncodedValue.kt

@@ -5,18 +5,16 @@ import com.android.tools.smali.dexlib2.base.value.BaseArrayEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.ArrayEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.EncodedValue
 
-class MutableArrayEncodedValue(arrayEncodedValue: ArrayEncodedValue) : BaseArrayEncodedValue(), MutableEncodedValue {
+class MutableArrayEncodedValue(arrayEncodedValue: ArrayEncodedValue) :
+    BaseArrayEncodedValue(),
+    MutableEncodedValue {
     private val _value by lazy {
         arrayEncodedValue.value.map { encodedValue -> encodedValue.toMutable() }.toMutableList()
     }
 
-    override fun getValue(): MutableList<out EncodedValue> {
+    override fun getValue(): MutableList<out EncodedValue> = _value
-        return _value
-    }
 
     companion object {
-        fun ArrayEncodedValue.toMutable(): MutableArrayEncodedValue {
+        fun ArrayEncodedValue.toMutable(): MutableArrayEncodedValue = MutableArrayEncodedValue(this)
-            return MutableArrayEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableBooleanEncodedValue.kt

@@ -8,17 +8,13 @@ class MutableBooleanEncodedValue(booleanEncodedValue: BooleanEncodedValue) :
     MutableEncodedValue {
     private var value = booleanEncodedValue.value
 
-    override fun getValue(): Boolean {
+    override fun getValue(): Boolean = this.value
-        return this.value
-    }
 
     fun setValue(value: Boolean) {
         this.value = value
     }
 
     companion object {
-        fun BooleanEncodedValue.toMutable(): MutableBooleanEncodedValue {
+        fun BooleanEncodedValue.toMutable(): MutableBooleanEncodedValue = MutableBooleanEncodedValue(this)
-            return MutableBooleanEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableByteEncodedValue.kt

@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseByteEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue
 
-class MutableByteEncodedValue(byteEncodedValue: ByteEncodedValue) : BaseByteEncodedValue(), MutableEncodedValue {
+class MutableByteEncodedValue(byteEncodedValue: ByteEncodedValue) :
+    BaseByteEncodedValue(),
+    MutableEncodedValue {
     private var value = byteEncodedValue.value
 
-    override fun getValue(): Byte {
+    override fun getValue(): Byte = this.value
-        return this.value
-    }
 
     fun setValue(value: Byte) {
         this.value = value
     }
 
     companion object {
-        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
+        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
-            return MutableByteEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableCharEncodedValue.kt

@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseCharEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.CharEncodedValue
 
-class MutableCharEncodedValue(charEncodedValue: CharEncodedValue) : BaseCharEncodedValue(), MutableEncodedValue {
+class MutableCharEncodedValue(charEncodedValue: CharEncodedValue) :
+    BaseCharEncodedValue(),
+    MutableEncodedValue {
     private var value = charEncodedValue.value
 
-    override fun getValue(): Char {
+    override fun getValue(): Char = this.value
-        return this.value
-    }
 
     fun setValue(value: Char) {
         this.value = value
     }
 
     companion object {
-        fun CharEncodedValue.toMutable(): MutableCharEncodedValue {
+        fun CharEncodedValue.toMutable(): MutableCharEncodedValue = MutableCharEncodedValue(this)
-            return MutableCharEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableDoubleEncodedValue.kt

@@ -8,17 +8,13 @@ class MutableDoubleEncodedValue(doubleEncodedValue: DoubleEncodedValue) :
     MutableEncodedValue {
     private var value = doubleEncodedValue.value
 
-    override fun getValue(): Double {
+    override fun getValue(): Double = this.value
-        return this.value
-    }
 
     fun setValue(value: Double) {
         this.value = value
     }
 
     companion object {
-        fun DoubleEncodedValue.toMutable(): MutableDoubleEncodedValue {
+        fun DoubleEncodedValue.toMutable(): MutableDoubleEncodedValue = MutableDoubleEncodedValue(this)
-            return MutableDoubleEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableEnumEncodedValue.kt

@@ -4,20 +4,18 @@ import com.android.tools.smali.dexlib2.base.value.BaseEnumEncodedValue
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.value.EnumEncodedValue
 
-class MutableEnumEncodedValue(enumEncodedValue: EnumEncodedValue) : BaseEnumEncodedValue(), MutableEncodedValue {
+class MutableEnumEncodedValue(enumEncodedValue: EnumEncodedValue) :
+    BaseEnumEncodedValue(),
+    MutableEncodedValue {
     private var value = enumEncodedValue.value
 
-    override fun getValue(): FieldReference {
+    override fun getValue(): FieldReference = this.value
-        return this.value
-    }
 
     fun setValue(value: FieldReference) {
         this.value = value
     }
 
     companion object {
-        fun EnumEncodedValue.toMutable(): MutableEnumEncodedValue {
+        fun EnumEncodedValue.toMutable(): MutableEnumEncodedValue = MutableEnumEncodedValue(this)
-            return MutableEnumEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFieldEncodedValue.kt

@@ -5,24 +5,20 @@ import com.android.tools.smali.dexlib2.base.value.BaseFieldEncodedValue
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 import com.android.tools.smali.dexlib2.iface.value.FieldEncodedValue
 
-class MutableFieldEncodedValue(fieldEncodedValue: FieldEncodedValue) : BaseFieldEncodedValue(), MutableEncodedValue {
+class MutableFieldEncodedValue(fieldEncodedValue: FieldEncodedValue) :
+    BaseFieldEncodedValue(),
+    MutableEncodedValue {
     private var value = fieldEncodedValue.value
 
-    override fun getValueType(): Int {
+    override fun getValueType(): Int = ValueType.FIELD
-        return ValueType.FIELD
-    }
 
-    override fun getValue(): FieldReference {
+    override fun getValue(): FieldReference = this.value
-        return this.value
-    }
 
     fun setValue(value: FieldReference) {
         this.value = value
     }
 
     companion object {
-        fun FieldEncodedValue.toMutable(): MutableFieldEncodedValue {
+        fun FieldEncodedValue.toMutable(): MutableFieldEncodedValue = MutableFieldEncodedValue(this)
-            return MutableFieldEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableFloatEncodedValue.kt

@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseFloatEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.FloatEncodedValue
 
-class MutableFloatEncodedValue(floatEncodedValue: FloatEncodedValue) : BaseFloatEncodedValue(), MutableEncodedValue {
+class MutableFloatEncodedValue(floatEncodedValue: FloatEncodedValue) :
+    BaseFloatEncodedValue(),
+    MutableEncodedValue {
     private var value = floatEncodedValue.value
 
-    override fun getValue(): Float {
+    override fun getValue(): Float = this.value
-        return this.value
-    }
 
     fun setValue(value: Float) {
         this.value = value
     }
 
     companion object {
-        fun FloatEncodedValue.toMutable(): MutableFloatEncodedValue {
+        fun FloatEncodedValue.toMutable(): MutableFloatEncodedValue = MutableFloatEncodedValue(this)
-            return MutableFloatEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableIntEncodedValue.kt

@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseIntEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.IntEncodedValue
 
-class MutableIntEncodedValue(intEncodedValue: IntEncodedValue) : BaseIntEncodedValue(), MutableEncodedValue {
+class MutableIntEncodedValue(intEncodedValue: IntEncodedValue) :
+    BaseIntEncodedValue(),
+    MutableEncodedValue {
     private var value = intEncodedValue.value
 
-    override fun getValue(): Int {
+    override fun getValue(): Int = this.value
-        return this.value
-    }
 
     fun setValue(value: Int) {
         this.value = value
     }
 
     companion object {
-        fun IntEncodedValue.toMutable(): MutableIntEncodedValue {
+        fun IntEncodedValue.toMutable(): MutableIntEncodedValue = MutableIntEncodedValue(this)
-            return MutableIntEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableLongEncodedValue.kt

@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseLongEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.LongEncodedValue
 
-class MutableLongEncodedValue(longEncodedValue: LongEncodedValue) : BaseLongEncodedValue(), MutableEncodedValue {
+class MutableLongEncodedValue(longEncodedValue: LongEncodedValue) :
+    BaseLongEncodedValue(),
+    MutableEncodedValue {
     private var value = longEncodedValue.value
 
-    override fun getValue(): Long {
+    override fun getValue(): Long = this.value
-        return this.value
-    }
 
     fun setValue(value: Long) {
         this.value = value
     }
 
     companion object {
-        fun LongEncodedValue.toMutable(): MutableLongEncodedValue {
+        fun LongEncodedValue.toMutable(): MutableLongEncodedValue = MutableLongEncodedValue(this)
-            return MutableLongEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodEncodedValue.kt

@@ -9,17 +9,13 @@ class MutableMethodEncodedValue(methodEncodedValue: MethodEncodedValue) :
     MutableEncodedValue {
     private var value = methodEncodedValue.value
 
-    override fun getValue(): MethodReference {
+    override fun getValue(): MethodReference = this.value
-        return this.value
-    }
 
     fun setValue(value: MethodReference) {
         this.value = value
     }
 
     companion object {
-        fun MethodEncodedValue.toMutable(): MutableMethodEncodedValue {
+        fun MethodEncodedValue.toMutable(): MutableMethodEncodedValue = MutableMethodEncodedValue(this)
-            return MutableMethodEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodHandleEncodedValue.kt

@@ -9,17 +9,13 @@ class MutableMethodHandleEncodedValue(methodHandleEncodedValue: MethodHandleEnco
     MutableEncodedValue {
     private var value = methodHandleEncodedValue.value
 
-    override fun getValue(): MethodHandleReference {
+    override fun getValue(): MethodHandleReference = this.value
-        return this.value
-    }
 
     fun setValue(value: MethodHandleReference) {
         this.value = value
     }
 
     companion object {
-        fun MethodHandleEncodedValue.toMutable(): MutableMethodHandleEncodedValue {
+        fun MethodHandleEncodedValue.toMutable(): MutableMethodHandleEncodedValue = MutableMethodHandleEncodedValue(this)
-            return MutableMethodHandleEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableMethodTypeEncodedValue.kt

@@ -9,17 +9,13 @@ class MutableMethodTypeEncodedValue(methodTypeEncodedValue: MethodTypeEncodedVal
     MutableEncodedValue {
     private var value = methodTypeEncodedValue.value
 
-    override fun getValue(): MethodProtoReference {
+    override fun getValue(): MethodProtoReference = this.value
-        return this.value
-    }
 
     fun setValue(value: MethodProtoReference) {
         this.value = value
     }
 
     companion object {
-        fun MethodTypeEncodedValue.toMutable(): MutableMethodTypeEncodedValue {
+        fun MethodTypeEncodedValue.toMutable(): MutableMethodTypeEncodedValue = MutableMethodTypeEncodedValue(this)
-            return MutableMethodTypeEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableNullEncodedValue.kt

@@ -3,10 +3,10 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseNullEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.ByteEncodedValue
 
-class MutableNullEncodedValue : BaseNullEncodedValue(), MutableEncodedValue {
+class MutableNullEncodedValue :
+    BaseNullEncodedValue(),
+    MutableEncodedValue {
     companion object {
-        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
+        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
-            return MutableByteEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableShortEncodedValue.kt

@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseShortEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.ShortEncodedValue
 
-class MutableShortEncodedValue(shortEncodedValue: ShortEncodedValue) : BaseShortEncodedValue(), MutableEncodedValue {
+class MutableShortEncodedValue(shortEncodedValue: ShortEncodedValue) :
+    BaseShortEncodedValue(),
+    MutableEncodedValue {
     private var value = shortEncodedValue.value
 
-    override fun getValue(): Short {
+    override fun getValue(): Short = this.value
-        return this.value
-    }
 
     fun setValue(value: Short) {
         this.value = value
     }
 
     companion object {
-        fun ShortEncodedValue.toMutable(): MutableShortEncodedValue {
+        fun ShortEncodedValue.toMutable(): MutableShortEncodedValue = MutableShortEncodedValue(this)
-            return MutableShortEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableStringEncodedValue.kt

@@ -9,17 +9,13 @@ class MutableStringEncodedValue(stringEncodedValue: StringEncodedValue) :
     MutableEncodedValue {
     private var value = stringEncodedValue.value
 
-    override fun getValue(): String {
+    override fun getValue(): String = this.value
-        return this.value
-    }
 
     fun setValue(value: String) {
         this.value = value
     }
 
     companion object {
-        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue {
+        fun ByteEncodedValue.toMutable(): MutableByteEncodedValue = MutableByteEncodedValue(this)
-            return MutableByteEncodedValue(this)
-        }
     }
 }

src/main/kotlin/app/revanced/patcher/util/proxy/mutableTypes/encodedValue/MutableTypeEncodedValue.kt

@@ -3,20 +3,18 @@ package app.revanced.patcher.util.proxy.mutableTypes.encodedValue
 import com.android.tools.smali.dexlib2.base.value.BaseTypeEncodedValue
 import com.android.tools.smali.dexlib2.iface.value.TypeEncodedValue
 
-class MutableTypeEncodedValue(typeEncodedValue: TypeEncodedValue) : BaseTypeEncodedValue(), MutableEncodedValue {
+class MutableTypeEncodedValue(typeEncodedValue: TypeEncodedValue) :
+    BaseTypeEncodedValue(),
+    MutableEncodedValue {
     private var value = typeEncodedValue.value
 
-    override fun getValue(): String {
+    override fun getValue(): String = this.value
-        return this.value
-    }
 
     fun setValue(value: String) {
         this.value = value
     }
 
     companion object {
-        fun TypeEncodedValue.toMutable(): MutableTypeEncodedValue {
+        fun TypeEncodedValue.toMutable(): MutableTypeEncodedValue = MutableTypeEncodedValue(this)
-            return MutableTypeEncodedValue(this)
-        }
     }
 }