#140

Committed 08 Feb 2025 09:13AM UTC coverage: 63.606% (-0.08%) from 63.687%

Build # #140

Build Type

push

Committed by

Commit Message

Merge pull request #316 from trydofor/develop

release of 3.3.140

Run Details

242 of 343 new or added lines in 58 files covered. (70.55%)

55 existing lines in 6 files now uncovered.

12926 of 20322 relevant lines covered (63.61%)

0.64 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

92.31

/wings/slardar/src/main/java/pro/fessional/wings/slardar/jackson/JacksonIncludeValue.java

package pro.fessional.wings.slardar.jackson;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.annotation.JsonInclude.Value;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Date;

/**
 *
 * @author trydofor
 * @see JsonInclude
 * @since 2021-10-28
 */
@Slf4j
public class JacksonIncludeValue {

    protected JacksonIncludeValue(@Nullable LocalDate emptyDate, int offset) {
        EmptyDate = emptyDate == null ? null : new EmptyDateRange(emptyDate, offset);
    }

    private static volatile EmptyDateRange EmptyDate;

    @SuppressWarnings({ "EqualsWhichDoesntCheckParameterClass", "EqualsDoesntCheckParameterClass" })
    public static class EmptyDates {
        @Override
        public boolean equals(Object obj) {
            if (obj == null) return true;

            final EmptyDateRange empty = EmptyDate;
            if (empty == null) return false;

            return switch (obj) {
                case Date dt -> empty.isEmpty(dt);
                case LocalDate dt -> empty.isEmpty(dt);
                case LocalDateTime dt -> empty.isEmpty(dt);
                case ZonedDateTime dt -> empty.isEmpty(dt);
                case OffsetDateTime dt -> empty.isEmpty(dt);
                default -> false;
            };
        }
    }

    public static final Value NonEmptyValue = Value.construct(Include.NON_EMPTY, null, null, null);
    public static final Value NonEmptyDates = Value.construct(Include.CUSTOM, null, EmptyDates.class, null);

    /*
     * com.fasterxml.jackson.databind.ser.std.StdArraySerializers
     * BasicSerializerFactory#buildArraySerializer
     */
    public static void configNonEmptyDates(@NotNull ObjectMapper mapper) {
        config(mapper, NonEmptyDates,
            java.sql.Date.class,
            Date.class,
            LocalDate.class,
            LocalDateTime.class,
            ZonedDateTime.class,
            OffsetDateTime.class
            );
    }

    public static void configNonEmptyValue(@NotNull ObjectMapper mapper, Class<?>... claz) {
        config(mapper, NonEmptyValue, claz);
    }

    public static void config(@NotNull ObjectMapper mapper, @NotNull Value value, Class<?>... claz) {
        for (Class<?> clz : claz) {
            mapper.configOverride(clz).setInclude(value);
        }
    }

    private static class EmptyDateRange {
        private final @NotNull LocalDate emptyDate;
        private final LocalDateTime emptyDateMin;
        private final LocalDateTime emptyDateMax;
        private final long timestampMin;
        private final long timestampMax;

        public EmptyDateRange(@NotNull LocalDate empty, int offsetHours) {
            emptyDate = empty;

            long offsetMs = offsetHours * 3600_000L;
            final LocalDateTime dt = empty.atStartOfDay();
            final long ms = dt.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
            timestampMin = ms - offsetMs;
            timestampMax = ms + offsetMs;
            if (offsetHours == 0) {
                emptyDateMin = null;
                emptyDateMax = null;
            }
            else {
                emptyDateMin = dt.minusHours(offsetHours);
                emptyDateMax = dt.plusHours(offsetHours);
            }
        }

        public boolean isEmpty(Date dt) {
            if (dt == null) return true;

            final long time = dt.getTime();
            return timestampMin <= time && time <= timestampMax;
        }

        public boolean isEmpty(LocalDate dt) {
            if (dt == null) return true;

            return emptyDate.equals(dt);
        }

        public boolean isEmpty(LocalDateTime dt) {
            if (dt == null) return true;
            return _isEmpty(dt);
        }

        public boolean isEmpty(ZonedDateTime dt) {
            if (dt == null) return true;
            return _isEmpty(dt.toLocalDateTime());
        }

        public boolean isEmpty(OffsetDateTime dt) {
            if (dt == null) return true;
            return _isEmpty(dt.toLocalDateTime());
        }

        // Considering timezone, the difference is considered equal within `offset` hours.
        private boolean _isEmpty(@NotNull LocalDateTime dt) {
            if (emptyDate.equals(dt.toLocalDate())) return true;

            if (emptyDateMin == null || emptyDateMax == null) {
                return false;
            }
            else {
                //noinspection RedundantCompareToJavaTime
                return emptyDateMin.compareTo(dt) <= 0 && dt.compareTo(emptyDateMax) <= 0;
            }
        }
    }
}

1	package pro.fessional.wings.slardar.jackson;
2
3	import com.fasterxml.jackson.annotation.JsonInclude;
4	import com.fasterxml.jackson.annotation.JsonInclude.Include;
5	import com.fasterxml.jackson.annotation.JsonInclude.Value;
6	import com.fasterxml.jackson.databind.ObjectMapper;
7	import lombok.extern.slf4j.Slf4j;
8	import org.jetbrains.annotations.NotNull;
9	import org.jetbrains.annotations.Nullable;
10
11	import java.time.LocalDate;
12	import java.time.LocalDateTime;
13	import java.time.OffsetDateTime;
14	import java.time.ZoneId;
15	import java.time.ZonedDateTime;
16	import java.util.Date;
17
18	/**
19	*
20	* @author trydofor
21	* @see JsonInclude
22	* @since 2021-10-28
23	*/
24	@Slf4j	1✔
25	public class JacksonIncludeValue {
26
27	protected JacksonIncludeValue(@Nullable LocalDate emptyDate, int offset) {	1✔
28	EmptyDate = emptyDate == null ? null : new EmptyDateRange(emptyDate, offset);	1✔
29	}	1✔
30
31	private static volatile EmptyDateRange EmptyDate;
32
33	@SuppressWarnings({ "EqualsWhichDoesntCheckParameterClass", "EqualsDoesntCheckParameterClass" })
34	public static class EmptyDates {	1✔
35	@Override
36	public boolean equals(Object obj) {
37	if (obj == null) return true;	1✔
38
39	final EmptyDateRange empty = EmptyDate;	1✔
40	if (empty == null) return false;	1✔
41
42	return switch (obj) {	1✔
43	case Date dt -> empty.isEmpty(dt);	1✔
44	case LocalDate dt -> empty.isEmpty(dt);	1✔
45	case LocalDateTime dt -> empty.isEmpty(dt);	1✔
46	case ZonedDateTime dt -> empty.isEmpty(dt);	1✔
47	case OffsetDateTime dt -> empty.isEmpty(dt);	1✔
NEW 48	default -> false;	×
49	};
50	}
51	}
52
53	public static final Value NonEmptyValue = Value.construct(Include.NON_EMPTY, null, null, null);	1✔
54	public static final Value NonEmptyDates = Value.construct(Include.CUSTOM, null, EmptyDates.class, null);	1✔
55
56	/*
57	* com.fasterxml.jackson.databind.ser.std.StdArraySerializers
58	* BasicSerializerFactory#buildArraySerializer
59	*/
60	public static void configNonEmptyDates(@NotNull ObjectMapper mapper) {
61	config(mapper, NonEmptyDates,	1✔
62	java.sql.Date.class,
63	Date.class,
64	LocalDate.class,
65	LocalDateTime.class,
66	ZonedDateTime.class,
67	OffsetDateTime.class
68	);
69	}	1✔
70
71	public static void configNonEmptyValue(@NotNull ObjectMapper mapper, Class<?>... claz) {
72	config(mapper, NonEmptyValue, claz);	1✔
73	}	1✔
74
75	public static void config(@NotNull ObjectMapper mapper, @NotNull Value value, Class<?>... claz) {
76	for (Class<?> clz : claz) {	1✔
77	mapper.configOverride(clz).setInclude(value);	1✔
78	}
79	}	1✔
80
81	private static class EmptyDateRange {
82	private final @NotNull LocalDate emptyDate;
83	private final LocalDateTime emptyDateMin;
84	private final LocalDateTime emptyDateMax;
85	private final long timestampMin;
86	private final long timestampMax;
87
88	public EmptyDateRange(@NotNull LocalDate empty, int offsetHours) {	1✔
89	emptyDate = empty;	1✔
90
91	long offsetMs = offsetHours * 3600_000L;	1✔
92	final LocalDateTime dt = empty.atStartOfDay();	1✔
93	final long ms = dt.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();	1✔
94	timestampMin = ms - offsetMs;	1✔
95	timestampMax = ms + offsetMs;	1✔
96	if (offsetHours == 0) {	1✔
NEW 97	emptyDateMin = null;	×
NEW 98	emptyDateMax = null;	×
99	}
100	else {
101	emptyDateMin = dt.minusHours(offsetHours);	1✔
102	emptyDateMax = dt.plusHours(offsetHours);	1✔
103	}
104	}	1✔
105
106	public boolean isEmpty(Date dt) {
107	if (dt == null) return true;	1✔
108
109	final long time = dt.getTime();	1✔
110	return timestampMin <= time && time <= timestampMax;	1✔
111	}
112
113	public boolean isEmpty(LocalDate dt) {
114	if (dt == null) return true;	1✔
115
116	return emptyDate.equals(dt);	1✔
117	}
118
119	public boolean isEmpty(LocalDateTime dt) {
120	if (dt == null) return true;	1✔
121	return _isEmpty(dt);	1✔
122	}
123
124	public boolean isEmpty(ZonedDateTime dt) {
125	if (dt == null) return true;	1✔
126	return _isEmpty(dt.toLocalDateTime());	1✔
127	}
128
129	public boolean isEmpty(OffsetDateTime dt) {
130	if (dt == null) return true;	1✔
131	return _isEmpty(dt.toLocalDateTime());	1✔
132	}
133
134	// Considering timezone, the difference is considered equal within `offset` hours.
135	private boolean _isEmpty(@NotNull LocalDateTime dt) {
136	if (emptyDate.equals(dt.toLocalDate())) return true;	1✔
137
138	if (emptyDateMin == null \|\| emptyDateMax == null) {	1✔
NEW 139	return false;	×
140	}
141	else {
142	//noinspection RedundantCompareToJavaTime
143	return emptyDateMin.compareTo(dt) <= 0 && dt.compareTo(emptyDateMax) <= 0;	1✔
144	}
145	}
146	}
147	}

trydofor / professional-wings / #140

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous