Rename foreignKotlinClass -> getOrCreateKotlinClass

Previously this cache contained only Java (hence 'foreign') classes, that is
not the case anymore
This commit is contained in:
Alexander Udalov
2015-10-08 16:21:41 +03:00
parent a4732b442d
commit 37c36f806a
5 changed files with 50 additions and 21 deletions
@@ -39,18 +39,12 @@ public class Reflection {
factory = impl != null ? impl : new ReflectionFactory();
}
private static final KClass[] EMPTY_K_CLASS_ARRAY = new KClass[0];
public static KClass createKotlinClass(Class javaClass) {
return factory.createKotlinClass(javaClass);
}
public static KClass[] foreignKotlinClasses(Class[] javaClasses) {
KClass[] kClasses = new KClass[javaClasses.length];
for (int i = 0; i < javaClasses.length; i++) {
kClasses[i] = foreignKotlinClass(javaClasses[i]);
}
return kClasses;
}
public static KPackage createKotlinPackage(Class javaClass) {
return factory.createKotlinPackage(javaClass);
}
@@ -59,8 +53,18 @@ public class Reflection {
return factory.createKotlinPackage(javaClass, moduleName);
}
public static KClass foreignKotlinClass(Class javaClass) {
return factory.foreignKotlinClass(javaClass);
public static KClass getOrCreateKotlinClass(Class javaClass) {
return factory.getOrCreateKotlinClass(javaClass);
}
public static KClass[] getOrCreateKotlinClasses(Class[] javaClasses) {
int size = javaClasses.length;
if (size == 0) return EMPTY_K_CLASS_ARRAY;
KClass[] kClasses = new KClass[size];
for (int i = 0; i < size; i++) {
kClasses[i] = getOrCreateKotlinClass(javaClasses[i]);
}
return kClasses;
}
// Functions
@@ -94,4 +98,16 @@ public class Reflection {
public static KMutableProperty2 mutableProperty2(MutablePropertyReference2 p) {
return factory.mutableProperty2(p);
}
// Deprecated
@Deprecated
public static KClass foreignKotlinClass(Class javaClass) {
return getOrCreateKotlinClass(javaClass);
}
@Deprecated
public static KClass[] foreignKotlinClasses(Class[] javaClasses) {
return getOrCreateKotlinClasses(javaClasses);
}
}
@@ -31,7 +31,7 @@ public class ReflectionFactory {
return null;
}
public KClass foreignKotlinClass(Class javaClass) {
public KClass getOrCreateKotlinClass(Class javaClass) {
return new ClassReference(javaClass);
}
@@ -66,4 +66,11 @@ public class ReflectionFactory {
public KMutableProperty2 mutableProperty2(MutablePropertyReference2 p) {
return p;
}
// Deprecated
@Deprecated
public KClass foreignKotlinClass(Class javaClass) {
return new ClassReference(javaClass);
}
}