* org.onap.dmaap
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2019 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
public List<DR_Sub> getAllDr_Subs() {
logger.debug( "enter getAllDR_Subs()");
- return new ArrayList<DR_Sub>(dr_subs.values());
+ return new ArrayList<>(dr_subs.values());
}
public ArrayList<DR_Sub> getDr_SubsByFeedId( String pubId ) {
- ArrayList<DR_Sub> someSubs = new ArrayList<DR_Sub>();
+ ArrayList<DR_Sub> someSubs = new ArrayList<>();
for( DR_Sub sub : dr_subs.values() ) {
if ( pubId.equals( sub.getFeedId() )) {
someSubs.add( sub );
prov = new DrProvConnection();
prov.makeSubPostConnection( provURL );
String resp = prov.doPostDr_Sub( sub, apiError );
- if ( unit_test.equals( "Yes" ) ) {
+ if ( "Yes".equals(unit_test) ) {
resp = simulateResp( sub, "POST" );
+ apiError.setCode(200);
}
logger.debug( "addDr_Sub resp=" + resp );
DrProvConnection prov = new DrProvConnection();
prov.makeSubPutConnection( obj.getSubId() );
String resp = prov.doPutDr_Sub( obj, apiError );
+ if ( unit_test.equals( "Yes" ) ) {
+ resp = simulateResp( obj, "PUT" );
+ apiError.setCode(200);
+ }
logger.debug( "resp=" + resp );
DR_Sub snew = null;
public void removeDr_Sub( String key, ApiError apiError ) {
logger.debug( "enter removeDR_Subs()");
+
DR_Sub sub = dr_subs.get( key );
if ( sub == null ) {
apiError.setCode(Status.NOT_FOUND.getStatusCode());
apiError.setFields( "subId");
apiError.setMessage("subId " + key + " not found");
} else {
- dr_subs.remove(key);
- apiError.setCode(200);
+ DrProvConnection prov = new DrProvConnection();
+ prov.makeSubPutConnection( key );
+ String resp = prov.doDeleteDr_Sub( sub, apiError );
+ logger.debug( "resp=" + resp );
+
+ if ( apiError.is2xx() || unit_test.equals( "Yes" ) ) {
+ dr_subs.remove(key);
+ }
}
return;
} else {
subid = "99";
}
- String ret = String.format("{\"delivery\": {\"url\": \"https://%s/delivery/%s\", \"user\": \"joe\", \"password\": \"secret\", \"use100\": true}, \"metadataOnly\": false, \"groupid\": \"0\" , \"follow_redirect\": true }",
- server, subid );
+ String ret = String.format("{\"suspend\": false, \"delivery\": {\"url\": \"https://%s/delivery/%s\", \"user\": \"%s\", \"password\": \"%s\", \"use100\": true}, \"metadataOnly\": false, \"groupid\": \"0\" , \"follow_redirect\": true, ",
+ server, subid, sub.getUsername(), sub.getUserpwd());
+ String links = String.format( "\"links\": {\"feed\": \"https://dr-prov/feedlog/%s\", \"self\": \"https://dr-prov/sub/%s\", \"log\": \"https://dr-prov/sublog/%s\" }",
+ sub.getFeedId(),
+ sub.getSubId(),
+ sub.getSubId() );
+ ret += links + "}";
+ logger.info( "DR_SubService:simulateResp=" + ret);
return ret;
}