Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c29e40e47
|
||
|
|
3dbb686a66
|
+1
-1
@@ -22,4 +22,4 @@
|
|||||||
JDKVERSIONS=1.8
|
JDKVERSIONS=1.8
|
||||||
GROUPSID=com.mingliqiye.utils
|
GROUPSID=com.mingliqiye.utils
|
||||||
ARTIFACTID=mingli-utils
|
ARTIFACTID=mingli-utils
|
||||||
VERSIONS=3.1.4
|
VERSIONS=3.1.5
|
||||||
|
|||||||
+10
-10
@@ -1,9 +1,5 @@
|
|||||||
package com.mingliqiye.utils.springboot.autoconfigure;
|
package com.mingliqiye.utils.springboot.autoconfigure;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.google.gson.Gson;
|
|
||||||
import com.mingliqiye.utils.json.GsonJsonApi;
|
|
||||||
import com.mingliqiye.utils.json.JacksonJsonApi;
|
|
||||||
import com.mingliqiye.utils.json.JsonApi;
|
import com.mingliqiye.utils.json.JsonApi;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -30,21 +26,25 @@ public class JsonApiAutoConfiguration {
|
|||||||
@Bean
|
@Bean
|
||||||
@Primary
|
@Primary
|
||||||
@ConditionalOnMissingBean
|
@ConditionalOnMissingBean
|
||||||
@ConditionalOnClass(ObjectMapper.class)
|
@ConditionalOnClass(
|
||||||
public JsonApi jacksonJsonApi(ObjectMapper objectMapper) {
|
name = { "com.fasterxml.jackson.databind.ObjectMapper" }
|
||||||
|
)
|
||||||
|
public JsonApi jacksonJsonApi(
|
||||||
|
com.fasterxml.jackson.databind.ObjectMapper objectMapper
|
||||||
|
) {
|
||||||
log.info(
|
log.info(
|
||||||
"MingliUtils-JsonApiAutoConfiguration: JacksonJsonApi bean is created."
|
"MingliUtils-JsonApiAutoConfiguration: JacksonJsonApi bean is created."
|
||||||
);
|
);
|
||||||
return new JacksonJsonApi(objectMapper);
|
return new com.mingliqiye.utils.json.JacksonJsonApi(objectMapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnMissingBean
|
@ConditionalOnMissingBean
|
||||||
@ConditionalOnClass(Gson.class)
|
@ConditionalOnClass(name = { "com.google.gson.Gson" })
|
||||||
public JsonApi gsonJsonApi(Gson gson) {
|
public JsonApi gsonJsonApi(com.google.gson.Gson gson) {
|
||||||
log.info(
|
log.info(
|
||||||
"MingliUtils-JsonApiAutoConfiguration: GsonJsonApi bean is created."
|
"MingliUtils-JsonApiAutoConfiguration: GsonJsonApi bean is created."
|
||||||
);
|
);
|
||||||
return new GsonJsonApi(gson);
|
return new com.mingliqiye.utils.json.GsonJsonApi(gson);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user