Skip to content

Commit 057f71a

Browse files
ChessrayChessray
committed
Renamed group and packages as agreed.
Closes #5.
1 parent 272164a commit 057f71a

File tree

42 files changed

+113
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+113
-113
lines changed

‎additions/src/main/resources/META-INF/services/javax.annotation.processing.Processor‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

annotations/src/main/java/uk/co/kleindelao/mapstruct/spring/SpringMapperConfig.java renamed to annotations/src/main/java/org/mapstruct/extensions/spring/SpringMapperConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.co.kleindelao.mapstruct.spring;
1+
package org.mapstruct.extensions.spring;
22

33
import java.lang.annotation.ElementType;
44
import java.lang.annotation.Retention;

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
id 'jacoco'
1313
}
1414

15-
group = 'uk.co.kleindelao.mapstruct.spring'
15+
group = 'org.mapstruct.extensions'
1616
version = '0.0.1'
1717

1818
allprojects {

‎examples/classname/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dependencies {
2-
annotationProcessor project(":additions")
2+
annotationProcessor project(":extensions")
33
implementation project(":examples:model")
44
implementation project(":annotations")
55
// This dependency is used internally, and not exposed to consumers on their own compile classpath.

examples/noconfig/src/main/java/uk/co/kleindelao/mapstruct/spring/example/noconfig/CarMapper.java renamed to examples/classname/src/main/java/org/mapstruct/extensions/spring/example/classname/CarMapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package uk.co.kleindelao.mapstruct.spring.example.noconfig;
1+
package org.mapstruct.extensions.spring.example.classname;
22

33
import org.mapstruct.Mapper;
44
import org.mapstruct.Mapping;
55
import org.springframework.core.convert.converter.Converter;
6-
import uk.co.kleindelao.mapstruct.spring.example.Car;
7-
import uk.co.kleindelao.mapstruct.spring.example.CarDto;
6+
import org.mapstruct.extensions.spring.example.Car;
7+
import org.mapstruct.extensions.spring.example.CarDto;
88

99
@Mapper(config = MapperSpringConfig.class)
1010
public interface CarMapper extends Converter<Car, CarDto> {

examples/classname/src/main/java/uk/co/kleindelao/mapstruct/spring/example/classname/MapperSpringConfig.java renamed to examples/classname/src/main/java/org/mapstruct/extensions/spring/example/classname/MapperSpringConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package uk.co.kleindelao.mapstruct.spring.example.classname;
1+
package org.mapstruct.extensions.spring.example.classname;
22

33
import org.mapstruct.MapperConfig;
4-
import uk.co.kleindelao.mapstruct.spring.SpringMapperConfig;
4+
import org.mapstruct.extensions.spring.SpringMapperConfig;
55

66
@MapperConfig(componentModel = "spring", uses = MyAdapter.class)
77
@SpringMapperConfig(conversionServiceAdapterClassName ="MyAdapter")

examples/noconfig/src/main/java/uk/co/kleindelao/mapstruct/spring/example/noconfig/SeatConfigurationMapper.java renamed to examples/classname/src/main/java/org/mapstruct/extensions/spring/example/classname/SeatConfigurationMapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package uk.co.kleindelao.mapstruct.spring.example.noconfig;
1+
package org.mapstruct.extensions.spring.example.classname;
22

33
import org.mapstruct.Mapper;
44
import org.mapstruct.Mapping;
55
import org.springframework.core.convert.converter.Converter;
6-
import uk.co.kleindelao.mapstruct.spring.example.SeatConfiguration;
7-
import uk.co.kleindelao.mapstruct.spring.example.SeatConfigurationDto;
6+
import org.mapstruct.extensions.spring.example.SeatConfiguration;
7+
import org.mapstruct.extensions.spring.example.SeatConfigurationDto;
88

99
@Mapper(config = MapperSpringConfig.class)
1010
public interface SeatConfigurationMapper extends Converter<SeatConfiguration, SeatConfigurationDto> {

examples/packagename-and-classname/src/test/java/uk/co/kleindelao/mapstruct/spring/example/ConversionServiceAdapterIntegrationTest.java renamed to examples/classname/src/test/java/org/mapstruct/extensions/spring/example/ConversionServiceAdapterIntegrationTest.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
package uk.co.kleindelao.mapstruct.spring.example;
1+
package org.mapstruct.extensions.spring.example;
22

33
import static org.assertj.core.api.BDDAssertions.then;
4-
import static uk.co.kleindelao.mapstruct.spring.example.CarType.OTHER;
5-
import static uk.co.kleindelao.mapstruct.spring.example.SeatMaterial.LEATHER;
4+
import static org.mapstruct.extensions.spring.example.CarType.OTHER;
5+
import static org.mapstruct.extensions.spring.example.SeatMaterial.LEATHER;
66

77
import org.junit.jupiter.api.BeforeEach;
88
import org.junit.jupiter.api.Test;
99
import org.junit.jupiter.api.extension.ExtendWith;
10+
import org.mapstruct.extensions.spring.example.classname.CarMapper;
11+
import org.mapstruct.extensions.spring.example.classname.SeatConfigurationMapper;
1012
import org.springframework.beans.factory.annotation.Autowired;
1113
import org.springframework.context.annotation.Bean;
1214
import org.springframework.context.annotation.ComponentScan;
@@ -15,23 +17,21 @@
1517
import org.springframework.stereotype.Component;
1618
import org.springframework.test.context.ContextConfiguration;
1719
import org.springframework.test.context.junit.jupiter.SpringExtension;
18-
import uk.co.kleindelao.mapstruct.spring.example.packageandclass.CarMapper;
19-
import uk.co.kleindelao.mapstruct.spring.example.packageandclass.SeatConfigurationMapper;
2020

2121
@ExtendWith(SpringExtension.class)
2222
@ContextConfiguration(
2323
classes = {ConversionServiceAdapterIntegrationTest.AdditionalBeanConfiguration.class})
2424
public class ConversionServiceAdapterIntegrationTest {
2525
private static final String TEST_MAKE = "Volvo";
26-
private static final CarType TEST_CAR_TYPE = OTHER;
26+
private static final org.mapstruct.extensions.spring.example.CarType TEST_CAR_TYPE = OTHER;
2727
protected static final int TEST_NUMBER_OF_SEATS = 5;
28-
protected static final SeatMaterial TEST_SEAT_MATERIAL = LEATHER;
28+
protected static final org.mapstruct.extensions.spring.example.SeatMaterial TEST_SEAT_MATERIAL = LEATHER;
2929

3030
@Autowired private CarMapper carMapper;
3131
@Autowired private SeatConfigurationMapper seatConfigurationMapper;
3232
@Autowired private ConfigurableConversionService conversionService;
3333

34-
@ComponentScan("uk.co.kleindelao.mapstruct.spring")
34+
@ComponentScan("org.mapstruct.extensions.spring")
3535
@Component
3636
static class AdditionalBeanConfiguration {
3737
@Bean
@@ -48,30 +48,30 @@ void addMappersToConversionService() {
4848

4949
@Test
5050
void shouldKnowAllMappers() {
51-
then(conversionService.canConvert(Car.class, CarDto.class)).isTrue();
52-
then(conversionService.canConvert(SeatConfiguration.class, SeatConfigurationDto.class))
51+
then(conversionService.canConvert(org.mapstruct.extensions.spring.example.Car.class, org.mapstruct.extensions.spring.example.CarDto.class)).isTrue();
52+
then(conversionService.canConvert(org.mapstruct.extensions.spring.example.SeatConfiguration.class, org.mapstruct.extensions.spring.example.SeatConfigurationDto.class))
5353
.isTrue();
5454
}
5555

5656
@Test
5757
void shouldMapAllAttributes() {
5858
// Given
59-
final Car car = new Car();
59+
final org.mapstruct.extensions.spring.example.Car car = new org.mapstruct.extensions.spring.example.Car();
6060
car.setMake(TEST_MAKE);
6161
car.setType(TEST_CAR_TYPE);
62-
final SeatConfiguration seatConfiguration = new SeatConfiguration();
62+
final org.mapstruct.extensions.spring.example.SeatConfiguration seatConfiguration = new org.mapstruct.extensions.spring.example.SeatConfiguration();
6363
seatConfiguration.setSeatMaterial(TEST_SEAT_MATERIAL);
6464
seatConfiguration.setNumberOfSeats(TEST_NUMBER_OF_SEATS);
6565
car.setSeatConfiguration(seatConfiguration);
6666

6767
// When
68-
final CarDto mappedCar = conversionService.convert(car, CarDto.class);
68+
final org.mapstruct.extensions.spring.example.CarDto mappedCar = conversionService.convert(car, org.mapstruct.extensions.spring.example.CarDto.class);
6969

7070
// Then
7171
then(mappedCar).isNotNull();
7272
then(mappedCar.getMake()).isEqualTo(TEST_MAKE);
7373
then(mappedCar.getType()).isEqualTo(String.valueOf(TEST_CAR_TYPE));
74-
final SeatConfigurationDto mappedCarSeats = mappedCar.getSeats();
74+
final org.mapstruct.extensions.spring.example.SeatConfigurationDto mappedCarSeats = mappedCar.getSeats();
7575
then(mappedCarSeats).isNotNull();
7676
then(mappedCarSeats.getSeatCount()).isEqualTo(TEST_NUMBER_OF_SEATS);
7777
then(mappedCarSeats.getMaterial()).isEqualTo(String.valueOf(TEST_SEAT_MATERIAL));

examples/model/src/main/java/uk/co/kleindelao/mapstruct/spring/example/Car.java renamed to examples/model/src/main/java/org/mapstruct/extensions/spring/example/Car.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.co.kleindelao.mapstruct.spring.example;
1+
package org.mapstruct.extensions.spring.example;
22

33
public class Car {
44
private String make;

examples/model/src/main/java/uk/co/kleindelao/mapstruct/spring/example/CarDto.java renamed to examples/model/src/main/java/org/mapstruct/extensions/spring/example/CarDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.co.kleindelao.mapstruct.spring.example;
1+
package org.mapstruct.extensions.spring.example;
22

33
public class CarDto {
44
private String make;

0 commit comments

Comments
 (0)