Skip to content

Commit bd32115

Browse files
committed
1.52
1 parent 8a9716b commit bd32115

File tree

8 files changed

+53
-3
lines changed

8 files changed

+53
-3
lines changed

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,10 @@ dependencies {
1717

1818
test {
1919
useJUnitPlatform()
20+
}
21+
22+
java {
23+
toolchain {
24+
languageVersion = JavaLanguageVersion.of(8)
25+
}
2026
}

common/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ group rootProject.group
77
archivesBaseName = rootProject.archivesBaseName
88
version rootProject.version
99

10+
jar {
11+
manifest {
12+
attributes 'Implementation-Version': project.version
13+
}
14+
}
15+
1016
repositories {
1117
mavenCentral()
1218
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package dev.felnull.fnjl;
22

33
public class FNJLBuildIn {
4-
protected static final String VERSION = "1.51";
4+
protected static final String VERSION = "1.52";
55
}

common/src/main/java/dev/felnull/fnjl/util/FNDataUtil.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@
1313
import java.nio.file.WatchEvent;
1414
import java.security.MessageDigest;
1515
import java.security.NoSuchAlgorithmException;
16+
import java.util.HashMap;
17+
import java.util.Map;
1618
import java.util.concurrent.atomic.AtomicInteger;
1719
import java.util.function.BiConsumer;
1820
import java.util.function.Consumer;
21+
import java.util.function.Function;
1922
import java.util.zip.GZIPInputStream;
2023
import java.util.zip.GZIPOutputStream;
2124
import java.util.zip.ZipEntry;
@@ -387,4 +390,23 @@ public static void readZipStreamed(InputStream zipStream, BiConsumer<ZipEntry, I
387390
}
388391
});
389392
}
393+
394+
/**
395+
* メモ化
396+
*
397+
* @param function Function
398+
* @param <T> 値
399+
* @param <M> 結果
400+
* @return メモ化済みFunction
401+
*/
402+
public static <T, M> Function<T, M> memoize(final Function<T, M> function) {
403+
return new Function<T, M>() {
404+
private final Map<T, M> cache = new HashMap<>();
405+
406+
@Override
407+
public M apply(T t) {
408+
return cache.computeIfAbsent(t, function);
409+
}
410+
};
411+
}
390412
}

common/src/main/java/dev/felnull/fnjl/util/FNStringUtil.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,17 @@
1616
public class FNStringUtil {
1717
private static final String[] unit = {"K", "M", "G", "T", "P", "E", "Z", "Y"};
1818

19+
/**
20+
* nullが渡されたら空を返す
21+
*
22+
* @param text テキスト
23+
* @return 結果
24+
*/
25+
public static String emptyIfNull(@Nullable String text) {
26+
if (text == null) return "";
27+
return text;
28+
}
29+
1930
/**
2031
* UTFエスケープシーケンス文字列を文字列に変換
2132
*

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
fnjl_group=dev.felnull
22
fnjl_name=felnull-java-library
3-
fnjl_version=1.51
3+
fnjl_version=1.52

natives/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ plugins {
66
group rootProject.group
77
archivesBaseName = rootProject.archivesBaseName + "-natives"
88
version rootProject.version
9+
jar {
10+
manifest {
11+
attributes 'Implementation-Version': project.version
12+
}
13+
}
914

1015
repositories {
1116
mavenCentral()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.felnull.fnjln;
22

33
public class FNJLNBuildIn {
4-
protected static final String VERSION = "1.51";
4+
protected static final String VERSION = "1.52";
55

66
protected static final int NATIVE_LIBRARY_VERSION = 1;
77
}

0 commit comments

Comments
 (0)