summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/dmaap/dbcapi/model/DR_Sub.java16
-rw-r--r--src/main/resources/schema_12.sql2
-rw-r--r--src/test/java/org/onap/dmaap/dbcapi/model/DRSubTest.java6
3 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/org/onap/dmaap/dbcapi/model/DR_Sub.java b/src/main/java/org/onap/dmaap/dbcapi/model/DR_Sub.java
index 8ac0880..90da956 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/model/DR_Sub.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/model/DR_Sub.java
@@ -45,7 +45,7 @@ public class DR_Sub extends DmaapObject {
private boolean guaranteedDelivery;
private boolean guaranteedSequence;
private boolean privilegedSubscriber;
- private boolean decompressData;
+ private boolean decompress;
// NOTE: the following fields are optional in the API but not stored in the DB
@@ -116,9 +116,9 @@ public class DR_Sub extends DmaapObject {
this.setPrivilegedSubscriber(false);
}
try {
- this.setDecompressData((boolean) jsonObj.get("decompressData"));
+ this.setDecompress((boolean) jsonObj.get("decompress"));
} catch( NullPointerException npe ) {
- this.setDecompressData(false);
+ this.setDecompress(false);
}
JSONObject del = (JSONObject) jsonObj.get("delivery");
@@ -239,12 +239,12 @@ public class DR_Sub extends DmaapObject {
this.privilegedSubscriber = privilegedSubscriber;
}
- public boolean isDecompressData() {
- return decompressData;
+ public boolean isDecompress() {
+ return decompress;
}
- public void setDecompressData(boolean decompressData) {
- this.decompressData = decompressData;
+ public void setDecompress(boolean decompressData) {
+ this.decompress = decompressData;
}
public String getFeedName() {
@@ -286,7 +286,7 @@ public class DR_Sub extends DmaapObject {
,"0"
,"true"
,this.isPrivilegedSubscriber()
- ,this.isDecompressData()
+ ,this.isDecompress()
);
logger.info( postJSON );
diff --git a/src/main/resources/schema_12.sql b/src/main/resources/schema_12.sql
index 22f0559..c4cef5f 100644
--- a/src/main/resources/schema_12.sql
+++ b/src/main/resources/schema_12.sql
@@ -24,7 +24,7 @@
add column guaranteed_delivery boolean,
add column guaranteed_sequence boolean,
add column privileged_subscriber boolean,
- add column decompress_data boolean
+ add column decompress boolean
;
diff --git a/src/test/java/org/onap/dmaap/dbcapi/model/DRSubTest.java b/src/test/java/org/onap/dmaap/dbcapi/model/DRSubTest.java
index 59a4023..95cf9c9 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/model/DRSubTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/model/DRSubTest.java
@@ -69,7 +69,7 @@ public class DRSubTest {
assertTrue( t.isGuaranteedDelivery() == false );
assertTrue( t.isGuaranteedSequence() == false );
assertTrue( t.isPrivilegedSubscriber() == false );
- assertTrue( t.isDecompressData() == false );
+ assertTrue( t.isDecompress() == false );
}
@Test
@@ -113,8 +113,8 @@ public class DRSubTest {
assertTrue( t.isGuaranteedSequence() == v );
t.setPrivilegedSubscriber(v);
assertTrue( t.isPrivilegedSubscriber() == v );
- t.setDecompressData(v);
- assertTrue( t.isDecompressData() == v );
+ t.setDecompress(v);
+ assertTrue( t.isDecompress() == v );
}
@Test