-
-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fix(): 解决metaFreshTime和configServiceUrl的NPE以及时间格式问题 * fix(): 消除external-type在启用monitor下但又未配置时的无用日志打印 * fix(): PrometheusApolloClientMetricsExporter下错误的logger配置 * fix(): ConfigMoniotr 方法命名与API不统一问题 * fix(): 优化代码以及增加DateUtil测试类
- Loading branch information
Showing
12 changed files
with
144 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
apollo-client/src/main/java/com/ctrip/framework/apollo/util/date/DateUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Copyright 2022 Apollo 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 com.ctrip.framework.apollo.util.date; | ||
|
|
||
| import java.time.LocalDateTime; | ||
| import java.time.format.DateTimeFormatter; | ||
| import java.util.Optional; | ||
|
|
||
| /** | ||
| * @author Rawven | ||
| * @date 2024/10/19 | ||
| */ | ||
| public class DateUtil { | ||
| public static final DateTimeFormatter MEDIUM_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); | ||
|
|
||
| /** | ||
| * Formats a LocalDateTime object to a string using the MEDIUM_FORMATTER. | ||
| * | ||
| * @param localDateTime the LocalDateTime to format, can be null | ||
| * @return the formatted date-time string, or null if the input is null | ||
| */ | ||
| public static Optional<String> formatLocalDateTime(LocalDateTime localDateTime) { | ||
| return Optional.ofNullable(localDateTime) | ||
| .map(dt -> dt.format(MEDIUM_FORMATTER)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
apollo-client/src/test/java/com/ctrip/framework/apollo/util/date/DateUtilTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Copyright 2022 Apollo 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 com.ctrip.framework.apollo.util.date; | ||
|
|
||
| import org.junit.Test; | ||
| import static org.junit.Assert.*; | ||
| import java.time.LocalDateTime; | ||
| import java.util.Optional; | ||
|
|
||
| public class DateUtilTest { | ||
|
|
||
| @Test | ||
| public void testFormatLocalDateTime_validDate() { | ||
| LocalDateTime dateTime = LocalDateTime.of(2024, 12, 1, 10, 30, 0); | ||
|
|
||
| Optional<String> formattedDate = DateUtil.formatLocalDateTime(dateTime); | ||
|
|
||
| assertTrue(formattedDate.isPresent()); | ||
| assertEquals("2024-12-01 10:30:00", formattedDate.get()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFormatLocalDateTime_nullDate() { | ||
| Optional<String> result = DateUtil.formatLocalDateTime(null); | ||
|
|
||
| assertFalse(result.isPresent()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters