* @param key the concept key
*/
public PfConceptContainer(@NonNull final PfConceptKey key) {
- this(key, new TreeMap<PfConceptKey, C>());
+ this(key, new TreeMap<>());
}
/**
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @param result where to place the result
* @return the result
*/
- @SuppressWarnings("java:S3252") // squelch sonar warning for using PkConceptKey instead of PfKeyImpl
public PfValidationResult validateNotNull(@NonNull PfConceptKey value, @NonNull PfValidationResult result) {
- if (PfConceptKey.NULL_KEY_NAME.equals(value.getName())) {
+ if (PfKey.NULL_KEY_NAME.equals(value.getName())) {
addError(value, "name", result, "null");
}
- if (PfConceptKey.NULL_KEY_VERSION.equals(value.getVersion())) {
+ if (PfKey.NULL_KEY_VERSION.equals(value.getVersion())) {
addError(value, "version", result, "null");
}
assertEquals(-36, someKey0.compareTo(new DummyPfKey()));
assertNotEquals(someKey0, null);
- assertEquals(someKey0, someKey0);
- assertNotEquals(someKey0, new DummyPfKey());
+ assertEquals(someKey0, (Object) someKey0);
+ assertNotEquals(someKey0, (Object) new DummyPfKey());
MyKey someKey8 = new MyKey();
someKey8.setVersion(VERSION001);
assertNotEquals(0, keyUse.hashCode());
- assertEquals(keyUse, keyUse);
+ assertEquals(keyUse, (Object) keyUse);
assertEquals(keyUse, clonedKeyUse);
assertNotEquals(keyUse, (Object) "Hello");
assertEquals(keyUse, new PfKeyUse(key));
assertNotEquals(0, testReferenceKey.hashCode());
- assertEquals(testReferenceKey, testReferenceKey);
+ assertEquals(testReferenceKey, (Object) testReferenceKey);
assertEquals(testReferenceKey, clonedReferenceKey);
assertNotEquals(testReferenceKey, (Object) "Hello");
assertNotEquals(testReferenceKey, new PfReferenceKey("PKN", VERSION002, "PLN", "LN"));
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull;
final EntityManager mg = getEntityManager();
long size = 0;
try {
- /*
- * Concatenation should be safe because the class name should be safe, thus
- * disabling sonar.
- */
- size = mg.createQuery("SELECT COUNT(c) FROM " + someClass.getSimpleName() + " c", Long.class) // NOSONAR
+ size = mg.createQuery("SELECT COUNT(c) FROM " + someClass.getSimpleName() + " c", Long.class)
.getSingleResult();
} finally {
mg.close();
copiedCommonHeader.setSubRequestId(commonHeader.getSubRequestId());
copiedCommonHeader.setTimeStamp(commonHeader.getTimeStamp());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(commonHeader, commonHeader); // NOSONAR
+ assertEquals(commonHeader, (Object) commonHeader);
assertEquals(commonHeader, copiedCommonHeader);
assertNotEquals(commonHeader, null);
- assertNotEquals(commonHeader, "Hello"); // NOSONAR
+ assertNotEquals(commonHeader, (Object) "Hello");
CommonHeader clonedCommonHeader = new CommonHeader(commonHeader);
clonedCommonHeader.setApiVer(commonHeader.getApiVer());
copiedRequest.setPayload(request.getPayload());
copiedRequest.setTargetId(request.getTargetId());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(request, request); // NOSONAR
+ assertEquals(request, (Object) request);
assertEquals(request, copiedRequest);
assertNotEquals(request, null);
- assertNotEquals(request, "Hello"); // NOSONAR
+ assertNotEquals(request, (Object) "Hello");
request.setCommonHeader(null);
assertNotEquals(request, copiedRequest);
copiedStatus.setDescription(status.getDescription());
copiedStatus.setValue(status.getValue());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(status, status); // NOSONAR
+ assertEquals(status, (Object) status);
assertEquals(status, copiedStatus);
assertNotEquals(status, null);
- assertNotEquals(status, "Hello"); // NOSONAR
+ assertNotEquals(status, (Object) "Hello");
status.setCode(-1);
assertNotEquals(status, copiedStatus);
copiedResponse.setStatus(response.getStatus());
copiedResponse.setPayload(response.getPayload());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(response, response); // NOSONAR
+ assertEquals(response, (Object) response);
assertEquals(response, copiedResponse);
assertNotEquals(response, null);
- assertNotEquals(response, "Hello"); // NOSONAR
+ assertNotEquals(response, (Object) "Hello");
response.setCommonHeader(null);
assertNotEquals(response, copiedResponse);
public void test() {
ControlLoopOperation operation = new ControlLoopOperation();
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(operation, operation); // NOSONAR
- assertNotEquals(operation, ""); // NOSONAR
+ assertEquals(operation, (Object) operation);
+ assertNotEquals(operation, (Object) "");
assertNotEquals(operation, null);
assertNotEquals(0, operation.hashCode());
dao.setId(101L);
assertNotEquals(hc, dao.hashCode());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(dao, dao); // NOSONAR
+ assertEquals(dao, (Object) dao);
assertNotEquals(dao, new OperationsHistory());
}
}
copiedPciCommonHeader.setSubRequestId(commonHeader.getSubRequestId());
copiedPciCommonHeader.setTimeStamp(commonHeader.getTimeStamp());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(commonHeader, commonHeader); // NOSONAR
+ assertEquals(commonHeader, (Object) commonHeader);
assertEquals(commonHeader, copiedPciCommonHeader);
assertNotEquals(commonHeader, null);
- assertNotEquals(commonHeader, "Hello"); // NOSONAR
+ assertNotEquals(commonHeader, (Object) "Hello");
PciCommonHeader clonedPciCommonHeader = new PciCommonHeader(commonHeader);
clonedPciCommonHeader.setApiVer(commonHeader.getApiVer());
copiedPciRequest.setAction(request.getAction());
copiedPciRequest.setPayload(request.getPayload());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(request, request); // NOSONAR
+ assertEquals(request, (Object) request);
assertEquals(request, copiedPciRequest);
assertNotEquals(request, null);
- assertNotEquals(request, "Hello"); // NOSONAR
+ assertNotEquals(request, (Object) "Hello");
request.setCommonHeader(null);
assertNotEquals(request, copiedPciRequest);
PciRequestWrapper copiedPciRequestWrapper = new PciRequestWrapper();
copiedPciRequestWrapper.setBody(requestWrapper.getBody());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(requestWrapper, requestWrapper); // NOSONAR
+ assertEquals(requestWrapper, (Object) requestWrapper);
assertEquals(requestWrapper, copiedPciRequestWrapper);
assertNotEquals(requestWrapper, null);
- assertNotEquals(requestWrapper, "Hello"); // NOSONAR
+ assertNotEquals(requestWrapper, (Object) "Hello");
requestWrapper.setBody(null);
assertNotEquals(requestWrapper, copiedPciRequestWrapper);
PciResponseWrapper copiedPciResponseWrapper = new PciResponseWrapper();
copiedPciResponseWrapper.setBody(responseWrapper.getBody());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(responseWrapper, responseWrapper); // NOSONAR
+ assertEquals(responseWrapper, (Object) responseWrapper);
//assertEquals(responseWrapper, copiedPciResponseWrapper);
assertNotEquals(responseWrapper, null);
- assertNotEquals(responseWrapper, "Hello"); // NOSONAR
+ assertNotEquals(responseWrapper, (Object) "Hello");
responseWrapper.setBody(null);
assertNotEquals(responseWrapper, copiedPciResponseWrapper);
copiedStatus.setCode(status.getCode());
copiedStatus.setValue(status.getValue());
- /*
- * Disabling sonar to test equals().
- */
- assertEquals(status, status); // NOSONAR
+ assertEquals(status, (Object) status);
assertEquals(status, copiedStatus);
assertNotEquals(status, null);
- assertNotEquals(status, "Hello"); // NOSONAR
+ assertNotEquals(status, (Object) "Hello");
status.setCode(-1);
assertNotEquals(status, copiedStatus);
copiedPciWrapper.setCorrelationId(wrapper.getCorrelationId());
copiedPciWrapper.setType(wrapper.getType());
- assertEquals(wrapper, wrapper);
+ assertEquals(wrapper, (Object) wrapper);
assertEquals(wrapper, copiedPciWrapper);
assertNotEquals(wrapper, null);
- assertNotEquals(wrapper, "Hello");
+ assertNotEquals(wrapper, (Object) "Hello");
wrapper.setVersion(null);
assertNotEquals(wrapper, copiedPciWrapper);
SoRequestDetails copiedDetails = new SoRequestDetails(details);
- assertEquals(details, details);
+ assertEquals(details, (Object) details);
assertEquals(details, copiedDetails);
assertNotEquals(details, null);
assertNotEquals(details, (Object) "Hello");
SoResponseWrapper identicalResponseWrapper = new SoResponseWrapper(response, requestId);
- /*
- * Disabling sonar because we are purposely checking various branches of the
- * equals() method.
- */
- assertEquals(responseWrapper, responseWrapper); // NOSONAR
+ assertEquals(responseWrapper, (Object) responseWrapper);
assertEquals(responseWrapper, identicalResponseWrapper);
- assertNotEquals(null, responseWrapper);
- assertNotEquals("Hello", responseWrapper); // NOSONAR
assertNotEquals(responseWrapper, null);
- assertNotEquals(responseWrapper, "AString"); // NOSONAR
+ assertNotEquals(responseWrapper, (Object) "AString");
assertEquals(new SoResponseWrapper(null, null), new SoResponseWrapper(null, null));
assertNotEquals(new SoResponseWrapper(null, null), identicalResponseWrapper);
private static final long serialVersionUID = -2730203215911880756L;
@Column
- @NonNull
@Getter
private JpaToscaConstraintOperation operation;
@Column
- @NonNull
@Getter
private String compareTo;
*
* @param authorativeConcept the authorative concept to copy from
*/
- @SuppressWarnings("java:S2637")
public JpaToscaConstraintLogical(final ToscaConstraint authorativeConcept) {
+ /*
+ * The following will call invoke fromAuthorative() which will populate the class fields.
+ */
super(authorativeConcept);
}
private static final long serialVersionUID = -5060193250508635456L;
@ElementCollection
- @NonNull
@Getter
private List<String> validValues;
*
* @param authorativeConcept the authorative concept to copy from
*/
- @SuppressWarnings("java:S2637")
public JpaToscaConstraintValidValues(final ToscaConstraint authorativeConcept) {
+ /*
+ * The following will call invoke fromAuthorative() which will populate the class fields.
+ */
super(authorativeConcept);
}
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2020 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @param key the concept key
*/
public JpaToscaDataTypes(final PfConceptKey key) {
- super(key, new TreeMap<PfConceptKey, JpaToscaDataType>());
+ super(key, new TreeMap<>());
}
/**
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2020 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @param key the concept key
*/
public JpaToscaPolicies(final PfConceptKey key) {
- super(key, new TreeMap<PfConceptKey, JpaToscaPolicy>());
+ super(key, new TreeMap<>());
}
/**
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2020 Nordix Foundation.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @param key the concept key
*/
public JpaToscaPolicyTypes(final PfConceptKey key) {
- super(key, new TreeMap<PfConceptKey, JpaToscaPolicyType>());
+ super(key, new TreeMap<>());
}
/**
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @param key the concept key
*/
public JpaToscaServiceTemplates(final PfConceptKey key) {
- super(key, new TreeMap<PfConceptKey, JpaToscaServiceTemplate>());
+ super(key, new TreeMap<>());
}
/**
Code Review / policy / models.git / commitdiff