diff options
3 files changed, 36 insertions, 12 deletions
diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java index 2aa5c5444..c57b3a45d 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIDeclarations.java @@ -2,10 +2,10 @@ * ============LICENSE_START======================================================= * openECOMP : SDN-C * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights + * Copyright (C) 2019 AT&T Intellectual Property. All rights * reserved. * ================================================================================ - * Modifications Copyright (C) 2018 IBM. + * 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. @@ -1618,7 +1618,7 @@ public abstract class AAIDeclarations implements AAIClient { } Class resourceClass = instance.getClass(); - Set<String> metadataKeys = new TreeSet<String>(); + Set<String> metadataKeys = new TreeSet<>(); Set<String> set = params.keySet(); for(String attribute : set) { if(attribute.startsWith("metadata")) { @@ -1636,7 +1636,6 @@ public abstract class AAIDeclarations implements AAIClient { try { obj = getMetadataMethod.invoke(instance); } catch (InvocationTargetException x) { - Throwable cause = x.getCause(); } } if(obj != null && obj instanceof Metadata){ diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java index 41290c07b..a683a93b8 100755 --- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java +++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIService.java @@ -1240,7 +1240,7 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe } - protected boolean deleteList(URL httpReqUrl, String json_text) throws AAIServiceException { + protected boolean deleteList(URL httpReqUrl, String jsonText) throws AAIServiceException { if(httpReqUrl == null) { throw new NullPointerException(); } @@ -1253,15 +1253,15 @@ public class AAIService extends AAIDeclarations implements AAIClient, SvcLogicRe // SSLSocketFactory sockFact = CTX.getSocketFactory(); // con.setSSLSocketFactory( sockFact ); - if (json_text != null) { + if (jsonText != null) { OutputStreamWriter osw = new OutputStreamWriter(con.getOutputStream()); - osw.write(json_text); + osw.write(jsonText); osw.flush(); osw.close(); } LOGwriteFirstTrace("DELETE", httpReqUrl.toString()); - LOGwriteDateTrace("data", json_text); + LOGwriteDateTrace("data", jsonText); // Check for errors int responseCode = con.getResponseCode(); diff --git a/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java b/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java index 25fc87ead..d1610305a 100755 --- a/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java +++ b/message-router/publisher/sample.client/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/publisher/client/impl/ClientImpl.java @@ -1,3 +1,26 @@ +/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ *
+ */
+
package org.onap.ccsdk.sli.adaptors.messagerouter.publisher.client.impl;
import org.onap.ccsdk.sli.adaptors.messagerouter.publisher.api.PublisherApi;
@@ -8,6 +31,10 @@ public class ClientImpl { private static final Logger logger = LoggerFactory.getLogger(ClientImpl.class);
private String topic;
private PublisherApi publisher;
+
+ public ClientImpl() {
+
+ }
public void setPublisher(PublisherApi publisherApi) {
this.publisher = publisherApi;
@@ -17,13 +44,11 @@ public class ClientImpl { this.topic = topic;
}
- public ClientImpl() {
-
- }
+
public void init() {
for (int i = 0; i < 5; i++) {
- String body = "{\"hello\":\"world " + String.valueOf(Math.random()) + "\"}";
+ String body = "{\"hello\":\"world " + Math.random() + "\"}";
logger.error("Loop iteration " + i + " sending body " + body + " to the topic " + topic);
Boolean result = publisher.publish(topic, body);
logger.error("Loop iteration " + i + " returned the boolean value " + result);
|