Skip to content

Commit c57baac

Browse files
garethahealygarethahealy
authored
Updated proto code to be compliant with stricter checkstyle and findbugs (#470)
1 parent 1d243cd commit c57baac

File tree

15 files changed

+313
-309
lines changed

15 files changed

+313
-309
lines changed

‎proto/pom.xml‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
<packaging>jar</packaging>
3333
<name>Dozer :: Protobuf 3</name>
3434

35-
<properties>
36-
<!-- NOTE: Needs to be removed in future -->
37-
<findbugs.skip>true</findbugs.skip>
38-
</properties>
39-
4035
<dependencies>
4136
<dependency>
4237
<groupId>com.github.dozermapper</groupId>
@@ -92,39 +87,6 @@
9287
</execution>
9388
</executions>
9489
</plugin>
95-
96-
<!-- Governance Plugins; alphabetical order -->
97-
<!-- NOTE: Uses less strict config - should be removed in future -->
98-
<plugin>
99-
<groupId>org.apache.maven.plugins</groupId>
100-
<artifactId>maven-checkstyle-plugin</artifactId>
101-
<dependencies>
102-
<dependency>
103-
<groupId>com.github.dozermapper</groupId>
104-
<artifactId>building-tools</artifactId>
105-
<version>${building-tools.version}</version>
106-
<scope>compile</scope>
107-
</dependency>
108-
</dependencies>
109-
<executions>
110-
<execution>
111-
<id>validate</id>
112-
<phase>validate</phase>
113-
<configuration>
114-
<configLocation>camel-checkstyle.xml</configLocation>
115-
<suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation>
116-
<consoleOutput>true</consoleOutput>
117-
<failOnViolation>true</failOnViolation>
118-
<failsOnError>true</failsOnError>
119-
<encoding>UTF-8</encoding>
120-
<sourceDirectory>${basedir}/src</sourceDirectory>
121-
</configuration>
122-
<goals>
123-
<goal>check</goal>
124-
</goals>
125-
</execution>
126-
</executions>
127-
</plugin>
12890
</plugins>
12991
</build>
13092

‎proto/src/main/java/com/github/dozermapper/protobuf/ProtobufSupportModule.java‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,33 @@
3535
*/
3636
public class ProtobufSupportModule implements DozerModule {
3737

38-
private BeanContainer beanContainer;
39-
private DestBeanCreator destBeanCreator;
40-
private PropertyDescriptorFactory propertyDescriptorFactory;
38+
private BeanContainer beanContainer;
39+
private DestBeanCreator destBeanCreator;
40+
private PropertyDescriptorFactory propertyDescriptorFactory;
4141

42-
@Override
43-
public void init(BeanContainer beanContainer, DestBeanCreator destBeanCreator, PropertyDescriptorFactory propertyDescriptorFactory) {
44-
this.beanContainer = beanContainer;
45-
this.destBeanCreator = destBeanCreator;
46-
this.propertyDescriptorFactory = propertyDescriptorFactory;
47-
}
42+
@Override
43+
public void init(BeanContainer beanContainer, DestBeanCreator destBeanCreator, PropertyDescriptorFactory propertyDescriptorFactory) {
44+
this.beanContainer = beanContainer;
45+
this.destBeanCreator = destBeanCreator;
46+
this.propertyDescriptorFactory = propertyDescriptorFactory;
47+
}
4848

49-
public void init() {
50-
}
49+
public void init() {
5150

52-
@Override
53-
public Collection<BeanBuilderCreationStrategy> getBeanBuilderCreationStrategies() {
54-
return Collections.singleton(new ByProtobufBuilder());
55-
}
51+
}
5652

57-
@Override
58-
public Collection<BeanFieldsDetector> getBeanFieldsDetectors() {
59-
return Collections.singleton(new ProtobufBeanFieldsDetector());
60-
}
53+
@Override
54+
public Collection<BeanBuilderCreationStrategy> getBeanBuilderCreationStrategies() {
55+
return Collections.singleton(new ByProtobufBuilder());
56+
}
6157

62-
@Override
63-
public Collection<PropertyDescriptorCreationStrategy> getPropertyDescriptorCreationStrategies() {
64-
return Collections.singleton(new ProtoFieldPropertyDescriptorCreationStrategy(beanContainer, destBeanCreator, propertyDescriptorFactory));
65-
}
58+
@Override
59+
public Collection<BeanFieldsDetector> getBeanFieldsDetectors() {
60+
return Collections.singleton(new ProtobufBeanFieldsDetector());
61+
}
62+
63+
@Override
64+
public Collection<PropertyDescriptorCreationStrategy> getPropertyDescriptorCreationStrategies() {
65+
return Collections.singleton(new ProtoFieldPropertyDescriptorCreationStrategy(beanContainer, destBeanCreator, propertyDescriptorFactory));
66+
}
6667
}

‎proto/src/main/java/com/github/dozermapper/protobuf/builder/ByProtobufBuilder.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
*/
2828
public class ByProtobufBuilder implements BeanBuilderCreationStrategy {
2929

30-
public boolean isApplicable(BeanCreationDirective directive) {
31-
return Message.class.isAssignableFrom(directive.getActualClass());
32-
}
30+
public boolean isApplicable(BeanCreationDirective directive) {
31+
return Message.class.isAssignableFrom(directive.getActualClass());
32+
}
3333

34-
public BeanBuilder create(BeanCreationDirective directive) {
35-
Class<? extends Message> messageClass = (Class<? extends Message>)directive.getActualClass();
36-
final Message.Builder protoBuilder = ProtoUtils.getBuilder(messageClass);
37-
return new ProtoBeanBuilder(protoBuilder, messageClass);
38-
}
34+
public BeanBuilder create(BeanCreationDirective directive) {
35+
Class<? extends Message> messageClass = (Class<? extends Message>)directive.getActualClass();
36+
final Message.Builder protoBuilder = ProtoUtils.getBuilder(messageClass);
37+
38+
return new ProtoBeanBuilder(protoBuilder, messageClass);
39+
}
3940
}

‎proto/src/main/java/com/github/dozermapper/protobuf/builder/ProtoBeanBuilder.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,24 @@
2323
* @author Dmitry Spikhalskiy
2424
*/
2525
public class ProtoBeanBuilder implements BeanBuilder {
26-
protected Message.Builder internalProtoBuilder;
27-
protected Class<? extends Message> beanClass;
2826

29-
public ProtoBeanBuilder(Message.Builder internalProtoBuilder, Class<? extends Message> beanClass) {
30-
this.internalProtoBuilder = internalProtoBuilder;
31-
this.beanClass = beanClass;
32-
}
27+
protected Message.Builder internalProtoBuilder;
28+
protected Class<? extends Message> beanClass;
3329

34-
public Class<? extends Message> beanClass() {
35-
return beanClass;
36-
}
30+
public ProtoBeanBuilder(Message.Builder internalProtoBuilder, Class<? extends Message> beanClass) {
31+
this.internalProtoBuilder = internalProtoBuilder;
32+
this.beanClass = beanClass;
33+
}
3734

38-
public Message.Builder internalProtoBuilder() {
39-
return internalProtoBuilder;
40-
}
35+
public Class<? extends Message> beanClass() {
36+
return beanClass;
37+
}
4138

42-
public Object build() {
43-
return internalProtoBuilder.build();
44-
}
39+
public Message.Builder internalProtoBuilder() {
40+
return internalProtoBuilder;
41+
}
42+
43+
public Object build() {
44+
return internalProtoBuilder.build();
45+
}
4546
}

‎proto/src/main/java/com/github/dozermapper/protobuf/classmap/generator/ProtobufBeanFieldsDetector.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,25 @@
2929
* @author Dmitry Spikhalskiy
3030
*/
3131
public class ProtobufBeanFieldsDetector implements BeanFieldsDetector {
32-
public boolean accepts(Class<?> clazz) {
33-
return Message.class.isAssignableFrom(clazz);
34-
}
35-
36-
public Set<String> getReadableFieldNames(Class<?> clazz) {
37-
return getFieldNames((Class<? extends Message>) clazz);
38-
}
39-
40-
public Set<String> getWritableFieldNames(Class<?> clazz) {
41-
return getFieldNames((Class<? extends Message>) clazz);
42-
}
43-
44-
private static Set<String> getFieldNames(Class<? extends Message> clazz) {
45-
Set<String> resultSet = new HashSet<String>();
46-
List<Descriptors.FieldDescriptor> descriptors = ProtoUtils.getFieldDescriptors(clazz);
47-
for (Descriptors.FieldDescriptor descriptor : descriptors) {
48-
resultSet.add(ProtoUtils.toCamelCase(descriptor.getName()));
32+
33+
public boolean accepts(Class<?> clazz) {
34+
return Message.class.isAssignableFrom(clazz);
35+
}
36+
37+
public Set<String> getReadableFieldNames(Class<?> clazz) {
38+
return getFieldNames((Class<? extends Message>)clazz);
39+
}
40+
41+
public Set<String> getWritableFieldNames(Class<?> clazz) {
42+
return getFieldNames((Class<? extends Message>)clazz);
43+
}
44+
45+
private static Set<String> getFieldNames(Class<? extends Message> clazz) {
46+
Set<String> resultSet = new HashSet<String>();
47+
for (Descriptors.FieldDescriptor descriptor : ProtoUtils.getFieldDescriptors(clazz)) {
48+
resultSet.add(ProtoUtils.toCamelCase(descriptor.getName()));
49+
}
50+
51+
return resultSet;
4952
}
50-
return resultSet;
51-
}
5253
}

0 commit comments

Comments
 (0)