#820

Committed 16 Apr 2026 04:09PM UTC coverage: 87.706% (-0.07%) from 87.774%

Build # #820

Build Type

push

Committed by

Commit Message

Upgrade to Java 21 and Spring Boot 3.2.12 (#201)

* chore: upgrade to Java 21 and Spring Boot 3.2.12

- Bump Java source/target/release to 21 across all modules
- Upgrade Spring Boot from 2.7.9 to 3.2.12
- Migrate javax.* to jakarta.* (persistence, servlet, annotation)
- Add CrudRepository to repository interfaces (Spring Data 3.x breaking change)
- Update springdoc-openapi from 1.x to 2.x (GroupedOpenApi, ParameterObject)
- Fix Testcontainers LocalStack API: getEndpointOverride() replaces getEndpointConfiguration()
- Fix Awaitility 4.x: replace org.awaitility.Duration with java.time.Duration
- Fix Hadoop+Java21: disable FileSystem cache to avoid UserGroupInformation incompatibility
- Add JVM --add-opens flags for Hadoop/reflection compatibility in tests
- Exclude JPA auto-configuration from @WebMvcTest context in API tests

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Update gha workflows to use java 21

* fix: fix integration tests for Java 21 / Spring Boot 3.2.12 upgrade

- Replace JUnit 4 @Rule with @Container on LocalStack S3 containers in
  BeekeeperMetadataCleanupIntegrationTest and BeekeeperDryRunMetadataCleanupIntegrationTest
  to fix ExceptionInInitializerError caused by static block running before Testcontainers start
- Add properties.sqs.endpoint and properties.sqs.region Spring properties to
  CommonBeans.messageReader() so the SqsMessageReader uses a custom AmazonSQS client
  with explicit LocalStack endpoint and matching region (us-west-2), fixing
  QueueDoesNotExistException caused by LocalStack's region-sensitive SQS queue lookup
- Set properties.sqs.region in BeekeeperUnreferencedPathSchedulerApiaryIntegrationTest
  and BeekeeperExpiredMetadataSchedulerApiaryIntegrationTest to match the region used
  when creating SQS queues in LocalStack
- Apply Spotless formatting to all changed integration test files

All 71 integration tests now pass (1 skipped, pre-existing).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.... (continued)

Coverage Stats

10 of 12 new or added lines in 3 files covered. (83.33%)

115 existing lines in 33 files now uncovered.

1541 of 1757 relevant lines covered (87.71%)

0.88 hits per line

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

81.82

/beekeeper-core/src/main/java/com/expediagroup/beekeeper/core/config/PrometheusConfigFactory.java

/**
 * Copyright (C) 2019-2020 Expedia, Inc.
 *
 * 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.expediagroup.beekeeper.core.config;

import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

import io.micrometer.prometheus.PrometheusConfig;

@Component
@ConfigurationProperties(prefix = "prometheus")
public class PrometheusConfigFactory {

  private String prefix = "beekeeper";

  public String getPrefix() {
    return prefix;
  }

  public void setPrefix(String prefix) {
    this.prefix = prefix;
  }

  public PrometheusConfig newInstance() {
    return new PrometheusConfigFactory.DefaultPrometheusConfig(prefix);
  }

  private static class DefaultPrometheusConfig implements PrometheusConfig {

    private String prefix;

    public DefaultPrometheusConfig(String prefix) {
      this.prefix = prefix;
    }

    @Override
    public String prefix() {
      return prefix;
    }

    @Override
    public String get(String key) {
      return null;
    }
  }
}

1	/**
2	* Copyright (C) 2019-2020 Expedia, Inc.
3	*
4	* Licensed under the Apache License, Version 2.0 (the "License");
5	* you may not use this file except in compliance with the License.
6	* You may obtain a copy of the License at
7	*
8	* http://www.apache.org/licenses/LICENSE-2.0
9	*
10	* Unless required by applicable law or agreed to in writing, software
11	* distributed under the License is distributed on an "AS IS" BASIS,
12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	* See the License for the specific language governing permissions and
14	* limitations under the License.
15	*/
16	package com.expediagroup.beekeeper.core.config;
17
18	import org.springframework.boot.context.properties.ConfigurationProperties;
19	import org.springframework.stereotype.Component;
20
21	import io.micrometer.prometheus.PrometheusConfig;
22
23	@Component	1✔
24	@ConfigurationProperties(prefix = "prometheus")
25	public class PrometheusConfigFactory {	1✔
26
27	private String prefix = "beekeeper";
UNCOV 28		×
29	public String getPrefix() {
30	return prefix;
31	}
32		1✔
33	public void setPrefix(String prefix) {	1✔
34	this.prefix = prefix;
35	}
36		1✔
37	public PrometheusConfig newInstance() {
38	return new PrometheusConfigFactory.DefaultPrometheusConfig(prefix);
39	}
40
41	private static class DefaultPrometheusConfig implements PrometheusConfig {
42
43	private String prefix;	1✔
44		1✔
45	public DefaultPrometheusConfig(String prefix) {	1✔
46	this.prefix = prefix;
47	}
48
49	@Override	1✔
50	public String prefix() {
51	return prefix;
52	}
53
UNCOV 54	@Override	×
55	public String get(String key) {
56	return null;
57	}
58	}
59	}

ExpediaGroup / beekeeper / #820

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