Skip to content

Commit b208da2

Browse files
author
roeeri
committed
ITA-562-QA Minor formatting changes and renamed test classes
1 parent abb8c1f commit b208da2

File tree

5 files changed

+25
-35
lines changed

5 files changed

+25
-35
lines changed

‎servicebuilder-db-jdbi/src/main/java/no/obos/util/servicebuilder/addon/Jdbi2Addon.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
@Deprecated
2020
public class Jdbi2Addon implements JdbiAddon {
2121

22-
public static final JdbiAddon defaults =
23-
new Jdbi2Addon(null, null, ImmutableList.of());
22+
public static final JdbiAddon defaults = new Jdbi2Addon(null, null, ImmutableList.of());
23+
2424
@Getter
2525
@Wither
2626
final String name;
27+
2728
@Wither
2829
final DBI dbi;
30+
2931
@Wither
3032
final ImmutableList<Class<?>> daos;
3133

@@ -35,15 +37,12 @@ private Jdbi2Addon(String name, DBI dbi, ImmutableList<Class<?>> daos) {
3537
this.daos = daos;
3638
}
3739

38-
39-
public Addon initialize(ServiceConfig serviceConfig)
40-
{
40+
public Addon initialize(ServiceConfig serviceConfig) {
4141
DataSource dataSource = JdbiAddonUtil.getDataSource(this, serviceConfig, name);
4242
DBI dbi = new DBI(dataSource);
4343
return this.dbi(dbi);
4444
}
4545

46-
4746
@Override
4847
public void addToJerseyConfig(JerseyConfig jerseyConfig) {
4948
jerseyConfig.addBinder(binder -> {

‎servicebuilder-db-jdbi/src/main/java/no/obos/util/servicebuilder/util/JdbiAddonUtil.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ public abstract class JdbiAddonUtil {
1212

1313
public static DataSource getDataSource(JdbiAddon jdbiAddon, ServiceConfig serviceConfig, String name) {
1414
DataSourceAddon dataSourceAddon = serviceConfig.addonInstanceNamed(DataSourceAddon.class, name);
15+
1516
if (dataSourceAddon == null) {
1617
if (name == null) {
1718
throw new DependenceException(jdbiAddon.getClass(), DataSourceAddon.class, " no unnamed datasourceaddon found");
1819
} else {
1920
throw new DependenceException(jdbiAddon.getClass(), DataSourceAddon.class, " no datasourceaddon for name " + name);
2021
}
2122
}
23+
2224
return dataSourceAddon.getDataSource();
2325
}
2426

‎servicebuilder-db-jdbi/src/test/java/no/obos/util/servicebuilder/addon/Jdbiv2AddonTest.java‎ renamed to ‎servicebuilder-db-jdbi/src/test/java/no/obos/util/servicebuilder/addon/Jdbi2AddonTest.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
1919

20-
public class Jdbiv2AddonTest {
20+
public class Jdbi2AddonTest {
2121

22+
private static final String ADDON_NAME = "Banan";
2223

23-
private static final String addon_name = "Banan";
2424
private ServiceConfig serviceConfig = ServiceConfig.defaults(ServiceDefinitionUtil.simple(Api.class))
2525
.addon(ExceptionMapperAddon.defaults)
26-
.addon(H2InMemoryDatasourceAddon.defaults.name("Banan")
26+
.addon(H2InMemoryDatasourceAddon.defaults.name(ADDON_NAME)
2727
.script("CREATE TABLE testable (id INTEGER, name VARCHAR);")
2828
.insert("testable", 101, "'Per'")
2929
.insert("testable", 303, "'Espen'")
3030
.script("INSERT INTO testable VALUES (202, 'Per');")
3131
)
32-
.addon(Jdbi2Addon.defaults.dao(JdbiDto.class).name("Banan"))
32+
.addon(Jdbi2Addon.defaults.dao(JdbiDto.class).name(ADDON_NAME))
3333
.bind(ApiImpl.class, Api.class);
3434

3535
@Test
@@ -46,32 +46,28 @@ public void testChainExample() {
4646
TestServiceRunner.defaults(serviceConfig)
4747
.chain()
4848
.call(Api.class, Api::get)
49-
.addonNamed(addon_name, JdbiAddon.class, it -> {
49+
.addonNamed(ADDON_NAME, JdbiAddon.class, it -> {
5050
List<Integer> actual = it.createDao(JdbiDto.class).doGet("Per");
5151
assertThat(actual).isEqualTo(expected);
5252
})
5353
.run();
5454
}
5555

56-
5756
public interface JdbiDto {
58-
5957
@SqlQuery("SELECT\n"
6058
+ " id\n"
6159
+ "FROM testable \n"
6260
+ "WHERE name = :param\n")
6361
List<Integer> doGet(@Bind("param") String param);
6462
}
6563

66-
6764
public @Path("")
6865
interface Api {
6966
@GET
7067
@Produces(MediaType.APPLICATION_JSON)
7168
List<Integer> get();
7269
}
7370

74-
7571
public static class ApiImpl implements Api {
7672
@Inject
7773
JdbiDto jdbiDto;
@@ -80,4 +76,5 @@ public List<Integer> get() {
8076
return jdbiDto.doGet("Per");
8177
}
8278
}
79+
8380
}

‎servicebuilder-db-jdbi/src/test/java/no/obos/util/servicebuilder/addon/Jdbiv3AddonTest.java‎ renamed to ‎servicebuilder-db-jdbi/src/test/java/no/obos/util/servicebuilder/addon/Jdbi3AddonTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
1919

20-
public class Jdbiv3AddonTest {
20+
public class Jdbi3AddonTest {
2121

22-
23-
private static final String addon_name = "Banan";
22+
private static final String ADDON_NAME = "Banan";
2423
private ServiceConfig serviceConfig = ServiceConfig.defaults(ServiceDefinitionUtil.simple(Api.class))
2524
.addon(ExceptionMapperAddon.defaults)
2625
.addon(H2InMemoryDatasourceAddon.defaults.name("Banan")
@@ -29,7 +28,7 @@ public class Jdbiv3AddonTest {
2928
.insert("testable", 303, "'Espen'")
3029
.script("INSERT INTO testable VALUES (202, 'Per');")
3130
)
32-
.addon(JdbiAddon.defaults.dao(JdbiDto.class).name("Banan"))
31+
.addon(JdbiAddon.defaults.dao(JdbiDto.class).name(ADDON_NAME))
3332
.bind(ApiImpl.class, Api.class);
3433

3534
@Test
@@ -46,15 +45,14 @@ public void testChainExample() {
4645
TestServiceRunner.defaults(serviceConfig)
4746
.chain()
4847
.call(Api.class, Api::get)
49-
.addonNamed(addon_name, JdbiAddon.class, it -> {
48+
.addonNamed(ADDON_NAME, JdbiAddon.class, it -> {
5049
List<Integer> actual = it.createDao(JdbiDto.class).doGet("Per");
5150
assertThat(actual).isEqualTo(expected);
5251
})
5352
.run();
5453
}
5554

5655
public interface JdbiDto {
57-
5856
@SqlQuery("SELECT\n"
5957
+ " id\n"
6058
+ "FROM testable \n"
@@ -79,4 +77,5 @@ public List<Integer> get() {
7977
return jdbiDto.doGet("Per");
8078
}
8179
}
80+
8281
}

‎servicebuilder-db-jdbi/src/test/java/no/obos/util/servicebuilder/addon/JdbiAddonTwoDatabasesTest.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,25 @@
1919

2020
public class JdbiAddonTwoDatabasesTest {
2121

22-
23-
private static final String addon_name = "Banan";
24-
private static final String addon_name2 = "Eple";
22+
private static final String ADDON_NAME = "Banan";
23+
private static final String ADDON_NAME2 = "Eple";
2524

2625
private ServiceConfig serviceConfig = ServiceConfig.defaults(ServiceDefinitionUtil.simple(Api.class))
2726
.addon(ExceptionMapperAddon.defaults)
28-
.addon(H2InMemoryDatasourceAddon.defaults.name(addon_name)
27+
.addon(H2InMemoryDatasourceAddon.defaults.name(ADDON_NAME)
2928
.script("CREATE TABLE testable (id INTEGER, name VARCHAR);")
3029
.insert("testable", 101, "'Per'")
3130
.insert("testable", 303, "'Espen'")
3231
.script("INSERT INTO testable VALUES (202, 'Per');")
3332
)
34-
.addon(JdbiAddon.defaults.dao(JdbiDto.class).name(addon_name))
35-
.addon(H2InMemoryDatasourceAddon.defaults.name(addon_name2)
33+
.addon(JdbiAddon.defaults.dao(JdbiDto.class).name(ADDON_NAME))
34+
.addon(H2InMemoryDatasourceAddon.defaults.name(ADDON_NAME2)
3635
.script("CREATE TABLE mongoable (id VARCHAR, name VARCHAR);")
3736
.insert("mongoable", "'eple'", "'Per'")
3837
.insert("mongoable", "'kake'", "'Espen'")
3938
.insert("mongoable", "'bil'", "'Per'")
4039
)
41-
.addon(JdbiAddon.defaults.dao(JdbiDto2.class).name(addon_name2))
40+
.addon(JdbiAddon.defaults.dao(JdbiDto2.class).name(ADDON_NAME2))
4241
.bind(ApiImpl.class, Api.class)
4342
.bind(ApiImpl2.class, Api2.class);
4443

@@ -62,43 +61,36 @@ public void testChainExample() {
6261
.run();
6362
}
6463

65-
6664
public interface JdbiDto {
67-
6865
@SqlQuery("SELECT\n"
6966
+ " id\n"
7067
+ "FROM testable \n"
7168
+ "WHERE name = :param\n")
7269
List<Integer> doGet(@Bind("param") String param);
7370
}
7471

75-
7672
public @Path("")
7773
interface Api {
7874
@GET
7975
@Produces(MediaType.APPLICATION_JSON)
8076
List<Integer> get();
8177
}
8278

83-
8479
public interface JdbiDto2 {
85-
8680
@SqlQuery("SELECT\n"
8781
+ " id\n"
8882
+ "FROM mongoable \n"
8983
+ "WHERE name = :param\n")
9084
List<String> doGet2(@Bind("param") String param);
9185
}
9286

93-
9487
public @Path("")
9588
interface Api2 {
9689
@GET
9790
@Produces(MediaType.APPLICATION_JSON)
9891
List<String> get2();
9992
}
10093

101-
10294
public static class ApiImpl implements Api {
10395
@Inject
10496
JdbiDto jdbiDto;
@@ -117,4 +109,5 @@ public List<String> get2() {
117109
return jdbiDto.doGet2("Per");
118110
}
119111
}
112+
120113
}

0 commit comments

Comments
 (0)