Fixed exclusion of properties with @HiddenProperty annotation

robinroby · May 19, 2015 · e8c793d · e8c793d
1 parent e2c6e63
commit e8c793d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/api/src/main/java/org/datacleaner/api/ColumnProperty.java b/api/src/main/java/org/datacleaner/api/ColumnProperty.java
@@ -26,8 +26,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
-
 import org.apache.metamodel.schema.Column;
 
 /**
@@ -40,7 +38,6 @@
 @Target({ ElementType.FIELD })
 @Documented
 @Inherited
-@Qualifier
 public @interface ColumnProperty {
 
     /**

diff --git a/api/src/main/java/org/datacleaner/api/MappedProperty.java b/api/src/main/java/org/datacleaner/api/MappedProperty.java
@@ -26,8 +26,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
-
 /**
  * Annotation used for {@link Configured} properties that are mapped to another
  * {@link Configured} property.
@@ -47,7 +45,6 @@
 @Target({ ElementType.FIELD })
 @Documented
 @Inherited
-@Qualifier
 public @interface MappedProperty {
 
     /**

diff --git a/api/src/main/java/org/datacleaner/api/NumberProperty.java b/api/src/main/java/org/datacleaner/api/NumberProperty.java
@@ -26,8 +26,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
-
 /**
  * Annotation containing supplementary metadata about a number property. This
  * metadata can be used as a way to give hints to the UI as to how the content
@@ -37,7 +35,6 @@
 @Target({ ElementType.FIELD })
 @Documented
 @Inherited
-@Qualifier
 public @interface NumberProperty {
 
     /**

diff --git a/desktop/api/src/main/java/org/datacleaner/desktop/api/HiddenProperty.java b/desktop/api/src/main/java/org/datacleaner/desktop/api/HiddenProperty.java
@@ -26,8 +26,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
-
 import org.datacleaner.api.Configured;
 
 /**
@@ -41,7 +39,6 @@
 @Target({ ElementType.FIELD })
 @Documented
 @Inherited
-@Qualifier
 public @interface HiddenProperty {
 
 }
diff --git a/desktop/ui/src/main/java/org/datacleaner/documentation/ComponentDocumentationBuilder.java b/desktop/ui/src/main/java/org/datacleaner/documentation/ComponentDocumentationBuilder.java
@@ -39,6 +39,7 @@
 import org.datacleaner.api.Component;
 import org.datacleaner.descriptors.ComponentDescriptor;
 import org.datacleaner.descriptors.ConfiguredPropertyDescriptor;
+import org.datacleaner.desktop.api.HiddenProperty;
 import org.datacleaner.util.IconUtils;
 
 import freemarker.cache.ClassTemplateLoader;
@@ -109,9 +110,13 @@ public void write(ComponentDescriptor<?> componentDescriptor, OutputStream outpu
                         configuredProperties);
                 final List<ConfiguredPropertyDocumentationWrapper> propertyList = new ArrayList<>();
                 for (ConfiguredPropertyDescriptor property : properties) {
-                    ConfiguredPropertyDocumentationWrapper wrapper = new ConfiguredPropertyDocumentationWrapper(
-                            property);
-                    propertyList.add(wrapper);
+                    final HiddenProperty hiddenProperty = property.getAnnotation(HiddenProperty.class);
+                    // we do not show hidden properties in docs
+                    if (hiddenProperty == null) {
+                        ConfiguredPropertyDocumentationWrapper wrapper = new ConfiguredPropertyDocumentationWrapper(
+                                property);
+                        propertyList.add(wrapper);
+                    }
                 }
 
                 data.put("properties", propertyList);