| Chunk |
|---|
| Conflicting content |
|---|
representation.setName(typeName);
}
representation.setRaw(typeInfo.isRaw());
>>>>>>> 307818d8224a08cc1e5e85d65362ef76e0cdc73c
.value();
return;
}
<<<<<<< HEAD
if (typeInfo.isPrimitive() || typeInfo.isFile()) {
// primitives and files are not collected
return;
}
// Example: "java.util.Contact" or "String"
representation.setDescription("Java type: " + typeInfo.getRepresentationClazz().getName());
// Sections
String packageName = typeInfo.getClazz().getPackage().getName();
representation.getSections().add(packageName);
if (collectInfo.getSection(packageName) == null) {
collectInfo.addSection(new Section(packageName));
}
// Example: "Contact"
JsonRootName jsonType = typeInfo.getClazz().getAnnotation(JsonRootName.class);
String typeName = jsonType == null ? typeInfo.getRepresentationClazz()
.getSimpleName() : jsonType.value();
representation.setName(typeName);
representation.setRaw(false);
=======
if (typeInfo.isPrimitive() || typeInfo.isJdkClass()) {
// primitives and jdk classes are not collected
return;
}
if (typeInfo.isFile()) {
representation.setName("file");
} else {
if (!typeInfo.isPrimitive()) {
// Example: "java.util.Contact" or "String"
representation.setDescription("Java type: "
+ typeInfo.getRepresentationClazz().getName());
}
// Sections
String packageName = typeInfo.getClazz().getPackage().getName();
representation.getSections().add(packageName);
if (collectInfo.getSection(packageName) == null) {
collectInfo.addSection(new Section(packageName));
}
// Example: "Contact"
JsonRootName jsonType = typeInfo.getClazz().getAnnotation(
JsonRootName.class);
String typeName = jsonType == null ? typeInfo
.getRepresentationClazz().getSimpleName() : jsonType
// at this point, identifier is known - we check if it exists in cache
boolean notInCache = collectInfo.getRepresentation(representation |
| Solution content |
|---|
return;
}
if (typeInfo.isPrimitive() || typeInfo.isFile()) {
// primitives and files are not collected
return;
}
// Example: "java.util.Contact" or "String"
representation.setDescription("Java type: " + typeInfo.getRepresentationClazz().getName());
// Sections
String packageName = typeInfo.getClazz().getPackage().getName();
representation.getSections().add(packageName);
if (collectInfo.getSection(packageName) == null) {
collectInfo.addSection(new Section(packageName));
}
// Example: "Contact"
JsonRootName jsonType = typeInfo.getClazz().getAnnotation(JsonRootName.class);
String typeName = jsonType == null ? typeInfo.getRepresentationClazz()
.getSimpleName() : jsonType.value();
representation.setName(typeName);
representation.setRaw(false);
// at this point, identifier is known - we check if it exists in cache
boolean notInCache = collectInfo.getRepresentation(representation |
| File |
|---|
| JaxRsIntrospector.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |
| Variable |