Skip to content

Commit a13f920

Browse files
goekaygoekay
committed
refactor: make package names less error-prone
1 parent 9ed3fe2 commit a13f920

6 files changed

Lines changed: 24 additions & 6 deletions

File tree

‎src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12JacksonModule.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ public void setupModule(SetupContext sc) {
2222
super.setupModule(sc);
2323

2424
EnumProcessor.apply(
25-
Arrays.asList("ocpp.cp._2010._08", "ocpp.cs._2010._08"),
25+
Arrays.asList(
26+
ocpp.cs._2010._08.ObjectFactory.class.getPackage().getName(),
27+
ocpp.cp._2010._08.ObjectFactory.class.getPackage().getName()
28+
),
2629
clazz -> sc.setMixInAnnotations(clazz, EnumMixin.class)
2730
);
2831
}

‎src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp12/Ocpp12TypeStore.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ public final class Ocpp12TypeStore extends AbstractTypeStore {
1111
public static final Ocpp12TypeStore INSTANCE = new Ocpp12TypeStore();
1212

1313
private Ocpp12TypeStore() {
14-
super("ocpp.cs._2010._08", "ocpp.cp._2010._08");
14+
super(
15+
ocpp.cs._2010._08.ObjectFactory.class.getPackage().getName(),
16+
ocpp.cp._2010._08.ObjectFactory.class.getPackage().getName()
17+
);
1518
}
1619
}

‎src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15JacksonModule.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ public void setupModule(Module.SetupContext sc) {
2727
sc.setMixInAnnotations(MeterValuesRequest.class, MeterValue15Mixin.class);
2828

2929
EnumProcessor.apply(
30-
Arrays.asList("ocpp.cp._2012._06", "ocpp.cs._2012._06"),
30+
Arrays.asList(
31+
ocpp.cs._2012._06.ObjectFactory.class.getPackage().getName(),
32+
ocpp.cp._2012._06.ObjectFactory.class.getPackage().getName()
33+
),
3134
clazz -> sc.setMixInAnnotations(clazz, EnumMixin.class)
3235
);
3336
}

‎src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp15/Ocpp15TypeStore.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ public final class Ocpp15TypeStore extends AbstractTypeStore {
1111
public static final Ocpp15TypeStore INSTANCE = new Ocpp15TypeStore();
1212

1313
private Ocpp15TypeStore() {
14-
super("ocpp.cs._2012._06", "ocpp.cp._2012._06");
14+
super(
15+
ocpp.cs._2012._06.ObjectFactory.class.getPackage().getName(),
16+
ocpp.cp._2012._06.ObjectFactory.class.getPackage().getName()
17+
);
1518
}
1619

1720
}

‎src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16JacksonModule.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ public void setupModule(SetupContext sc) {
2222
super.setupModule(sc);
2323

2424
EnumProcessor.apply(
25-
Arrays.asList("ocpp.cp._2015._10", "ocpp.cs._2015._10"),
25+
Arrays.asList(
26+
ocpp.cs._2015._10.ObjectFactory.class.getPackage().getName(),
27+
ocpp.cp._2015._10.ObjectFactory.class.getPackage().getName()
28+
),
2629
clazz -> sc.setMixInAnnotations(clazz, EnumMixin.class)
2730
);
2831
}

‎src/main/java/de/rwth/idsg/steve/ocpp/ws/ocpp16/Ocpp16TypeStore.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ public final class Ocpp16TypeStore extends AbstractTypeStore {
1111
public static final Ocpp16TypeStore INSTANCE = new Ocpp16TypeStore();
1212

1313
private Ocpp16TypeStore() {
14-
super("ocpp.cs._2015._10", "ocpp.cp._2015._10");
14+
super(
15+
ocpp.cs._2015._10.ObjectFactory.class.getPackage().getName(),
16+
ocpp.cp._2015._10.ObjectFactory.class.getPackage().getName()
17+
);
1518
}
1619
}

0 commit comments

Comments
 (0)