Skip to content

Commit a6baec5

Browse files
committed
Fix the minor issue on the sample1
1 parent 7fa579a commit a6baec5

File tree

5 files changed

+12
-48
lines changed

5 files changed

+12
-48
lines changed

core/src/main/java/io/ermdev/mapfierj/Converter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,13 +228,13 @@ public <T> T convert() throws MappingException {
228228

229229
protected class Objects {
230230

231-
Object object;
231+
volatile Object object;
232232

233-
public Object getObject() {
233+
public synchronized Object getObject() {
234234
return object;
235235
}
236236

237-
public void setObject(Object object) {
237+
public synchronized void setObject(Object object) {
238238
this.object = object;
239239
}
240240
}

sample/src/main/java/io/ermdev/mapfierj/sample/sample1/IntegerCarConverter.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@ public class IntegerCarConverter extends TypeConverterAdapter<Integer, Car> {
1010
private CarRepository carRepository;
1111

1212
public IntegerCarConverter() {
13+
carRepository = new CarRepository();
1314
}
1415

1516
public IntegerCarConverter(CarRepository carRepository) {
1617
this.carRepository = carRepository;
1718
}
1819

19-
2020
@Override
2121
public Car convertTo(Integer o) throws TypeException {
22-
return carRepository.getById(o);
22+
try {
23+
return carRepository.getById(o);
24+
} catch (NullPointerException e) {
25+
return null;
26+
}
2327
}
2428

2529
@Override

sample/src/main/java/io/ermdev/mapfierj/sample/sample1/Sample1.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public class Sample1 {
1111

1212
@Test
1313
public void modelMapper() {
14-
final String PACKAGE_NAME = getClass().getPackage().toString();
15-
int carId = (int) (Math.random() * 10) + 1;
14+
final String PACKAGE_NAME = "io.ermdev.mapfierj.sample.sample1";
15+
int carId = (int) (Math.random() * 8) + 1;
1616

1717
ModelMapper mapper = new ModelMapper();
1818
mapper.getConverter().scanPackages(PACKAGE_NAME);

sample/src/main/java/io/ermdev/mapfierj/sample/sample2/IntegerCarConverter.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

sample/src/main/java/io/ermdev/mapfierj/sample/sample2/Person.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.ermdev.mapfierj.ConvertTo;
44
import io.ermdev.mapfierj.FieldName;
5+
import io.ermdev.mapfierj.sample.sample1.IntegerCarConverter;
56

67
public class Person {
78

0 commit comments

Comments
 (0)