HazelcastClientConfigAvailableCondition.java (spring-boot-2.7.3) | : | HazelcastClientConfigAvailableCondition.java (spring-boot-2.7.4) | ||
---|---|---|---|---|
/* | /* | |||
* Copyright 2012-2020 the original author or authors. | * Copyright 2012-2022 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. | |||
* You may obtain a copy of the License at | * You may obtain a copy of the License at | |||
* | * | |||
* https://www.apache.org/licenses/LICENSE-2.0 | * https://www.apache.org/licenses/LICENSE-2.0 | |||
* | * | |||
* Unless required by applicable law or agreed to in writing, software | * Unless required by applicable law or agreed to in writing, software | |||
* distributed under the License is distributed on an "AS IS" BASIS, | * distributed under the License is distributed on an "AS IS" BASIS, | |||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | |||
skipping to change at line 42 | skipping to change at line 42 | |||
/** | /** | |||
* {@link HazelcastConfigResourceCondition} that checks if the | * {@link HazelcastConfigResourceCondition} that checks if the | |||
* {@code spring.hazelcast.config} configuration key is defined. | * {@code spring.hazelcast.config} configuration key is defined. | |||
* | * | |||
* @author Stephane Nicoll | * @author Stephane Nicoll | |||
*/ | */ | |||
class HazelcastClientConfigAvailableCondition extends HazelcastConfigResourceCon dition { | class HazelcastClientConfigAvailableCondition extends HazelcastConfigResourceCon dition { | |||
HazelcastClientConfigAvailableCondition() { | HazelcastClientConfigAvailableCondition() { | |||
super(HazelcastClientConfiguration.CONFIG_SYSTEM_PROPERTY, "file: ./hazelcast-client.xml", | super(HazelcastClientConfiguration.CONFIG_SYSTEM_PROPERTY, "file: ./hazelcast-client.xml", | |||
"classpath:/hazelcast-client.xml", "file:./hazelc | "classpath:/hazelcast-client.xml", "file:./hazelc | |||
ast-client.yaml", "classpath:/hazelcast-client.yaml"); | ast-client.yaml", "classpath:/hazelcast-client.yaml", | |||
"file:./hazelcast-client.yml", "classpath:/hazelc | ||||
ast-client.yml"); | ||||
} | } | |||
@Override | @Override | |||
public ConditionOutcome getMatchOutcome(ConditionContext context, Annotat edTypeMetadata metadata) { | public ConditionOutcome getMatchOutcome(ConditionContext context, Annotat edTypeMetadata metadata) { | |||
if (context.getEnvironment().containsProperty(HAZELCAST_CONFIG_PR OPERTY)) { | if (context.getEnvironment().containsProperty(HAZELCAST_CONFIG_PR OPERTY)) { | |||
ConditionOutcome configValidationOutcome = Hazelcast4Clie ntValidation.clientConfigOutcome(context, | ConditionOutcome configValidationOutcome = Hazelcast4Clie ntValidation.clientConfigOutcome(context, | |||
HAZELCAST_CONFIG_PROPERTY, startCondition Message()); | HAZELCAST_CONFIG_PROPERTY, startCondition Message()); | |||
return (configValidationOutcome != null) ? configValidati onOutcome : ConditionOutcome | return (configValidationOutcome != null) ? configValidati onOutcome : ConditionOutcome | |||
.match(startConditionMessage().foundExact ly("property " + HAZELCAST_CONFIG_PROPERTY)); | .match(startConditionMessage().foundExact ly("property " + HAZELCAST_CONFIG_PROPERTY)); | |||
} | } | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 5 lines changed or added |