25
25
import org .springframework .boot .actuate .health .HealthIndicator ;
26
26
import org .springframework .boot .actuate .health .Status ;
27
27
import org .springframework .boot .info .SslInfo ;
28
- import org .springframework .boot .info .SslInfo .Bundle ;
29
- import org .springframework .boot .info .SslInfo .CertificateChain ;
28
+ import org .springframework .boot .info .SslInfo .BundleInfo ;
29
+ import org .springframework .boot .info .SslInfo .CertificateChainInfo ;
30
30
import org .springframework .boot .info .SslInfo .CertificateInfo ;
31
- import org .springframework .boot .info .SslInfo .CertificateInfo . Validity ;
31
+ import org .springframework .boot .info .SslInfo .CertificateValidityInfo ;
32
32
33
33
import static org .assertj .core .api .Assertions .assertThat ;
34
34
import static org .mockito .BDDMockito .given ;
@@ -43,18 +43,16 @@ class SslHealthIndicatorTests {
43
43
44
44
private HealthIndicator healthIndicator ;
45
45
46
- private Validity validity ;
46
+ private CertificateValidityInfo validity ;
47
47
48
48
@ BeforeEach
49
49
void setUp () {
50
50
SslInfo sslInfo = mock (SslInfo .class );
51
- Bundle bundle = mock (Bundle .class );
52
- CertificateChain certificateChain = mock (CertificateChain .class );
51
+ BundleInfo bundle = mock (BundleInfo .class );
52
+ CertificateChainInfo certificateChain = mock (CertificateChainInfo .class );
53
53
CertificateInfo certificateInfo = mock (CertificateInfo .class );
54
-
55
54
this .healthIndicator = new SslHealthIndicator (sslInfo );
56
- this .validity = mock (Validity .class );
57
-
55
+ this .validity = mock (CertificateValidityInfo .class );
58
56
given (sslInfo .getBundles ()).willReturn (List .of (bundle ));
59
57
given (bundle .getCertificateChains ()).willReturn (List .of (certificateChain ));
60
58
given (certificateChain .getCertificates ()).willReturn (List .of (certificateInfo ));
@@ -63,54 +61,54 @@ void setUp() {
63
61
64
62
@ Test
65
63
void shouldBeUpIfNoSslIssuesDetected () {
66
- given (this .validity .getStatus ()).willReturn (Validity .Status .VALID );
64
+ given (this .validity .getStatus ()).willReturn (CertificateValidityInfo .Status .VALID );
67
65
Health health = this .healthIndicator .health ();
68
66
assertThat (health .getStatus ()).isEqualTo (Status .UP );
69
67
assertDetailsKeys (health );
70
- List <CertificateChain > validChains = getValidChains (health );
68
+ List <CertificateChainInfo > validChains = getValidChains (health );
71
69
assertThat (validChains ).hasSize (1 );
72
- assertThat (validChains .get (0 )).isInstanceOf (CertificateChain .class );
73
- List <CertificateChain > invalidChains = getInvalidChains (health );
70
+ assertThat (validChains .get (0 )).isInstanceOf (CertificateChainInfo .class );
71
+ List <CertificateChainInfo > invalidChains = getInvalidChains (health );
74
72
assertThat (invalidChains ).isEmpty ();
75
73
}
76
74
77
75
@ Test
78
76
void shouldBeOutOfServiceIfACertificateIsExpired () {
79
- given (this .validity .getStatus ()).willReturn (Validity .Status .EXPIRED );
77
+ given (this .validity .getStatus ()).willReturn (CertificateValidityInfo .Status .EXPIRED );
80
78
Health health = this .healthIndicator .health ();
81
79
assertThat (health .getStatus ()).isEqualTo (Status .OUT_OF_SERVICE );
82
80
assertDetailsKeys (health );
83
- List <CertificateChain > validChains = getValidChains (health );
81
+ List <CertificateChainInfo > validChains = getValidChains (health );
84
82
assertThat (validChains ).isEmpty ();
85
- List <CertificateChain > invalidChains = getInvalidChains (health );
83
+ List <CertificateChainInfo > invalidChains = getInvalidChains (health );
86
84
assertThat (invalidChains ).hasSize (1 );
87
- assertThat (invalidChains .get (0 )).isInstanceOf (CertificateChain .class );
85
+ assertThat (invalidChains .get (0 )).isInstanceOf (CertificateChainInfo .class );
88
86
}
89
87
90
88
@ Test
91
89
void shouldBeOutOfServiceIfACertificateIsNotYetValid () {
92
- given (this .validity .getStatus ()).willReturn (Validity .Status .NOT_YET_VALID );
90
+ given (this .validity .getStatus ()).willReturn (CertificateValidityInfo .Status .NOT_YET_VALID );
93
91
Health health = this .healthIndicator .health ();
94
92
assertThat (health .getStatus ()).isEqualTo (Status .OUT_OF_SERVICE );
95
93
assertDetailsKeys (health );
96
- List <CertificateChain > validChains = getValidChains (health );
94
+ List <CertificateChainInfo > validChains = getValidChains (health );
97
95
assertThat (validChains ).isEmpty ();
98
- List <CertificateChain > invalidChains = getInvalidChains (health );
96
+ List <CertificateChainInfo > invalidChains = getInvalidChains (health );
99
97
assertThat (invalidChains ).hasSize (1 );
100
- assertThat (invalidChains .get (0 )).isInstanceOf (CertificateChain .class );
98
+ assertThat (invalidChains .get (0 )).isInstanceOf (CertificateChainInfo .class );
101
99
102
100
}
103
101
104
102
@ Test
105
103
void shouldReportWarningIfACertificateWillExpireSoon () {
106
- given (this .validity .getStatus ()).willReturn (Validity .Status .WILL_EXPIRE_SOON );
104
+ given (this .validity .getStatus ()).willReturn (CertificateValidityInfo .Status .WILL_EXPIRE_SOON );
107
105
Health health = this .healthIndicator .health ();
108
106
assertThat (health .getStatus ()).isEqualTo (Status .UP );
109
107
assertDetailsKeys (health );
110
- List <CertificateChain > validChains = getValidChains (health );
108
+ List <CertificateChainInfo > validChains = getValidChains (health );
111
109
assertThat (validChains ).hasSize (1 );
112
- assertThat (validChains .get (0 )).isInstanceOf (CertificateChain .class );
113
- List <CertificateChain > invalidChains = getInvalidChains (health );
110
+ assertThat (validChains .get (0 )).isInstanceOf (CertificateChainInfo .class );
111
+ List <CertificateChainInfo > invalidChains = getInvalidChains (health );
114
112
assertThat (invalidChains ).isEmpty ();
115
113
}
116
114
@@ -119,13 +117,13 @@ private static void assertDetailsKeys(Health health) {
119
117
}
120
118
121
119
@ SuppressWarnings ("unchecked" )
122
- private static List <CertificateChain > getInvalidChains (Health health ) {
123
- return (List <CertificateChain >) health .getDetails ().get ("invalidChains" );
120
+ private static List <CertificateChainInfo > getInvalidChains (Health health ) {
121
+ return (List <CertificateChainInfo >) health .getDetails ().get ("invalidChains" );
124
122
}
125
123
126
124
@ SuppressWarnings ("unchecked" )
127
- private static List <CertificateChain > getValidChains (Health health ) {
128
- return (List <CertificateChain >) health .getDetails ().get ("validChains" );
125
+ private static List <CertificateChainInfo > getValidChains (Health health ) {
126
+ return (List <CertificateChainInfo >) health .getDetails ().get ("validChains" );
129
127
}
130
128
131
129
}
0 commit comments