Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
002a7c6e
Commit
002a7c6e
authored
Mar 30, 2020
by
Ali Gurbuz
Committed by
Stephane Nicoll
Apr 01, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable Hazelcast auto-configuration when Jet is present
See gh-20729
parent
dfac3a28
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
81 additions
and
0 deletions
+81
-0
HazelcastAutoConfiguration.java
...t/autoconfigure/hazelcast/HazelcastAutoConfiguration.java
+2
-0
HazelcastJetConfigMissingCondition.java
...nfigure/hazelcast/HazelcastJetConfigMissingCondition.java
+44
-0
HazelcastAutoConfigurationTests.java
...oconfigure/hazelcast/HazelcastAutoConfigurationTests.java
+35
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfiguration.java
View file @
002a7c6e
...
...
@@ -21,6 +21,7 @@ import com.hazelcast.core.HazelcastInstance;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.context.annotation.Conditional
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
...
...
@@ -35,6 +36,7 @@ import org.springframework.context.annotation.Import;
* @see HazelcastConfigResourceCondition
*/
@Configuration
(
proxyBeanMethods
=
false
)
@Conditional
(
HazelcastJetConfigMissingCondition
.
class
)
@ConditionalOnClass
(
HazelcastInstance
.
class
)
@EnableConfigurationProperties
(
HazelcastProperties
.
class
)
@Import
({
HazelcastClientConfiguration
.
class
,
HazelcastServerConfiguration
.
class
})
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastJetConfigMissingCondition.java
0 → 100644
View file @
002a7c6e
/*
* 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
*
* https://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
org
.
springframework
.
boot
.
autoconfigure
.
hazelcast
;
import
org.springframework.boot.autoconfigure.condition.ConditionOutcome
;
import
org.springframework.boot.autoconfigure.condition.SpringBootCondition
;
import
org.springframework.context.annotation.ConditionContext
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.type.AnnotatedTypeMetadata
;
/**
* {@link SpringBootCondition} that checks if the Hazelcast Jet is missing on the
* classpath by looking up the default configuration file.
*
* @author Ali Gurbuz
* @since 2.3.0
*/
public
class
HazelcastJetConfigMissingCondition
extends
SpringBootCondition
{
private
static
final
String
HAZELCAST_JET_CONFIG_FILE
=
"classpath:/hazelcast-jet-default.yaml"
;
public
ConditionOutcome
getMatchOutcome
(
ConditionContext
context
,
AnnotatedTypeMetadata
metadata
)
{
Resource
resource
=
context
.
getResourceLoader
().
getResource
(
HAZELCAST_JET_CONFIG_FILE
);
if
(
resource
.
exists
())
{
return
ConditionOutcome
.
noMatch
(
"Found Hazelcast Jet default config file on the classpath"
);
}
return
ConditionOutcome
.
match
(
"Hazelcast Jet default config file is missing on the classpath"
);
}
}
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java
View file @
002a7c6e
...
...
@@ -16,8 +16,12 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
hazelcast
;
import
java.net.MalformedURLException
;
import
java.net.URL
;
import
com.hazelcast.config.Config
;
import
com.hazelcast.core.HazelcastInstance
;
import
org.jetbrains.annotations.Nullable
;
import
org.junit.jupiter.api.Test
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
...
...
@@ -47,4 +51,35 @@ class HazelcastAutoConfigurationTests {
});
}
@Test
void
testHazelcastInstanceNotCreatedWhenJetIsPresent
()
{
this
.
contextRunner
.
withClassLoader
(
new
JetConfigClassLoader
())
.
run
((
context
)
->
assertThat
(
context
).
doesNotHaveBean
(
HazelcastInstance
.
class
));
}
/**
* A specific class loader which emulates that default Hazelcast Jet configuration
* file exists on the classpath.
*/
static
class
JetConfigClassLoader
extends
ClassLoader
{
JetConfigClassLoader
()
{
super
(
JetConfigClassLoader
.
class
.
getClassLoader
());
}
@Nullable
@Override
public
URL
getResource
(
String
name
)
{
if
(
name
.
equals
(
"hazelcast-jet-default.yaml"
))
{
try
{
return
new
URL
(
"file://hazelcast-jet-default.yaml"
);
}
catch
(
MalformedURLException
ignored
)
{
}
}
return
super
.
getResource
(
name
);
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment