Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing annotations from impl classes #56

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Removing annotations from impl classes #56

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ed13be
Optimization logging of removing annotate for class, that not include…
May 31, 2019
424f45b
Merge pull request #1 from waiet/optimization-logging
May 31, 2019
633b1a0
Remove annotations for impl classes
Jun 11, 2019
3e21a15
Revert "Optimization logging of removing annotate for class, that not…
Jun 11, 2019
16b968f
Merge pull request #2 from waiet/revert-1-optimization-logging
Jun 11, 2019
bd86ea6
Merge pull request #3 from waiet/remove-annotations-classes
Jun 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 55 additions & 4 deletions ...src/main/java/org/jvnet/jaxb2_commons/plugin/removeannotation/RemoveAnnotationPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,19 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import javax.xml.namespace.QName;

import com.sun.codemodel.JAnnotatable;
import com.sun.codemodel.JAnnotationUse;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JFieldVar;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.tools.ant.util.CollectionUtils;
import org.jvnet.annox.Constants;
import org.jvnet.jaxb2_commons.plugin.AbstractParameterizablePlugin;
import org.jvnet.jaxb2_commons.plugin.AnnotationTarget;
Expand All @@ -47,10 +55,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;

import com.sun.codemodel.JAnnotatable;
import com.sun.codemodel.JAnnotationUse;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.tools.xjc.Options;
import com.sun.tools.xjc.model.CCustomizations;
import com.sun.tools.xjc.model.CElementInfo;
Expand Down Expand Up @@ -194,6 +198,14 @@ protected void processClassOutline(ClassOutline classOutline,
for (final FieldOutline fieldOutline : classOutline.getDeclaredFields()) {
processFieldOutline(classOutline, fieldOutline, options,
errorHandler);

}

if (classOutline.getImplClass() != null) {
for (final Map.Entry<String, JFieldVar> entry : classOutline.getImplClass().fields().entrySet()) {
processFieldImplOutline(classOutline, entry.getValue(), options,
errorHandler);
}
}

}
Expand All @@ -207,6 +219,18 @@ protected void processFieldOutline(ClassOutline classOutline,
customizations, errorHandler);
}

protected void processFieldImplOutline(ClassOutline classOutline,
JFieldVar fieldOutlineImpl, Options options,
ErrorHandler errorHandler) {

if(ArrayUtils.isNotEmpty(classOutline.getDeclaredFields())){
final CCustomizations customizations = CustomizationUtils
.getCustomizations(classOutline.getDeclaredFields()[0]);
removeAnnotationFromFieldImplOutline(classOutline.ref.owner(), fieldOutlineImpl,
customizations, errorHandler);
}
}

protected void processEnumConstantOutline(EnumOutline enumOutline,
EnumConstantOutline enumConstantOutline, Options options,
ErrorHandler errorHandler) {
Expand Down Expand Up @@ -311,6 +335,10 @@ protected void removeAnnotationFromClassOutline(final JCodeModel codeModel,
.getAnnotatable(classOutline.parent(), classOutline);
removeAnnotation(codeModel, errorHandler, customization, element,
annotatable);
if (classOutline.getImplClass() != null) {
removeAnnotation(codeModel, errorHandler, customization, element,
classOutline.getImplClass());
}
} catch (IllegalArgumentException iaex) {
logger.error("Error applying the annotation.", iaex);
}
Expand Down Expand Up @@ -345,7 +373,30 @@ protected void removeAnnotationFromFieldOutline(final JCodeModel codeModel,
}
}
}
protected void removeAnnotationFromFieldImplOutline(final JCodeModel codeModel,
final JFieldVar fieldOutline,
final CCustomizations customizations, ErrorHandler errorHandler) {
for (final CPluginCustomization customization : customizations) {
final Element element = customization.element;
final QName name = new QName(element.getNamespaceURI(),
element.getLocalName());
if (isCustomizationElementName(name)) {
customization.markAsAcknowledged();

final AnnotationTarget annotationTarget = AnnotationTarget
.getAnnotationTarget(element, AnnotationTarget
.getAnnotationTarget(getDefaultFieldTarget()));

try {
removeAnnotation(codeModel, errorHandler, customization, element,
fieldOutline);
} catch (IllegalArgumentException iaex) {
logger.error("Error removing the annotation.", iaex);
}

}
}
}
private void removeAnnotation(final JCodeModel codeModel,
ErrorHandler errorHandler,
final CPluginCustomization customization,
Expand Down