zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Convert change to ConvertUtil

Browse Source
This commit is contained in:
Looly
2024-08-23 08:36:52 +08:00
parent c6777244a0
commit 3ddad8ff6c
92 changed files with 336 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-extra/src/main/java/org/dromara/hutool/extra/management/ManagementUtil.java
View File

@@ -16,7 +16,7 @@
package org.dromara.hutool.extra.management;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.lang.Singleton;
import org.dromara.hutool.core.util.ObjUtil;
@@ -462,6 +462,6 @@ public class ManagementUtil {
* @param value 值
*/
protected static void append(final StringBuilder builder, final String caption, final Object value) {
builder.append(caption).append(ObjUtil.defaultIfNull(Convert.toStr(value), "[n/a]")).append("\n");
builder.append(caption).append(ObjUtil.defaultIfNull(ConvertUtil.toStr(value), "[n/a]")).append("\n");
}
}

6
hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/jetbrick/JetbrickTemplate.java
View File

@@ -16,7 +16,7 @@
package org.dromara.hutool.extra.template.engine.jetbrick;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.extra.template.Template;
import jetbrick.template.JetTemplate;
@@ -59,13 +59,13 @@ public class JetbrickTemplate implements Template, Serializable{
@Override
public void render(final Map<?, ?> bindingMap, final Writer writer) {
final Map<String, Object> map = Convert.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
final Map<String, Object> map = ConvertUtil.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
rawTemplate.render(map, writer);
}
@Override
public void render(final Map<?, ?> bindingMap, final OutputStream out) {
final Map<String, Object> map = Convert.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
final Map<String, Object> map = ConvertUtil.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
rawTemplate.render(map, out);
}

6
hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/pebble/PebbleTemplate.java
View File

@@ -16,7 +16,7 @@
package org.dromara.hutool.extra.template.engine.pebble;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.extra.template.Template;
import org.dromara.hutool.extra.template.TemplateException;
@@ -64,7 +64,7 @@ public class PebbleTemplate implements Template {
@Override
public void render(final Map<?, ?> bindingMap, final Writer writer) {
final Map<String, Object> map = Convert.convert(new TypeReference<Map<String, Object>>() {
final Map<String, Object> map = ConvertUtil.convert(new TypeReference<Map<String, Object>>() {
}, bindingMap);
try {
this.template.evaluate(writer, map);
@@ -82,7 +82,7 @@ public class PebbleTemplate implements Template {
@Override
public void render(final Map<?, ?> bindingMap, final OutputStream out) {
final Map<String, Object> map = Convert.convert(new TypeReference<Map<String, Object>>() {
final Map<String, Object> map = ConvertUtil.convert(new TypeReference<Map<String, Object>>() {
}, bindingMap);
try {
this.template.evaluate(new OutputStreamWriter(out), map);

4
hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/rythm/RythmTemplate.java
View File

@@ -16,7 +16,7 @@
package org.dromara.hutool.extra.template.engine.rythm;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.extra.template.Template;
@@ -57,7 +57,7 @@ public class RythmTemplate implements Template, Serializable {
@Override
public void render(final Map<?, ?> bindingMap, final Writer writer) {
final Map<String, Object> map = Convert.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
final Map<String, Object> map = ConvertUtil.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
rawTemplate.__setRenderArgs(map);
rawTemplate.render(writer);
}

4
hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/thymeleaf/ThymeleafTemplate.java
View File

@@ -16,7 +16,7 @@
package org.dromara.hutool.extra.template.engine.thymeleaf;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.core.util.CharsetUtil;
@@ -72,7 +72,7 @@ public class ThymeleafTemplate implements Template, Serializable {
@Override
public void render(final Map<?, ?> bindingMap, final Writer writer) {
final Map<String, Object> map = Convert.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
final Map<String, Object> map = ConvertUtil.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
final Context context = new Context(Locale.getDefault(), map);
this.engine.process(this.template, context, writer);
}

4
hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityTemplate.java
View File

@@ -16,7 +16,7 @@
package org.dromara.hutool.extra.template.engine.velocity;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.reflect.TypeReference;
import org.dromara.hutool.core.text.StrUtil;
@@ -82,7 +82,7 @@ public class VelocityTemplate implements Template, Serializable {
* @return {@link VelocityContext}
*/
private VelocityContext toContext(final Map<?, ?> bindingMap) {
final Map<String, Object> map = Convert.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
final Map<String, Object> map = ConvertUtil.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
return new VelocityContext(map);
}

6
hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/wit/WitTemplate.java
View File

@@ -16,7 +16,7 @@
package org.dromara.hutool.extra.template.engine.wit;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.dromara.hutool.core.reflect.TypeReference;
import org.febit.wit.Template;
@@ -56,13 +56,13 @@ public class WitTemplate implements org.dromara.hutool.extra.template.Template,
@Override
public void render(final Map<?, ?> bindingMap, final Writer writer) {
final Map<String, Object> map = Convert.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
final Map<String, Object> map = ConvertUtil.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
rawTemplate.merge(map, writer);
}
@Override
public void render(final Map<?, ?> bindingMap, final OutputStream out) {
final Map<String, Object> map = Convert.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
final Map<String, Object> map = ConvertUtil.convert(new TypeReference<Map<String, Object>>() {}, bindingMap);
rawTemplate.merge(map, out);
}

4
hutool-extra/src/test/java/org/dromara/hutool/extra/spring/cglib/CglibUtilTest.java
View File

@@ -13,7 +13,7 @@
package org.dromara.hutool.extra.spring.cglib;
import lombok.Data;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.ConvertUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange;
@@ -41,7 +41,7 @@ public class CglibUtilTest {
otherBean = new OtherSampleBean();
//自定义转换器
CglibUtil.copy(bean, otherBean, (value, target, context) -> Convert.convertQuietly(target, value));
CglibUtil.copy(bean, otherBean, (value, target, context) -> ConvertUtil.convertQuietly(target, value));
Assertions.assertEquals("Hello world", otherBean.getValue());
Assertions.assertEquals(123, otherBean.getValue2());
}