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
c5241f0e
Commit
c5241f0e
authored
Jul 09, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove accidental usage of com.hazelcast.util.Base64
Closes gh-17461
parent
cc6ef038
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
Neo4jPropertiesTests.java
...k/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java
+4
-5
checkstyle.xml
src/checkstyle/checkstyle.xml
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java
View file @
c5241f0e
...
@@ -16,7 +16,8 @@
...
@@ -16,7 +16,8 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
data
.
neo4j
;
package
org
.
springframework
.
boot
.
autoconfigure
.
data
.
neo4j
;
import
com.hazelcast.util.Base64
;
import
java.util.Base64
;
import
org.junit.After
;
import
org.junit.After
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.neo4j.ogm.config.AutoIndexMode
;
import
org.neo4j.ogm.config.AutoIndexMode
;
...
@@ -149,10 +150,8 @@ public class Neo4jPropertiesTests {
...
@@ -149,10 +150,8 @@ public class Neo4jPropertiesTests {
assertThat
(
credentials
).
isNotNull
();
assertThat
(
credentials
).
isNotNull
();
Object
content
=
credentials
.
credentials
();
Object
content
=
credentials
.
credentials
();
assertThat
(
content
).
isInstanceOf
(
String
.
class
);
assertThat
(
content
).
isInstanceOf
(
String
.
class
);
String
[]
auth
=
new
String
(
Base64
.
decode
(((
String
)
content
).
getBytes
())).
split
(
":"
);
String
[]
auth
=
new
String
(
Base64
.
getDecoder
().
decode
((
String
)
content
)).
split
(
":"
);
assertThat
(
auth
[
0
]).
isEqualTo
(
username
);
assertThat
(
auth
).
containsExactly
(
username
,
password
);
assertThat
(
auth
[
1
]).
isEqualTo
(
password
);
assertThat
(
auth
).
hasSize
(
2
);
}
}
}
}
...
...
src/checkstyle/checkstyle.xml
View file @
c5241f0e
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<property
name=
"illegalPkgs"
<property
name=
"illegalPkgs"
value=
"^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|pool2).*, ^com\.google\.common.*, ^org\.flywaydb\.core\.internal.*, ^org\.testcontainers\.shaded.*"
/>
value=
"^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|pool2).*, ^com\.google\.common.*, ^org\.flywaydb\.core\.internal.*, ^org\.testcontainers\.shaded.*"
/>
<property
name=
"illegalClasses"
<property
name=
"illegalClasses"
value=
"^
reactor\.core\.support\.Assert, ^org\.junit\.rules\.ExpectedException, ^org\.slf4j\.LoggerFactory
"
/>
value=
"^
com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.slf4j\.LoggerFactory, ^reactor\.core\.support\.Assert
"
/>
</module>
</module>
<module
<module
name=
"com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck"
>
name=
"com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck"
>
...
...
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