diff options
| author |   liamfallon <liam.fallon@est.tech> | 2020-03-02 17:08:47 +0000 |
|---|---|---|
| committer | liamfallon <liam.fallon@est.tech> | 2020-03-04 08:33:25 +0000 |
| commit | 9e5c4b882728ebf3330568d068f109965d599410 (patch) | |
| tree | 8ad948a28268b50b97946168b7a8ceab54872dc5 /testsuites/integration/integration-common/src | |
| parent | 5922128637471bfa1897b8808561000988da733d (diff) | |
Preparing integration tests for Graal Javascript
Graal enforces Javascript more strictly than Nashorn does. This review
changes the tests in apex-pdp to comply with the stricter -Javascript
checking, re-enabling the integration test module.
- All log calls must be passed as strings, using toString()
- Byte/Float/Long Java types not supported in Javascript
Disable integration tests so that other changes can be brought in.
JMS integration test is disabled for now, it will be re-enabled in a
review shortly.
Issue-ID: POLICY-2106
Change-Id: I14bdb930eff735e862b51802cf72e4793cec3699
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'testsuites/integration/integration-common/src')
21 files changed, 118 insertions, 2005 deletions
diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java index 208571a3e..1ef830c56 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextBooleanItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,13 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** - * The Class TestContextItem000. + * The Class TestContextBooleanItem. */ +@Data public class TestContextBooleanItem implements Serializable { - private static final int HASH_PRIME_1 = 31; - private static final int HASH_PRIME_2 = 1231; - private static final int HASH_PRIME_3 = 1237; - private static final long serialVersionUID = 7241008665286367796L; private boolean flag = false; @@ -50,59 +49,4 @@ public class TestContextBooleanItem implements Serializable { public TestContextBooleanItem(final Boolean flag) { this.flag = flag; } - - /** - * Gets the flag. - * - * @return the flag - */ - public boolean getFlag() { - return flag; - } - - /** - * Sets the flag. - * - * @param flag the flag - */ - public void setFlag(final boolean flag) { - this.flag = flag; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + (flag ? HASH_PRIME_2 : HASH_PRIME_3); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextBooleanItem other = (TestContextBooleanItem) obj; - return flag == other.flag; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem000 [flag=" + flag + "]"; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java index b152f2715..91d383a62 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextByteItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,15 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** - * The Class TestContextItem001. + * The Class TestContextByteItem. */ +@Data public class TestContextByteItem implements Serializable { private static final long serialVersionUID = 1361938145823720386L; - private static final int HASH_PRIME_1 = 31; - private byte byteValue = 0; /** @@ -49,58 +50,7 @@ public class TestContextByteItem implements Serializable { this.byteValue = byteValue; } - /** - * Gets the byte value. - * - * @return the byte value - */ - public byte getByteValue() { - return byteValue; - } - - /** - * Sets the byte value. - * - * @param byteValue the byte value - */ - public void setByteValue(final byte byteValue) { - this.byteValue = byteValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + byteValue; - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextByteItem other = (TestContextByteItem) obj; - return byteValue == other.byteValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem001 [byteValue=" + byteValue + "]"; + public Byte getIncrementedByteValue() { + return (byte) (byteValue + 1); } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateItem.java index 4ed506977..b35b061a7 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,15 +26,15 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; +import lombok.Data; + /** - * The Class TestContextItem008. + * The Class TestContextDateItem. */ +@Data public class TestContextDateItem implements Serializable { private static final long serialVersionUID = -6984963129968805460L; - private static final int HASH_PRIME_1 = 31; - private static final int FOUR_BYTES = 32; - private long time; private int year; @@ -60,8 +60,7 @@ public class TestContextDateItem implements Serializable { public TestContextDateItem(final Date dateValue) { if (dateValue != null) { setDateValue(dateValue.getTime()); - } - else { + } else { new Date(0); } } @@ -76,78 +75,6 @@ public class TestContextDateItem implements Serializable { } /** - * Gets the time. - * - * @return the time - */ - public long getTime() { - return time; - } - - /** - * Gets the year. - * - * @return the year - */ - public int getYear() { - return year; - } - - /** - * Gets the month. - * - * @return the month - */ - public int getMonth() { - return month; - } - - /** - * Gets the day. - * - * @return the day - */ - public int getDay() { - return day; - } - - /** - * Gets the hour. - * - * @return the hour - */ - public int getHour() { - return hour; - } - - /** - * Gets the minute. - * - * @return the minute - */ - public int getMinute() { - return minute; - } - - /** - * Gets the second. - * - * @return the second - */ - public int getSecond() { - return second; - } - - /** - * Gets the milli second. - * - * @return the milli second - */ - public int getMilliSecond() { - return milliSecond; - } - - /** * Gets the date value. * * @return the date value @@ -187,50 +114,4 @@ public class TestContextDateItem implements Serializable { second = calendar.get(Calendar.SECOND); milliSecond = calendar.get(Calendar.MILLISECOND); } - - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + day; - result = prime * result + hour; - result = prime * result + milliSecond; - result = prime * result + minute; - result = prime * result + month; - result = prime * result + second; - result = prime * result + (int) (time ^ (time >>> FOUR_BYTES)); - result = prime * result + year; - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextDateItem other = (TestContextDateItem) obj; - return time == other.time; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem008 [time=" + time + ", year=" + year + ", month=" + month + ", day=" + day + ", hour=" - + hour + ", minute=" + minute + ", second=" + second + ", milliSecond=" + milliSecond + "]"; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java index 22c46b4a7..a3d2fc475 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateLocaleItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,18 +25,17 @@ import java.io.Serializable; import java.util.Locale; import java.util.TimeZone; +import lombok.Data; + /** - * The Class TestContextItem00A. + * The Class TestContextDateLocaleItem. */ +@Data public class TestContextDateLocaleItem implements Serializable { private static final long serialVersionUID = -6579903685538233754L; - private static final int HASH_PRIME_1 = 31; - private static final int HASH_PRIME_2 = 1231; - private static final int HASH_PRIME_3 = 1237; - private TestContextDateItem dateValue = new TestContextDateItem(System.currentTimeMillis()); - private String timeZoneString = TimeZone.getTimeZone("Europe/Dublin").getDisplayName(); + private String tzValue = TimeZone.getTimeZone("Europe/Dublin").getDisplayName(); private boolean dst = false; private int utcOffset = 0; private Locale locale = Locale.ENGLISH; @@ -58,9 +57,9 @@ public class TestContextDateLocaleItem implements Serializable { * @param country the country */ public TestContextDateLocaleItem(final TestContextDateItem dateValue, final String tzValue, final boolean dst, - final int utcOffset, final String language, final String country) { + final int utcOffset, final String language, final String country) { this.dateValue = dateValue; - this.timeZoneString = TimeZone.getTimeZone(tzValue).getDisplayName(); + this.tzValue = TimeZone.getTimeZone(tzValue).getDisplayName(); this.dst = dst; this.utcOffset = utcOffset; @@ -74,7 +73,7 @@ public class TestContextDateLocaleItem implements Serializable { */ public TestContextDateLocaleItem(final TestContextDateLocaleItem original) { this.dateValue = original.dateValue; - this.timeZoneString = TimeZone.getTimeZone(original.timeZoneString).getDisplayName(); + this.tzValue = TimeZone.getTimeZone(original.tzValue).getDisplayName(); this.dst = original.dst; this.utcOffset = original.utcOffset; @@ -82,167 +81,15 @@ public class TestContextDateLocaleItem implements Serializable { } /** - * Gets the date value. - * - * @return the date value - */ - public TestContextDateItem getDateValue() { - return dateValue; - } - - /** - * Sets the date value. - * - * @param dateValue the date value - */ - public void setDateValue(final TestContextDateItem dateValue) { - this.dateValue = dateValue; - } - - /** - * Gets the TZ value. - * - * @return the TZ value - */ - public String getTzValue() { - return timeZoneString; - } - - /** * Sets the TZ value. * * @param tzValue the TZ value */ public void setTzValue(final String tzValue) { if (tzValue != null) { - this.timeZoneString = TimeZone.getTimeZone(tzValue).getDisplayName(); + this.tzValue = TimeZone.getTimeZone(tzValue).getDisplayName(); } else { - this.timeZoneString = null; - } - } - - /** - * Gets the DST. - * - * @return the dst - */ - public boolean getDst() { - return dst; - } - - /** - * Sets the DST. - * - * @param newDst the dst - */ - public void setDst(final boolean newDst) { - this.dst = newDst; - } - - /** - * Gets the UTC offset. - * - * @return the UTC offset - */ - public int getUtcOffset() { - return utcOffset; - } - - /** - * Sets the UTC offset. - * - * @param newUtcOffset the UTC offset - */ - public void setUtcOffset(final int newUtcOffset) { - this.utcOffset = newUtcOffset; - } - - /** - * Gets the locale. - * - * @return the locale - */ - public Locale getLocale() { - return locale; - } - - /** - * Sets the locale. - * - * @param locale the locale - */ - public void setLocale(final Locale locale) { - if (locale != null) { - this.locale = locale; - } - else { - this.locale = null; + this.tzValue = null; } } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + ((dateValue == null) ? 0 : dateValue.hashCode()); - result = prime * result + (dst ? HASH_PRIME_2 : HASH_PRIME_3); - result = prime * result + ((locale == null) ? 0 : locale.hashCode()); - result = prime * result + ((timeZoneString == null) ? 0 : timeZoneString.hashCode()); - result = prime * result + utcOffset; - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextDateLocaleItem other = (TestContextDateLocaleItem) obj; - if (dateValue == null) { - if (other.dateValue != null) { - return false; - } - } else if (!dateValue.equals(other.dateValue)) { - return false; - } - if (dst != other.dst) { - return false; - } - if (locale == null) { - if (other.locale != null) { - return false; - } - } else if (!locale.equals(other.locale)) { - return false; - } - if (timeZoneString == null) { - if (other.timeZoneString != null) { - return false; - } - } else if (!timeZoneString.equals(other.timeZoneString)) { - return false; - } - return utcOffset == other.utcOffset; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem00A [dateValue=" + dateValue + ", timeZoneString=" + timeZoneString + ", dst=" + dst - + ", utcOffset=" + utcOffset + ", locale=" + locale + "]"; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java index 602f20917..029719afb 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDateTzItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,18 +24,17 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; import java.util.TimeZone; +import lombok.Data; + /** - * The Class TestContextItem009. + * The Class TestContextDateTzItem. */ +@Data public class TestContextDateTzItem implements Serializable { private static final long serialVersionUID = 5604426823170331706L; - private static final int HASH_PRIME_1 = 31; - private static final int HASH_PRIME_2 = 1231; - private static final int HASH_PRIME_3 = 1237; - private TestContextDateItem dateValue = new TestContextDateItem(System.currentTimeMillis()); - private String timeZoneString = TimeZone.getTimeZone("Europe/Dublin").getDisplayName(); + private String tzValue = TimeZone.getTimeZone("Europe/Dublin").getDisplayName(); private boolean dst = false; /** @@ -54,7 +53,7 @@ public class TestContextDateTzItem implements Serializable { */ public TestContextDateTzItem(final TestContextDateItem dateValue, final String tzValue, final boolean dst) { this.dateValue = dateValue; - this.timeZoneString = TimeZone.getTimeZone(tzValue).getDisplayName(); + this.tzValue = TimeZone.getTimeZone(tzValue).getDisplayName(); this.dst = dst; } @@ -65,123 +64,20 @@ public class TestContextDateTzItem implements Serializable { */ public TestContextDateTzItem(final TestContextDateTzItem original) { this.dateValue = original.dateValue; - this.timeZoneString = original.timeZoneString; + this.tzValue = original.tzValue; this.dst = original.dst; } /** - * Gets the date value. - * - * @return the date value - */ - public TestContextDateItem getDateValue() { - return dateValue; - } - - /** - * Sets the date value. - * - * @param dateValue the date value - */ - public void setDateValue(final TestContextDateItem dateValue) { - this.dateValue = dateValue; - } - - /** - * Gets the TZ value. - * - * @return the TZ value - */ - public String getTzValue() { - return timeZoneString; - } - - /** * Sets the TZ value. * * @param tzValue the TZ value */ public void setTzValue(final String tzValue) { if (tzValue != null) { - this.timeZoneString = TimeZone.getTimeZone(tzValue).getDisplayName(); + this.tzValue = TimeZone.getTimeZone(tzValue).getDisplayName(); + } else { + this.tzValue = null; } - else { - this.timeZoneString = null; - } - } - - /** - * Gets the DST. - * - * @return the dst - */ - public boolean getDst() { - return dst; - } - - /** - * Sets the DST. - * - * @param newDst the dst - */ - public void setDst(final boolean newDst) { - this.dst = newDst; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + ((dateValue == null) ? 0 : dateValue.hashCode()); - result = prime * result + (dst ? HASH_PRIME_2 : HASH_PRIME_3); - result = prime * result + ((timeZoneString == null) ? 0 : timeZoneString.hashCode()); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextDateTzItem other = (TestContextDateTzItem) obj; - if (dateValue == null) { - if (other.dateValue != null) { - return false; - } - } else if (!dateValue.equals(other.dateValue)) { - return false; - } - if (dst != other.dst) { - return false; - } - if (timeZoneString == null) { - if (other.timeZoneString != null) { - return false; - } - } - else if (!timeZoneString.equals(other.timeZoneString)) { - return false; - } - return true; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem009 [dateValue=" + dateValue + ", tzValue=" + timeZoneString + ", dst=" + dst + "]"; } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java index e67ba5e7e..dede657c6 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextDoubleItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,15 +23,15 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** - * The Class TestContextItem005. + * The Class TestContextDoubleItem. */ +@Data public class TestContextDoubleItem implements Serializable { private static final long serialVersionUID = -2958758261076734821L; - private static final int HASH_PRIME_1 = 31; - private static final int FOUR_BYTES = 32; - private double doubleValue = 0; /** @@ -50,60 +50,7 @@ public class TestContextDoubleItem implements Serializable { this.doubleValue = doubleValue; } - /** - * Gets the double value. - * - * @return the double value - */ - public double getDoubleValue() { - return doubleValue; - } - - /** - * Sets the double value. - * - * @param doubleValue the double value - */ - public void setDoubleValue(final double doubleValue) { - this.doubleValue = doubleValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - long temp; - temp = Double.doubleToLongBits(doubleValue); - result = prime * result + (int) (temp ^ (temp >>> FOUR_BYTES)); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextDoubleItem other = (TestContextDoubleItem) obj; - return Double.doubleToLongBits(doubleValue) == Double.doubleToLongBits(other.doubleValue); - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem005 [doubleValue=" + doubleValue + "]"; + public Double getIncrementedDoubleValue() { + return doubleValue + 1; } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java index fec1c2545..8337d8006 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextFloatItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,15 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** - * The Class TestContextItem004. + * The Class TestContextFloatItem. */ +@Data public class TestContextFloatItem implements Serializable { private static final long serialVersionUID = -3359180576903272400L; - private static final int HASH_PRIME_1 = 31; - private float floatValue = 0; /** @@ -49,58 +50,7 @@ public class TestContextFloatItem implements Serializable { this.floatValue = floatValue; } - /** - * Gets the float value. - * - * @return the float value - */ - public float getFloatValue() { - return floatValue; - } - - /** - * Sets the float value. - * - * @param floatValue the float value - */ - public void setFloatValue(final float floatValue) { - this.floatValue = floatValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + Float.floatToIntBits(floatValue); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextFloatItem other = (TestContextFloatItem) obj; - return Float.floatToIntBits(floatValue) == Float.floatToIntBits(other.floatValue); - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem004 [floatValue=" + floatValue + "]"; + public Float getIncrementedFloatValue() { + return floatValue + 1; } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java index ea76f7049..fde563cf3 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextIntItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,15 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** - * The Class TestContextItem002. + * The Class TestContextIntItem. */ +@Data public class TestContextIntItem implements Serializable { private static final long serialVersionUID = -8978435658277900984L; - private static final int HASH_PRIME_1 = 31; - private int intValue = 0; /** @@ -58,58 +59,7 @@ public class TestContextIntItem implements Serializable { this.intValue = original.intValue; } - /** - * Gets the int value. - * - * @return the int value - */ - public int getIntValue() { - return intValue; - } - - /** - * Sets the int value. - * - * @param intValue the int value - */ - public void setIntValue(final int intValue) { - this.intValue = intValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + intValue; - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextIntItem other = (TestContextIntItem) obj; - return intValue == other.intValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem002 [intValue=" + intValue + "]"; + public Integer getIncrementedIntValue() { + return intValue + 1; } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java index dc18da5f5..ac70dafcc 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,15 +23,15 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** - * The Class TestContextItem003. + * The Class TestContextLongItem. */ +@Data public class TestContextLongItem implements Serializable { private static final long serialVersionUID = 3599267534512489386L; - private static final int HASH_PRIME_1 = 31; - private static final int FOUR_BYTES = 33; - private long longValue = 0; /** @@ -50,58 +50,7 @@ public class TestContextLongItem implements Serializable { this.longValue = longValue; } - /** - * Gets the long value. - * - * @return the long value - */ - public long getLongValue() { - return longValue; - } - - /** - * Sets the long value. - * - * @param longValue the long value - */ - public void setLongValue(final long longValue) { - this.longValue = longValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + (int) (longValue ^ (longValue >>> FOUR_BYTES)); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextLongItem other = (TestContextLongItem) obj; - return longValue == other.longValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem003 [longValue=" + longValue + "]"; + public Long getIncrementedLongValue() { + return longValue + 1; } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java index fb1e9319d..cadc66f95 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextLongObjectItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,15 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** - * The Class TestContextItem007. + * The Class TestContextLongObjectItem. */ +@Data public class TestContextLongObjectItem implements Serializable { private static final long serialVersionUID = -1029406737866392421L; - private static final int HASH_PRIME_1 = 31; - private Long longValue = 0L; /** @@ -49,65 +50,7 @@ public class TestContextLongObjectItem implements Serializable { this.longValue = longValue; } - /** - * Gets the long value. - * - * @return the long value - */ - public Long getLongValue() { - return longValue; - } - - /** - * Sets the long value. - * - * @param longValue the long value - */ - public void setLongValue(final Long longValue) { - this.longValue = longValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + ((longValue == null) ? 0 : longValue.hashCode()); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextLongObjectItem other = (TestContextLongObjectItem) obj; - if (longValue == null) { - if (other.longValue != null) { - return false; - } - } else if (!longValue.equals(other.longValue)) { - return false; - } - return true; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem007 [longValue=" + longValue + "]"; + public Long getIncrementedLongValue() { + return longValue + 1; } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java index 16a180a64..e443b9c8a 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextStringItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,15 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** - * The Class TestContextItem006. + * The Class TestContextStringItem. */ +@Data public class TestContextStringItem implements Serializable { private static final long serialVersionUID = -1074772190611125121L; - private static final int HASH_PRIME_1 = 31; - private String stringValue = ""; /** @@ -48,66 +49,4 @@ public class TestContextStringItem implements Serializable { public TestContextStringItem(final String stringValue) { this.stringValue = stringValue; } - - /** - * Gets the string value. - * - * @return the string value - */ - public String getStringValue() { - return stringValue; - } - - /** - * Sets the string value. - * - * @param stringValue the string value - */ - public void setStringValue(final String stringValue) { - this.stringValue = stringValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + ((stringValue == null) ? 0 : stringValue.hashCode()); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextStringItem other = (TestContextStringItem) obj; - if (stringValue == null) { - if (other.stringValue != null) { - return false; - } - } else if (!stringValue.equals(other.stringValue)) { - return false; - } - return true; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem006 [stringValue=" + stringValue + "]"; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java index 3e3aae121..fcdd1ad06 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeMapItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,14 +25,15 @@ import java.io.Serializable; import java.util.Map; import java.util.TreeMap; +import lombok.Data; + /** - * The Class TestContextItem00C. + * The Class TestContextTreeMapItem. */ +@Data public class TestContextTreeMapItem implements Serializable { private static final long serialVersionUID = -7497746259264651884L; - private static final int HASH_PRIME_1 = 31; - private Map<String, String> mapValue = new TreeMap<>(); /** @@ -50,70 +51,4 @@ public class TestContextTreeMapItem implements Serializable { public TestContextTreeMapItem(final Map<String, String> mapValue) { this.mapValue = mapValue; } - - /** - * Gets the map value. - * - * @return the map value - */ - public Map<String, String> getMapValue() { - if (mapValue == null) { - mapValue = new TreeMap<>(); - } - return mapValue; - } - - /** - * Sets the map value. - * - * @param mapValue the map value - */ - public void setMapValue(final Map<String, String> mapValue) { - this.mapValue = mapValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + ((mapValue == null) ? 0 : mapValue.hashCode()); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextTreeMapItem other = (TestContextTreeMapItem) obj; - if (mapValue == null) { - if (other.mapValue != null) { - return false; - } - } else if (!mapValue.equals(other.mapValue)) { - return false; - } - return true; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem00C [mapValue=" + mapValue + "]"; - } - } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java index 7c83d48e5..d84aebbff 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestContextTreeSetItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,18 +23,18 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; import java.util.Arrays; -import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import lombok.Data; + /** - * The Class TestContextItem00B. + * The Class TestContextTreeSetItem. */ +@Data public class TestContextTreeSetItem implements Serializable { private static final long serialVersionUID = 1254589722957250388L; - private static final int HASH_PRIME_1 = 31; - private SortedSet<String> setValue = new TreeSet<>(); /** @@ -61,69 +61,4 @@ public class TestContextTreeSetItem implements Serializable { public TestContextTreeSetItem(final SortedSet<String> setValue) { this.setValue = setValue; } - - /** - * Gets the set value. - * - * @return the sets the value - */ - public Set<String> getSetValue() { - if (setValue == null) { - setValue = new TreeSet<>(); - } - return setValue; - } - - /** - * Sets the set value. - * - * @param setValue the sets the value - */ - public void setSetValue(final SortedSet<String> setValue) { - this.setValue = setValue; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + ((setValue == null) ? 0 : setValue.hashCode()); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestContextTreeSetItem other = (TestContextTreeSetItem) obj; - if (setValue == null) { - if (other.setValue != null) { - return false; - } - } else if (!setValue.equals(other.setValue)) { - return false; - } - return true; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestContextItem00B [setValue=" + setValue + "]"; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java index 3d17eeccc..d20e4bde8 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestExternalContextItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,15 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** * The Class TestExternalContextItem. */ +@Data public class TestExternalContextItem implements Serializable { private static final long serialVersionUID = 3512435733818672173L; - private static final int HASH_PRIME_1 = 31; - private TestContextBooleanItem testExternalContextItem000; private TestContextByteItem testExternalContextItem001; private TestContextIntItem testExternalContextItem002; @@ -44,386 +45,4 @@ public class TestExternalContextItem implements Serializable { private TestContextDateLocaleItem testExternalContextItem00A; private TestContextTreeSetItem testExternalContextItem00B; private TestContextTreeMapItem testExternalContextItem00C; - - /** - * Gets the test external context item 000. - * - * @return the test external context item 000 - */ - public TestContextBooleanItem getTestExternalContextItem000() { - return testExternalContextItem000; - } - - /** - * Sets the test external context item 000. - * - * @param testExternalContextItem000 the test external context item 000 - */ - public void setTestExternalContextItem000(final TestContextBooleanItem testExternalContextItem000) { - this.testExternalContextItem000 = testExternalContextItem000; - } - - /** - * Gets the test external context item 001. - * - * @return the test external context item 001 - */ - public TestContextByteItem getTestExternalContextItem001() { - return testExternalContextItem001; - } - - /** - * Sets the test external context item 001. - * - * @param testExternalContextItem001 the test external context item 001 - */ - public void setTestExternalContextItem001(final TestContextByteItem testExternalContextItem001) { - this.testExternalContextItem001 = testExternalContextItem001; - } - - /** - * Gets the test external context item 002. - * - * @return the test external context item 002 - */ - public TestContextIntItem getTestExternalContextItem002() { - return testExternalContextItem002; - } - - /** - * Sets the test external context item 002. - * - * @param testExternalContextItem002 the test external context item 002 - */ - public void setTestExternalContextItem002(final TestContextIntItem testExternalContextItem002) { - this.testExternalContextItem002 = testExternalContextItem002; - } - - /** - * Gets the test external context item 003. - * - * @return the test external context item 003 - */ - public TestContextLongItem getTestExternalContextItem003() { - return testExternalContextItem003; - } - - /** - * Sets the test external context item 003. - * - * @param testExternalContextItem003 the test external context item 003 - */ - public void setTestExternalContextItem003(final TestContextLongItem testExternalContextItem003) { - this.testExternalContextItem003 = testExternalContextItem003; - } - - /** - * Gets the test external context item 004. - * - * @return the test external context item 004 - */ - public TestContextFloatItem getTestExternalContextItem004() { - return testExternalContextItem004; - } - - /** - * Sets the test external context item 004. - * - * @param testExternalContextItem004 the test external context item 004 - */ - public void setTestExternalContextItem004(final TestContextFloatItem testExternalContextItem004) { - this.testExternalContextItem004 = testExternalContextItem004; - } - - /** - * Gets the test external context item 005. - * - * @return the test external context item 005 - */ - public TestContextDoubleItem getTestExternalContextItem005() { - return testExternalContextItem005; - } - - /** - * Sets the test external context item 005. - * - * @param testExternalContextItem005 the test external context item 005 - */ - public void setTestExternalContextItem005(final TestContextDoubleItem testExternalContextItem005) { - this.testExternalContextItem005 = testExternalContextItem005; - } - - /** - * Gets the test external context item 006. - * - * @return the test external context item 006 - */ - public TestContextStringItem getTestExternalContextItem006() { - return testExternalContextItem006; - } - - /** - * Sets the test external context item 006. - * - * @param testExternalContextItem006 the test external context item 006 - */ - public void setTestExternalContextItem006(final TestContextStringItem testExternalContextItem006) { - this.testExternalContextItem006 = testExternalContextItem006; - } - - /** - * Gets the test external context item 007. - * - * @return the test external context item 007 - */ - public TestContextLongObjectItem getTestExternalContextItem007() { - return testExternalContextItem007; - } - - /** - * Sets the test external context item 007. - * - * @param testExternalContextItem007 the test external context item 007 - */ - public void setTestExternalContextItem007(final TestContextLongObjectItem testExternalContextItem007) { - this.testExternalContextItem007 = testExternalContextItem007; - } - - /** - * Gets the test external context item 008. - * - * @return the test external context item 008 - */ - public TestContextDateItem getTestExternalContextItem008() { - return testExternalContextItem008; - } - - /** - * Sets the test external context item 008. - * - * @param testExternalContextItem008 the test external context item 008 - */ - public void setTestExternalContextItem008(final TestContextDateItem testExternalContextItem008) { - this.testExternalContextItem008 = testExternalContextItem008; - } - - /** - * Gets the test external context item 009. - * - * @return the test external context item 009 - */ - public TestContextDateTzItem getTestExternalContextItem009() { - return testExternalContextItem009; - } - - /** - * Sets the test external context item 009. - * - * @param testExternalContextItem009 the test external context item 009 - */ - public void setTestExternalContextItem009(final TestContextDateTzItem testExternalContextItem009) { - this.testExternalContextItem009 = testExternalContextItem009; - } - - /** - * Gets the test external context item 00 A. - * - * @return the test external context item 00 A - */ - public TestContextDateLocaleItem getTestExternalContextItem00A() { - return testExternalContextItem00A; - } - - /** - * Sets the test external context item 00 A. - * - * @param testExternalContextItem00A the test external context item 00 A - */ - public void setTestExternalContextItem00A(final TestContextDateLocaleItem testExternalContextItem00A) { - this.testExternalContextItem00A = testExternalContextItem00A; - } - - /** - * Gets the test external context item 00 B. - * - * @return the test external context item 00 B - */ - public TestContextTreeSetItem getTestExternalContextItem00B() { - return testExternalContextItem00B; - } - - /** - * Sets the test external context item 00 B. - * - * @param testExternalContextItem00B the test external context item 00 B - */ - public void setTestExternalContextItem00B(final TestContextTreeSetItem testExternalContextItem00B) { - this.testExternalContextItem00B = testExternalContextItem00B; - } - - /** - * Gets the test external context item 00 C. - * - * @return the test external context item 00 C - */ - public TestContextTreeMapItem getTestExternalContextItem00C() { - return testExternalContextItem00C; - } - - /** - * Sets the test external context item 00 C. - * - * @param testExternalContextItem00C the test external context item 00 C - */ - public void setTestExternalContextItem00C(final TestContextTreeMapItem testExternalContextItem00C) { - this.testExternalContextItem00C = testExternalContextItem00C; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + ((testExternalContextItem000 == null) ? 0 : testExternalContextItem000.hashCode()); - result = prime * result + ((testExternalContextItem001 == null) ? 0 : testExternalContextItem001.hashCode()); - result = prime * result + ((testExternalContextItem002 == null) ? 0 : testExternalContextItem002.hashCode()); - result = prime * result + ((testExternalContextItem003 == null) ? 0 : testExternalContextItem003.hashCode()); - result = prime * result + ((testExternalContextItem004 == null) ? 0 : testExternalContextItem004.hashCode()); - result = prime * result + ((testExternalContextItem005 == null) ? 0 : testExternalContextItem005.hashCode()); - result = prime * result + ((testExternalContextItem006 == null) ? 0 : testExternalContextItem006.hashCode()); - result = prime * result + ((testExternalContextItem007 == null) ? 0 : testExternalContextItem007.hashCode()); - result = prime * result + ((testExternalContextItem008 == null) ? 0 : testExternalContextItem008.hashCode()); - result = prime * result + ((testExternalContextItem009 == null) ? 0 : testExternalContextItem009.hashCode()); - result = prime * result + ((testExternalContextItem00A == null) ? 0 : testExternalContextItem00A.hashCode()); - result = prime * result + ((testExternalContextItem00B == null) ? 0 : testExternalContextItem00B.hashCode()); - result = prime * result + ((testExternalContextItem00C == null) ? 0 : testExternalContextItem00C.hashCode()); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestExternalContextItem other = (TestExternalContextItem) obj; - if (testExternalContextItem000 == null) { - if (other.testExternalContextItem000 != null) { - return false; - } - } else if (!testExternalContextItem000.equals(other.testExternalContextItem000)) { - return false; - } - if (testExternalContextItem001 == null) { - if (other.testExternalContextItem001 != null) { - return false; - } - } else if (!testExternalContextItem001.equals(other.testExternalContextItem001)) { - return false; - } - if (testExternalContextItem002 == null) { - if (other.testExternalContextItem002 != null) { - return false; - } - } else if (!testExternalContextItem002.equals(other.testExternalContextItem002)) { - return false; - } - if (testExternalContextItem003 == null) { - if (other.testExternalContextItem003 != null) { - return false; - } - } else if (!testExternalContextItem003.equals(other.testExternalContextItem003)) { - return false; - } - if (testExternalContextItem004 == null) { - if (other.testExternalContextItem004 != null) { - return false; - } - } else if (!testExternalContextItem004.equals(other.testExternalContextItem004)) { - return false; - } - if (testExternalContextItem005 == null) { - if (other.testExternalContextItem005 != null) { - return false; - } - } else if (!testExternalContextItem005.equals(other.testExternalContextItem005)) { - return false; - } - if (testExternalContextItem006 == null) { - if (other.testExternalContextItem006 != null) { - return false; - } - } else if (!testExternalContextItem006.equals(other.testExternalContextItem006)) { - return false; - } - if (testExternalContextItem007 == null) { - if (other.testExternalContextItem007 != null) { - return false; - } - } else if (!testExternalContextItem007.equals(other.testExternalContextItem007)) { - return false; - } - if (testExternalContextItem008 == null) { - if (other.testExternalContextItem008 != null) { - return false; - } - } else if (!testExternalContextItem008.equals(other.testExternalContextItem008)) { - return false; - } - if (testExternalContextItem009 == null) { - if (other.testExternalContextItem009 != null) { - return false; - } - } else if (!testExternalContextItem009.equals(other.testExternalContextItem009)) { - return false; - } - if (testExternalContextItem00A == null) { - if (other.testExternalContextItem00A != null) { - return false; - } - } else if (!testExternalContextItem00A.equals(other.testExternalContextItem00A)) { - return false; - } - if (testExternalContextItem00B == null) { - if (other.testExternalContextItem00B != null) { - return false; - } - } else if (!testExternalContextItem00B.equals(other.testExternalContextItem00B)) { - return false; - } - if (testExternalContextItem00C == null) { - if (other.testExternalContextItem00C != null) { - return false; - } - } else if (!testExternalContextItem00C.equals(other.testExternalContextItem00C)) { - return false; - } - return true; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestExternalContextItem [testExternalContextItem000=" + testExternalContextItem000 - + ", testExternalContextItem001=" + testExternalContextItem001 + ", testExternalContextItem002=" - + testExternalContextItem002 + ", testExternalContextItem003=" + testExternalContextItem003 - + ", testExternalContextItem004=" + testExternalContextItem004 + ", testExternalContextItem005=" - + testExternalContextItem005 + ", testExternalContextItem006=" + testExternalContextItem006 - + ", testExternalContextItem007=" + testExternalContextItem007 + ", testExternalContextItem008=" - + testExternalContextItem008 + ", testExternalContextItem009=" + testExternalContextItem009 - + ", testExternalContextItem00A=" + testExternalContextItem00A + ", testExternalContextItem00B=" - + testExternalContextItem00B + ", testExternalContextItem00C=" + testExternalContextItem00C + "]"; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java index 94707082d..f10d8c823 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestGlobalContextItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,15 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** * The Class TestGlobalContextItem. */ +@Data public class TestGlobalContextItem implements Serializable { private static final long serialVersionUID = 3348445332683174361L; - private static final int HASH_PRIME_1 = 31; - private TestContextBooleanItem testGlobalContextItem000; private TestContextByteItem testGlobalContextItem001; private TestContextIntItem testGlobalContextItem002; @@ -44,386 +45,4 @@ public class TestGlobalContextItem implements Serializable { private TestContextDateLocaleItem testGlobalContextItem00A; private TestContextTreeSetItem testGlobalContextItem00B; private TestContextTreeMapItem testGlobalContextItem00C; - - /** - * Gets the test global context item 000. - * - * @return the test global context item 000 - */ - public TestContextBooleanItem getTestGlobalContextItem000() { - return testGlobalContextItem000; - } - - /** - * Sets the test global context item 000. - * - * @param testGlobalContextItem000 the test global context item 000 - */ - public void setTestGlobalContextItem000(final TestContextBooleanItem testGlobalContextItem000) { - this.testGlobalContextItem000 = testGlobalContextItem000; - } - - /** - * Gets the test global context item 001. - * - * @return the test global context item 001 - */ - public TestContextByteItem getTestGlobalContextItem001() { - return testGlobalContextItem001; - } - - /** - * Sets the test global context item 001. - * - * @param testGlobalContextItem001 the test global context item 001 - */ - public void setTestGlobalContextItem001(final TestContextByteItem testGlobalContextItem001) { - this.testGlobalContextItem001 = testGlobalContextItem001; - } - - /** - * Gets the test global context item 002. - * - * @return the test global context item 002 - */ - public TestContextIntItem getTestGlobalContextItem002() { - return testGlobalContextItem002; - } - - /** - * Sets the test global context item 002. - * - * @param testGlobalContextItem002 the test global context item 002 - */ - public void setTestGlobalContextItem002(final TestContextIntItem testGlobalContextItem002) { - this.testGlobalContextItem002 = testGlobalContextItem002; - } - - /** - * Gets the test global context item 003. - * - * @return the test global context item 003 - */ - public TestContextLongItem getTestGlobalContextItem003() { - return testGlobalContextItem003; - } - - /** - * Sets the test global context item 003. - * - * @param testGlobalContextItem003 the test global context item 003 - */ - public void setTestGlobalContextItem003(final TestContextLongItem testGlobalContextItem003) { - this.testGlobalContextItem003 = testGlobalContextItem003; - } - - /** - * Gets the test global context item 004. - * - * @return the test global context item 004 - */ - public TestContextFloatItem getTestGlobalContextItem004() { - return testGlobalContextItem004; - } - - /** - * Sets the test global context item 004. - * - * @param testGlobalContextItem004 the test global context item 004 - */ - public void setTestGlobalContextItem004(final TestContextFloatItem testGlobalContextItem004) { - this.testGlobalContextItem004 = testGlobalContextItem004; - } - - /** - * Gets the test global context item 005. - * - * @return the test global context item 005 - */ - public TestContextDoubleItem getTestGlobalContextItem005() { - return testGlobalContextItem005; - } - - /** - * Sets the test global context item 005. - * - * @param testGlobalContextItem005 the test global context item 005 - */ - public void setTestGlobalContextItem005(final TestContextDoubleItem testGlobalContextItem005) { - this.testGlobalContextItem005 = testGlobalContextItem005; - } - - /** - * Gets the test global context item 006. - * - * @return the test global context item 006 - */ - public TestContextStringItem getTestGlobalContextItem006() { - return testGlobalContextItem006; - } - - /** - * Sets the test global context item 006. - * - * @param testGlobalContextItem006 the test global context item 006 - */ - public void setTestGlobalContextItem006(final TestContextStringItem testGlobalContextItem006) { - this.testGlobalContextItem006 = testGlobalContextItem006; - } - - /** - * Gets the test global context item 007. - * - * @return the test global context item 007 - */ - public TestContextLongObjectItem getTestGlobalContextItem007() { - return testGlobalContextItem007; - } - - /** - * Sets the test global context item 007. - * - * @param testGlobalContextItem007 the test global context item 007 - */ - public void setTestGlobalContextItem007(final TestContextLongObjectItem testGlobalContextItem007) { - this.testGlobalContextItem007 = testGlobalContextItem007; - } - - /** - * Gets the test global context item 008. - * - * @return the test global context item 008 - */ - public TestContextDateItem getTestGlobalContextItem008() { - return testGlobalContextItem008; - } - - /** - * Sets the test global context item 008. - * - * @param testGlobalContextItem008 the test global context item 008 - */ - public void setTestGlobalContextItem008(final TestContextDateItem testGlobalContextItem008) { - this.testGlobalContextItem008 = testGlobalContextItem008; - } - - /** - * Gets the test global context item 009. - * - * @return the test global context item 009 - */ - public TestContextDateTzItem getTestGlobalContextItem009() { - return testGlobalContextItem009; - } - - /** - * Sets the test global context item 009. - * - * @param testGlobalContextItem009 the test global context item 009 - */ - public void setTestGlobalContextItem009(final TestContextDateTzItem testGlobalContextItem009) { - this.testGlobalContextItem009 = testGlobalContextItem009; - } - - /** - * Gets the test global context item 00 A. - * - * @return the test global context item 00 A - */ - public TestContextDateLocaleItem getTestGlobalContextItem00A() { - return testGlobalContextItem00A; - } - - /** - * Sets the test global context item 00 A. - * - * @param testGlobalContextItem00A the test global context item 00 A - */ - public void setTestGlobalContextItem00A(final TestContextDateLocaleItem testGlobalContextItem00A) { - this.testGlobalContextItem00A = testGlobalContextItem00A; - } - - /** - * Gets the test global context item 00 B. - * - * @return the test global context item 00 B - */ - public TestContextTreeSetItem getTestGlobalContextItem00B() { - return testGlobalContextItem00B; - } - - /** - * Sets the test global context item 00 B. - * - * @param testGlobalContextItem00B the test global context item 00 B - */ - public void setTestGlobalContextItem00B(final TestContextTreeSetItem testGlobalContextItem00B) { - this.testGlobalContextItem00B = testGlobalContextItem00B; - } - - /** - * Gets the test global context item 00 C. - * - * @return the test global context item 00 C - */ - public TestContextTreeMapItem getTestGlobalContextItem00C() { - return testGlobalContextItem00C; - } - - /** - * Sets the test global context item 00 C. - * - * @param testGlobalContextItem00C the test global context item 00 C - */ - public void setTestGlobalContextItem00C(final TestContextTreeMapItem testGlobalContextItem00C) { - this.testGlobalContextItem00C = testGlobalContextItem00C; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + ((testGlobalContextItem000 == null) ? 0 : testGlobalContextItem000.hashCode()); - result = prime * result + ((testGlobalContextItem001 == null) ? 0 : testGlobalContextItem001.hashCode()); - result = prime * result + ((testGlobalContextItem002 == null) ? 0 : testGlobalContextItem002.hashCode()); - result = prime * result + ((testGlobalContextItem003 == null) ? 0 : testGlobalContextItem003.hashCode()); - result = prime * result + ((testGlobalContextItem004 == null) ? 0 : testGlobalContextItem004.hashCode()); - result = prime * result + ((testGlobalContextItem005 == null) ? 0 : testGlobalContextItem005.hashCode()); - result = prime * result + ((testGlobalContextItem006 == null) ? 0 : testGlobalContextItem006.hashCode()); - result = prime * result + ((testGlobalContextItem007 == null) ? 0 : testGlobalContextItem007.hashCode()); - result = prime * result + ((testGlobalContextItem008 == null) ? 0 : testGlobalContextItem008.hashCode()); - result = prime * result + ((testGlobalContextItem009 == null) ? 0 : testGlobalContextItem009.hashCode()); - result = prime * result + ((testGlobalContextItem00A == null) ? 0 : testGlobalContextItem00A.hashCode()); - result = prime * result + ((testGlobalContextItem00B == null) ? 0 : testGlobalContextItem00B.hashCode()); - result = prime * result + ((testGlobalContextItem00C == null) ? 0 : testGlobalContextItem00C.hashCode()); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestGlobalContextItem other = (TestGlobalContextItem) obj; - if (testGlobalContextItem000 == null) { - if (other.testGlobalContextItem000 != null) { - return false; - } - } else if (!testGlobalContextItem000.equals(other.testGlobalContextItem000)) { - return false; - } - if (testGlobalContextItem001 == null) { - if (other.testGlobalContextItem001 != null) { - return false; - } - } else if (!testGlobalContextItem001.equals(other.testGlobalContextItem001)) { - return false; - } - if (testGlobalContextItem002 == null) { - if (other.testGlobalContextItem002 != null) { - return false; - } - } else if (!testGlobalContextItem002.equals(other.testGlobalContextItem002)) { - return false; - } - if (testGlobalContextItem003 == null) { - if (other.testGlobalContextItem003 != null) { - return false; - } - } else if (!testGlobalContextItem003.equals(other.testGlobalContextItem003)) { - return false; - } - if (testGlobalContextItem004 == null) { - if (other.testGlobalContextItem004 != null) { - return false; - } - } else if (!testGlobalContextItem004.equals(other.testGlobalContextItem004)) { - return false; - } - if (testGlobalContextItem005 == null) { - if (other.testGlobalContextItem005 != null) { - return false; - } - } else if (!testGlobalContextItem005.equals(other.testGlobalContextItem005)) { - return false; - } - if (testGlobalContextItem006 == null) { - if (other.testGlobalContextItem006 != null) { - return false; - } - } else if (!testGlobalContextItem006.equals(other.testGlobalContextItem006)) { - return false; - } - if (testGlobalContextItem007 == null) { - if (other.testGlobalContextItem007 != null) { - return false; - } - } else if (!testGlobalContextItem007.equals(other.testGlobalContextItem007)) { - return false; - } - if (testGlobalContextItem008 == null) { - if (other.testGlobalContextItem008 != null) { - return false; - } - } else if (!testGlobalContextItem008.equals(other.testGlobalContextItem008)) { - return false; - } - if (testGlobalContextItem009 == null) { - if (other.testGlobalContextItem009 != null) { - return false; - } - } else if (!testGlobalContextItem009.equals(other.testGlobalContextItem009)) { - return false; - } - if (testGlobalContextItem00A == null) { - if (other.testGlobalContextItem00A != null) { - return false; - } - } else if (!testGlobalContextItem00A.equals(other.testGlobalContextItem00A)) { - return false; - } - if (testGlobalContextItem00B == null) { - if (other.testGlobalContextItem00B != null) { - return false; - } - } else if (!testGlobalContextItem00B.equals(other.testGlobalContextItem00B)) { - return false; - } - if (testGlobalContextItem00C == null) { - if (other.testGlobalContextItem00C != null) { - return false; - } - } else if (!testGlobalContextItem00C.equals(other.testGlobalContextItem00C)) { - return false; - } - return true; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestGlobalContextItem [testGlobalContextItem000=" + testGlobalContextItem000 - + ", testGlobalContextItem001=" + testGlobalContextItem001 + ", testGlobalContextItem002=" - + testGlobalContextItem002 + ", testGlobalContextItem003=" + testGlobalContextItem003 - + ", testGlobalContextItem004=" + testGlobalContextItem004 + ", testGlobalContextItem005=" - + testGlobalContextItem005 + ", testGlobalContextItem006=" + testGlobalContextItem006 - + ", testGlobalContextItem007=" + testGlobalContextItem007 + ", testGlobalContextItem008=" - + testGlobalContextItem008 + ", testGlobalContextItem009=" + testGlobalContextItem009 - + ", testGlobalContextItem00A=" + testGlobalContextItem00A + ", testGlobalContextItem00B=" - + testGlobalContextItem00B + ", testGlobalContextItem00C=" + testGlobalContextItem00C + "]"; - } } diff --git a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java index 23d506639..c58da226a 100644 --- a/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java +++ b/testsuites/integration/integration-common/src/main/java/org/onap/policy/apex/context/test/concepts/TestPolicyContextItem.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2019-2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,214 +23,19 @@ package org.onap.policy.apex.context.test.concepts; import java.io.Serializable; +import lombok.Data; + /** * The Class TestPolicyContextItem. */ +@Data public class TestPolicyContextItem implements Serializable { private static final long serialVersionUID = 6336372857646152910L; - private static final int HASH_PRIME_1 = 31; - private TestContextStringItem testPolicyContextItem000; private TestContextLongItem testPolicyContextItem001; private TestContextDoubleItem testPolicyContextItem002; private TestContextBooleanItem testPolicyContextItem003; private TestContextLongItem testPolicyContextItem004; private TestContextTreeMapItem testPolicyContextItem005; - - /** - * Gets the test policy context item 000. - * - * @return the test policy context item 000 - */ - public TestContextStringItem getTestPolicyContextItem000() { - return testPolicyContextItem000; - } - - /** - * Sets the test policy context item 000. - * - * @param testPolicyContextItem000 the test policy context item 000 - */ - public void setTestPolicyContextItem000(final TestContextStringItem testPolicyContextItem000) { - this.testPolicyContextItem000 = testPolicyContextItem000; - } - - /** - * Gets the test policy context item 001. - * - * @return the test policy context item 001 - */ - public TestContextLongItem getTestPolicyContextItem001() { - return testPolicyContextItem001; - } - - /** - * Sets the test policy context item 001. - * - * @param testPolicyContextItem001 the test policy context item 001 - */ - public void setTestPolicyContextItem001(final TestContextLongItem testPolicyContextItem001) { - this.testPolicyContextItem001 = testPolicyContextItem001; - } - - /** - * Gets the test policy context item 002. - * - * @return the test policy context item 002 - */ - public TestContextDoubleItem getTestPolicyContextItem002() { - return testPolicyContextItem002; - } - - /** - * Sets the test policy context item 002. - * - * @param testPolicyContextItem002 the test policy context item 002 - */ - public void setTestPolicyContextItem002(final TestContextDoubleItem testPolicyContextItem002) { - this.testPolicyContextItem002 = testPolicyContextItem002; - } - - /** - * Gets the test policy context item 003. - * - * @return the test policy context item 003 - */ - public TestContextBooleanItem getTestPolicyContextItem003() { - return testPolicyContextItem003; - } - - /** - * Sets the test policy context item 003. - * - * @param testPolicyContextItem003 the test policy context item 003 - */ - public void setTestPolicyContextItem003(final TestContextBooleanItem testPolicyContextItem003) { - this.testPolicyContextItem003 = testPolicyContextItem003; - } - - /** - * Gets the test policy context item 004. - * - * @return the test policy context item 004 - */ - public TestContextLongItem getTestPolicyContextItem004() { - return testPolicyContextItem004; - } - - /** - * Sets the test policy context item 004. - * - * @param testPolicyContextItem004 the test policy context item 004 - */ - public void setTestPolicyContextItem004(final TestContextLongItem testPolicyContextItem004) { - this.testPolicyContextItem004 = testPolicyContextItem004; - } - - /** - * Gets the test policy context item 005. - * - * @return the test policy context item 005 - */ - public TestContextTreeMapItem getTestPolicyContextItem005() { - return testPolicyContextItem005; - } - - /** - * Sets the test policy context item 005. - * - * @param testPolicyContextItem005 the test policy context item 005 - */ - public void setTestPolicyContextItem005(final TestContextTreeMapItem testPolicyContextItem005) { - this.testPolicyContextItem005 = testPolicyContextItem005; - } - - /** - * {@inheritDoc}. - */ - @Override - public int hashCode() { - final int prime = HASH_PRIME_1; - int result = 1; - result = prime * result + ((testPolicyContextItem000 == null) ? 0 : testPolicyContextItem000.hashCode()); - result = prime * result + ((testPolicyContextItem001 == null) ? 0 : testPolicyContextItem001.hashCode()); - result = prime * result + ((testPolicyContextItem002 == null) ? 0 : testPolicyContextItem002.hashCode()); - result = prime * result + ((testPolicyContextItem003 == null) ? 0 : testPolicyContextItem003.hashCode()); - result = prime * result + ((testPolicyContextItem004 == null) ? 0 : testPolicyContextItem004.hashCode()); - result = prime * result + ((testPolicyContextItem005 == null) ? 0 : testPolicyContextItem005.hashCode()); - return result; - } - - /** - * {@inheritDoc}. - */ - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final TestPolicyContextItem other = (TestPolicyContextItem) obj; - if (testPolicyContextItem000 == null) { - if (other.testPolicyContextItem000 != null) { - return false; - } - } else if (!testPolicyContextItem000.equals(other.testPolicyContextItem000)) { - return false; - } - if (testPolicyContextItem001 == null) { - if (other.testPolicyContextItem001 != null) { - return false; - } - } else if (!testPolicyContextItem001.equals(other.testPolicyContextItem001)) { - return false; - } - if (testPolicyContextItem002 == null) { - if (other.testPolicyContextItem002 != null) { - return false; - } - } else if (!testPolicyContextItem002.equals(other.testPolicyContextItem002)) { - return false; - } - if (testPolicyContextItem003 == null) { - if (other.testPolicyContextItem003 != null) { - return false; - } - } else if (!testPolicyContextItem003.equals(other.testPolicyContextItem003)) { - return false; - } - if (testPolicyContextItem004 == null) { - if (other.testPolicyContextItem004 != null) { - return false; - } - } else if (!testPolicyContextItem004.equals(other.testPolicyContextItem004)) { - return false; - } - if (testPolicyContextItem005 == null) { - if (other.testPolicyContextItem005 != null) { - return false; - } - } else if (!testPolicyContextItem005.equals(other.testPolicyContextItem005)) { - return false; - } - return true; - } - - /** - * {@inheritDoc}. - */ - @Override - public String toString() { - return "TestPolicyContextItem [testPolicyContextItem000=" + testPolicyContextItem000 - + ", testPolicyContextItem001=" + testPolicyContextItem001 + ", testPolicyContextItem002=" - + testPolicyContextItem002 + ", testPolicyContextItem003=" + testPolicyContextItem003 - + ", testPolicyContextItem004=" + testPolicyContextItem004 + ", testPolicyContextItem005=" - + testPolicyContextItem005 + "]"; - } } diff --git a/testsuites/integration/integration-common/src/main/resources/examples/models/JMS/JMSTestModel.json b/testsuites/integration/integration-common/src/main/resources/examples/models/JMS/JMSTestModel.json index 02365bcdb..78c8110b9 100644 --- a/testsuites/integration/integration-common/src/main/resources/examples/models/JMS/JMSTestModel.json +++ b/testsuites/integration/integration-common/src/main/resources/examples/models/JMS/JMSTestModel.json @@ -342,7 +342,7 @@ "taskLogic": { "key": "TaskLogic", "logicFlavour": "JAVASCRIPT", - "logic": "var outFieldType = Java.type(\"org.onap.policy.apex.testsuites.integration.common.testclasses.PingTestClass\");\nvar outValue = new outFieldType();\n\nvar inValue = executor.inFields.get(\"PingTestClass\");\n\nexecutor.logger.info(inValue);\n\noutValue.setPingTime(inValue.getPingTime());\noutValue.setPongTime(new Date().getTime());\noutValue.setName(inValue.getName() + \"_out\");\n\noutValue.setDescription(\ninValue.getDescription() +\n\". So Romeo would, were he not Romeo call'd,\" +\n\" retain that dear perfection which he owes, without that title.\");\n\nexecutor.logger.info(outValue);\nexecutor.outFields.put(\"PingTestClass\", outValue)\n\nvar returnValueType = Java.type(\"java.lang.Boolean\");\nvar returnValue = new returnValueType(true);" + "logic": "var outFieldType = Java.type(\"org.onap.policy.apex.testsuites.integration.common.testclasses.PingTestClass\");\nvar outValue = new outFieldType();\n\nvar inValue = executor.inFields.get(\"PingTestClass\");\n\nexecutor.logger.info(inValue.toString());\n\noutValue.setPingTime(inValue.getPingTime());\noutValue.setPongTime(new Date().getTime());\noutValue.setName(inValue.getName() + \"_out\");\n\noutValue.setDescription(\ninValue.getDescription() +\n\". So Romeo would, were he not Romeo call'd,\" +\n\" retain that dear perfection which he owes, without that title.\");\n\nexecutor.logger.info(outValue.toString();\nexecutor.outFields.put(\"PingTestClass\", outValue)\n\nvar returnValueType = Java.type(\"java.lang.Boolean\");\nvar returnValue = new returnValueType(true);" } } } diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultStateLogic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultStateLogic.javascript index e25cb9c6e..a3f1525d0 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultStateLogic.javascript +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultStateLogic.javascript @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,10 +19,10 @@ * ============LICENSE_END========================================================= */ -executor.logger.debug(executor.subject.id); +executor.logger.debug(executor.subject.getId()); var gc = executor.getContextAlbum("GlobalContextAlbum"); -executor.logger.debug(gc.name); -executor.subject.defaultTaskKey.copyTo(executor.selectedTask) +executor.logger.debug(gc.getName()); +executor.getSubject().getDefaultTaskKey().copyTo(executor.selectedTask); var returnValue = executor.isTrue; diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript index 158e49eea..36fd2c4a2 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/DefaultTaskLogic.javascript @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,15 +19,15 @@ * ============LICENSE_END========================================================= */ -executor.logger.debug(executor.subject.id); +executor.logger.debug(executor.subject.getId()); var gc = executor.getContextAlbum("GlobalContextAlbum"); -executor.logger.debug(gc.name); -executor.logger.debug(executor.inFields); +executor.logger.debug(gc.getName()); +executor.logger.debug(executor.inFields.get("TestSlogan")); var caseSelectedType = Java.type("java.lang.Byte"); executor.outFields.put("Test<STATE_NAME>CaseSelected", new caseSelectedType(<RANDOM_BYTE_VALUE>)); executor.outFields.put("Test<STATE_NAME>StateTime", java.lang.System.nanoTime()); -executor.logger.debug(executor.eo); +executor.logger.debug(executor.inFields.get("TestSlogan")); var returnValue = executor.isTrue; diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalStateLogic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalStateLogic.javascript index 535cad595..5ee2a0448 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalStateLogic.javascript +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalStateLogic.javascript @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +19,7 @@ * ============LICENSE_END========================================================= */ -executor.logger.debug(executor.subject.id); +executor.logger.debug(executor.subject.getId()); executor.subject.defaultTaskKey.copyTo(executor.selectedTask); var returnValue = executor.isTrue; diff --git a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript index efbe5cb4d..b29e96fcf 100644 --- a/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript +++ b/testsuites/integration/integration-common/src/main/resources/org/onap/policy/apex/testsuites/integration/common/model/javascript/EvalTaskLogic.javascript @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,10 +19,10 @@ * ============LICENSE_END========================================================= */ -executor.logger.debug(executor.subject.id); -executor.logger.debug(executor.inFields); +executor.logger.debug(executor.subject.getId()); +executor.logger.debug(executor.inFields.get("name")); executor.outFields.put("State<STATE_NUMBER>Timestamp", java.lang.System.nanoTime()); -executor.logger.debug(executor.outFields); +executor.logger.debug(executor.outFields.get("name")); var returnValue = executor.isTrue; |