diff options
5 files changed, 6 insertions, 6 deletions
diff --git a/dcae-analytics-cdap-common/src/main/java/org/onap/dcae/apod/analytics/cdap/common/utils/ValidationUtils.java b/dcae-analytics-cdap-common/src/main/java/org/onap/dcae/apod/analytics/cdap/common/utils/ValidationUtils.java index 5ab2427..bfd7b31 100644 --- a/dcae-analytics-cdap-common/src/main/java/org/onap/dcae/apod/analytics/cdap/common/utils/ValidationUtils.java +++ b/dcae-analytics-cdap-common/src/main/java/org/onap/dcae/apod/analytics/cdap/common/utils/ValidationUtils.java @@ -80,7 +80,7 @@ public abstract class ValidationUtils { * @param <R> Validation Response type * @param <V> Validator Type */ - public static <T extends CDAPAppSettings, R extends ValidationResponse<T>, + public static <T extends CDAPAppSettings, R extends ValidationResponse, V extends CDAPAppSettingsValidator<T, R>> void validateSettings(@Nonnull final T appSettings, @Nonnull final V appSettingsValidator) { checkNotNull(appSettings, "App Settings must not be null"); diff --git a/dcae-analytics-cdap-common/src/main/java/org/onap/dcae/apod/analytics/cdap/common/validation/CDAPAppSettingsValidator.java b/dcae-analytics-cdap-common/src/main/java/org/onap/dcae/apod/analytics/cdap/common/validation/CDAPAppSettingsValidator.java index 2d3cbb1..0154916 100644 --- a/dcae-analytics-cdap-common/src/main/java/org/onap/dcae/apod/analytics/cdap/common/validation/CDAPAppSettingsValidator.java +++ b/dcae-analytics-cdap-common/src/main/java/org/onap/dcae/apod/analytics/cdap/common/validation/CDAPAppSettingsValidator.java @@ -34,7 +34,7 @@ import org.onap.dcae.apod.analytics.common.validation.ValidationResponse; * * @author Rajiv Singla . Creation Date: 11/2/2016. */ -public interface CDAPAppSettingsValidator<T extends CDAPAppSettings, R extends ValidationResponse<T>> +public interface CDAPAppSettingsValidator<T extends CDAPAppSettings, R extends ValidationResponse> extends DCAEValidator { /** diff --git a/dcae-analytics-cdap-plugins/src/main/java/org/onap/dcae/apod/analytics/cdap/plugins/utils/CDAPPluginUtils.java b/dcae-analytics-cdap-plugins/src/main/java/org/onap/dcae/apod/analytics/cdap/plugins/utils/CDAPPluginUtils.java index 5f622cd..657f0af 100644 --- a/dcae-analytics-cdap-plugins/src/main/java/org/onap/dcae/apod/analytics/cdap/plugins/utils/CDAPPluginUtils.java +++ b/dcae-analytics-cdap-plugins/src/main/java/org/onap/dcae/apod/analytics/cdap/plugins/utils/CDAPPluginUtils.java @@ -53,7 +53,7 @@ public abstract class CDAPPluginUtils extends AnalyticsModelJsonUtils { public static final Function<Schema, Schema.Type> SCHEMA_TO_TYPE_FUNCTION = new Function<Schema, Schema.Type>() { @Override - public Schema.Type apply(@Nonnull Schema schema) { + public Schema.Type apply(Schema schema) { return schema.getType(); } }; diff --git a/dcae-analytics-common/src/main/java/org/onap/dcae/apod/analytics/common/validation/GenericValidationResponse.java b/dcae-analytics-common/src/main/java/org/onap/dcae/apod/analytics/common/validation/GenericValidationResponse.java index 55afe29..9c440ae 100644 --- a/dcae-analytics-common/src/main/java/org/onap/dcae/apod/analytics/common/validation/GenericValidationResponse.java +++ b/dcae-analytics-common/src/main/java/org/onap/dcae/apod/analytics/common/validation/GenericValidationResponse.java @@ -35,7 +35,7 @@ import java.util.Set; * * @author Rajiv Singla . Creation Date: 10/24/2016. */ -public class GenericValidationResponse<T> implements ValidationResponse<T> { +public class GenericValidationResponse<T> implements ValidationResponse { private LinkedHashMap<String, String> errorMessageMap = new LinkedHashMap<>(); diff --git a/dcae-analytics-common/src/main/java/org/onap/dcae/apod/analytics/common/validation/ValidationResponse.java b/dcae-analytics-common/src/main/java/org/onap/dcae/apod/analytics/common/validation/ValidationResponse.java index d64dab7..c0065e2 100644 --- a/dcae-analytics-common/src/main/java/org/onap/dcae/apod/analytics/common/validation/ValidationResponse.java +++ b/dcae-analytics-common/src/main/java/org/onap/dcae/apod/analytics/common/validation/ValidationResponse.java @@ -27,11 +27,11 @@ import java.util.Set; /** * Validation Response contract * - * @param <T> Entity class type which is being validated + * * * @author Rajiv Singla . Creation Date: 10/24/2016. */ -public interface ValidationResponse<T> { +public interface ValidationResponse { /** * Returns true if validation resulted in one or more errors |