mirror of
https://gitee.com/dcren/initializr.git
synced 2025-04-05 17:38:06 +08:00
Remove Jackson dependency on Version infrastructure
Closes gh-808
This commit is contained in:
parent
ce2d210d75
commit
73415ea21d
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -53,12 +53,6 @@ public final class Version implements Serializable, Comparable<Version> {
|
|||||||
|
|
||||||
private final Qualifier qualifier;
|
private final Qualifier qualifier;
|
||||||
|
|
||||||
// For Jackson
|
|
||||||
@SuppressWarnings("unused")
|
|
||||||
private Version() {
|
|
||||||
this(null, null, null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Version(Integer major, Integer minor, Integer patch, Qualifier qualifier) {
|
public Version(Integer major, Integer minor, Integer patch, Qualifier qualifier) {
|
||||||
this.major = major;
|
this.major = major;
|
||||||
this.minor = minor;
|
this.minor = minor;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -20,8 +20,6 @@ import java.io.Serializable;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonValue;
|
|
||||||
|
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -90,7 +88,6 @@ public final class VersionProperty implements Serializable, Comparable<VersionPr
|
|||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@JsonValue
|
|
||||||
public String toStandardFormat() {
|
public String toStandardFormat() {
|
||||||
return this.property;
|
return this.property;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -44,12 +44,6 @@ public class VersionRange {
|
|||||||
|
|
||||||
private final boolean higherInclusive;
|
private final boolean higherInclusive;
|
||||||
|
|
||||||
// For Jackson
|
|
||||||
@SuppressWarnings("unused")
|
|
||||||
private VersionRange() {
|
|
||||||
this(null, false, null, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected VersionRange(Version lowerVersion, boolean lowerInclusive,
|
protected VersionRange(Version lowerVersion, boolean lowerInclusive,
|
||||||
Version higherVersion, boolean higherInclusive) {
|
Version higherVersion, boolean higherInclusive) {
|
||||||
this.lowerVersion = lowerVersion;
|
this.lowerVersion = lowerVersion;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2018 the original author or authors.
|
* Copyright 2012-2019 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -155,6 +155,11 @@ public class InitializrAutoConfiguration {
|
|||||||
return new UiController(metadataProvider);
|
return new UiController(metadataProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public InitializrModule InitializrJacksonModule() {
|
||||||
|
return new InitializrModule();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -0,0 +1,54 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2019 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package io.spring.initializr.web.autoconfigure;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonGenerator;
|
||||||
|
import com.fasterxml.jackson.databind.SerializerProvider;
|
||||||
|
import com.fasterxml.jackson.databind.module.SimpleModule;
|
||||||
|
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
|
||||||
|
import io.spring.initializr.util.VersionProperty;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A {@link SimpleModule} that registers custom serializers.
|
||||||
|
*
|
||||||
|
* @author Stephane Nicoll
|
||||||
|
*/
|
||||||
|
class InitializrModule extends SimpleModule {
|
||||||
|
|
||||||
|
InitializrModule() {
|
||||||
|
super("initializr");
|
||||||
|
addSerializer(new VersionPropertySerializer());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class VersionPropertySerializer
|
||||||
|
extends StdSerializer<VersionProperty> {
|
||||||
|
|
||||||
|
VersionPropertySerializer() {
|
||||||
|
super(VersionProperty.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void serialize(VersionProperty value, JsonGenerator gen,
|
||||||
|
SerializerProvider provider) throws IOException {
|
||||||
|
gen.writeString(value.toStandardFormat());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user