Skip to content

Commit e970346

Browse files
committed
Remove Deprecated methods from DataSourcePool and PoolStatus (migrate to renamed methods)
1 parent 5a40a35 commit e970346

File tree

2 files changed

+0
-88
lines changed

2 files changed

+0
-88
lines changed

ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourcePool.java

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,6 @@ static DataSourceBuilder builder() {
4747
*/
4848
String name();
4949

50-
/**
51-
* @deprecated migrate to {@link #name()}.
52-
*/
53-
@Deprecated
54-
default String getName() {
55-
return name();
56-
}
57-
5850
/**
5951
* Return the current size of the pool. This includes both busy and idle connections.
6052
*/
@@ -105,27 +97,11 @@ default String getName() {
10597
*/
10698
PoolStatus status(boolean reset);
10799

108-
/**
109-
* @deprecated migrate to {@link #status(boolean)}.
110-
*/
111-
@Deprecated
112-
default PoolStatus getStatus(boolean reset) {
113-
return status(reset);
114-
}
115-
116100
/**
117101
* Returns the reason, why the dataSource is down.
118102
*/
119103
SQLException dataSourceDownReason();
120104

121-
/**
122-
* @deprecated migrate to {@link #dataSourceDownReason()}
123-
*/
124-
@Deprecated
125-
default SQLException getDataSourceDownReason() {
126-
return dataSourceDownReason();
127-
}
128-
129105
/**
130106
* Set a new maximum size.
131107
* <p>

ebean-datasource-api/src/main/java/io/ebean/datasource/PoolStatus.java

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -10,105 +10,41 @@ public interface PoolStatus {
1010
*/
1111
int minSize();
1212

13-
/**
14-
* Deprecated migrate to minSize()
15-
*/
16-
@Deprecated
17-
default int getMinSize() {
18-
return minSize();
19-
}
20-
2113
/**
2214
* Return the pools maximum size.
2315
*/
2416
int maxSize();
2517

26-
/**
27-
* Deprecated migrate to maxSize()
28-
*/
29-
@Deprecated
30-
default int getMaxSize() {
31-
return maxSize();
32-
}
33-
3418
/**
3519
* Return number of free connections.
3620
*/
3721
int free();
3822

39-
/**
40-
* Deprecated migrate to free()
41-
*/
42-
@Deprecated
43-
default int getFree() {
44-
return free();
45-
}
46-
4723
/**
4824
* Return number of busy connections.
4925
*/
5026
int busy();
5127

52-
/**
53-
* Deprecated migrate to busy()
54-
*/
55-
@Deprecated
56-
default int getBusy() {
57-
return busy();
58-
}
59-
6028
/**
6129
* Return the number of threads waiting for connections.
6230
*/
6331
int waiting();
6432

65-
/**
66-
* Deprecated migrate to waiting()
67-
*/
68-
@Deprecated
69-
default int getWaiting() {
70-
return waiting();
71-
}
72-
7333
/**
7434
* Return the busy connection high water mark.
7535
*/
7636
int highWaterMark();
7737

78-
/**
79-
* Deprecated migrate to waiting()
80-
*/
81-
@Deprecated
82-
default int getHighWaterMark() {
83-
return highWaterMark();
84-
}
85-
8638
/**
8739
* Return the number of times threads had to wait for connections.
8840
*/
8941
int waitCount();
9042

91-
/**
92-
* Deprecated migrate to waitCount()
93-
*/
94-
@Deprecated
95-
default int getWaitCount() {
96-
return waitCount();
97-
}
98-
9943
/**
10044
* Return the hit count against the pool.
10145
*/
10246
int hitCount();
10347

104-
/**
105-
* Deprecated migrate to hitCount()
106-
*/
107-
@Deprecated
108-
default int getHitCount() {
109-
return hitCount();
110-
}
111-
11248
/**
11349
* Return the max acquire time in micros.
11450
*/

0 commit comments

Comments
 (0)