Skip to content

Commit 1ef1a74

Browse files
committed
HHH-18964 use switch expression
1 parent e0d7d56 commit 1ef1a74

File tree

1 file changed

+31
-54
lines changed

1 file changed

+31
-54
lines changed

hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/DefaultJtaPlatformSelector.java

Lines changed: 31 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,17 @@ public class DefaultJtaPlatformSelector implements LazyServiceResolver<JtaPlatfo
2828
@Override
2929
public Class<? extends JtaPlatform> resolve(final String name) {
3030
Objects.requireNonNull( name);
31-
if ( name.isEmpty() ) {
31+
if ( name.isBlank() ) {
3232
return null;
3333
}
3434
//Let's organize all string matches in groups by first letter:
35-
final char n = name.charAt( 0 );
36-
switch ( n ) {
37-
case 'B': return caseB( name );
38-
case 'J': return caseJ( name );
39-
case 'W': return caseW( name );
40-
case 'o': return caseLegacy( name, this );
41-
default: return caseOthers( name );
42-
}
35+
return switch ( name.charAt( 0 ) ) {
36+
case 'B' -> caseB( name );
37+
case 'J'-> caseJ( name );
38+
case 'W'-> caseW( name );
39+
case 'o'-> caseLegacy( name, this );
40+
default -> caseOthers( name );
41+
};
4342
}
4443

4544
private static Class<? extends JtaPlatform> caseB(final String name) {
@@ -50,57 +49,35 @@ private static Class<? extends JtaPlatform> caseB(final String name) {
5049
}
5150

5251
private static Class<? extends JtaPlatform> caseJ(final String name) {
53-
if ( "JBossAS".equals( name ) ) {
54-
return JBossAppServerJtaPlatform.class;
55-
}
56-
if ( "JBossTS".equals( name ) ) {
57-
return JBossStandAloneJtaPlatform.class;
58-
}
59-
if ( "JOnAS".equals( name ) ) {
60-
return JOnASJtaPlatform.class;
61-
}
62-
if ( "JOTM".equals( name ) ) {
63-
return JOTMJtaPlatform.class;
64-
}
65-
if ( "JRun4".equals( name ) ) {
66-
return JRun4JtaPlatform.class;
67-
}
68-
return null;
52+
return switch ( name ) {
53+
case "JBossAS" -> JBossAppServerJtaPlatform.class;
54+
case "JBossTS" -> JBossStandAloneJtaPlatform.class;
55+
case "JOnAS" -> JOnASJtaPlatform.class;
56+
case "JOTM" -> JOTMJtaPlatform.class;
57+
case "JRun4" -> JRun4JtaPlatform.class;
58+
case null, default -> null;
59+
};
6960
}
7061

7162
private static Class<? extends JtaPlatform> caseW(final String name) {
72-
if ( "Weblogic".equals( name ) ) {
73-
return WeblogicJtaPlatform.class;
74-
}
75-
if ( "WebSphereLiberty".equals( name ) ) {
76-
return WebSphereLibertyJtaPlatform.class;
77-
}
78-
if ( "WebSphere".equals( name ) ) {
79-
return WebSphereJtaPlatform.class;
80-
}
81-
if ( "WebSphereExtended".equals( name ) ) {
82-
return WebSphereExtendedJtaPlatform.class;
83-
}
84-
return null;
63+
return switch ( name ) {
64+
case "Weblogic" -> WeblogicJtaPlatform.class;
65+
case "WebSphereLiberty" -> WebSphereLibertyJtaPlatform.class;
66+
case "WebSphere" -> WebSphereJtaPlatform.class;
67+
case "WebSphereExtended" -> WebSphereExtendedJtaPlatform.class;
68+
case null, default -> null;
69+
};
8570
}
8671

8772
private static Class<? extends JtaPlatform> caseOthers(final String name) {
88-
if ( "Atomikos".equals( name ) ) {
89-
return AtomikosJtaPlatform.class;
90-
}
91-
if ( "OC4J".equals( name ) ) {
92-
return OC4JJtaPlatform.class;
93-
}
94-
if ( "Orion".equals( name ) ) {
95-
return OrionJtaPlatform.class;
96-
}
97-
if ( "Resin".equals( name ) ) {
98-
return ResinJtaPlatform.class;
99-
}
100-
if ( "SunOne".equals( name ) ) {
101-
return SunOneJtaPlatform.class;
102-
}
103-
return null;
73+
return switch ( name ) {
74+
case "Atomikos" -> AtomikosJtaPlatform.class;
75+
case "OC4J" -> OC4JJtaPlatform.class;
76+
case "Orion" -> OrionJtaPlatform.class;
77+
case "Resin" -> ResinJtaPlatform.class;
78+
case "SunOne" -> SunOneJtaPlatform.class;
79+
case null, default -> null;
80+
};
10481
}
10582

10683
/**

0 commit comments

Comments
 (0)