summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/MultiChoiceOrOther.java24
1 files changed, 11 insertions, 13 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/MultiChoiceOrOther.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/MultiChoiceOrOther.java
index 36f54ac45e..8adfecf44e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/MultiChoiceOrOther.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/MultiChoiceOrOther.java
@@ -1,27 +1,24 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+/*
+ * Copyright © 2016-2017 European Support Limited
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- * ============LICENSE_END=========================================================
*/
package org.openecomp.sdc.vendorlicense.dao.types;
import com.datastax.driver.mapping.annotations.Transient;
import com.datastax.driver.mapping.annotations.UDT;
+import org.apache.commons.collections4.CollectionUtils;
import org.openecomp.sdc.common.errors.CoreException;
import org.openecomp.sdc.common.errors.ErrorCategory;
import org.openecomp.sdc.common.errors.ErrorCode;
@@ -37,9 +34,9 @@ import java.util.Set;
@UDT(keyspace = "dox", name = "multi_choice_or_other")
public class MultiChoiceOrOther<E extends Enum<E>> {
- public static final String MULTI_CHOICE_OR_OTHER_INVALID_ENUM_ERR_ID =
+ private static final String MULTI_CHOICE_OR_OTHER_INVALID_ENUM_ERR_ID =
"MULTI_CHOICE_OR_OTHER_INVALID_ENUM_ERR_ID";
- public static final String MULTI_CHOICE_OR_OTHER_INVALID_ENUM_MSG =
+ private static final String MULTI_CHOICE_OR_OTHER_INVALID_ENUM_MSG =
"Enum used as part of MultiChoiceOrOther type must contain the value 'Other'";
public static final String OTHER_ENUM_VALUE = "Other";
@@ -52,6 +49,7 @@ public class MultiChoiceOrOther<E extends Enum<E>> {
private Set<String> results;
public MultiChoiceOrOther() {
+ // Default constructor
}
/**
@@ -104,7 +102,7 @@ public class MultiChoiceOrOther<E extends Enum<E>> {
private Set<String> resolveResult() {
if (choices != null) {
results = new HashSet<>();
- if(choices.size() == 1 && OTHER_ENUM_VALUE.equals(choices.iterator().next().name())) {
+ if (choices.size() == 1 && OTHER_ENUM_VALUE.equals(choices.iterator().next().name())) {
results.add(other);
} else {
for (E choice : choices) {
@@ -122,7 +120,7 @@ public class MultiChoiceOrOther<E extends Enum<E>> {
* @param enumClass the enum class
*/
public void resolveEnum(Class<E> enumClass) {
- if (choices != null || results == null || results.size() == 0) {
+ if (choices != null || CollectionUtils.isEmpty(results)) {
return;
}