summaryrefslogtreecommitdiffstats
path: root/message-router
diff options
context:
space:
mode:
authorBrinda Santh Muthuramalingam <brindasanth@in.ibm.com>2019-07-29 13:24:29 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-29 13:24:29 +0000
commit3983595bd814f72f16376f97897a878eb07d02bd (patch)
tree0d01db1a8139e38e0aa68adb31a3b59f20d1e090 /message-router
parent14ac5fee71b9df3fc2eafba6ddb2bd7808c27fd7 (diff)
parent549db7db2b38e6a95ec4cc39b0f52fe699e07913 (diff)
Merge "CCSDK-1551 -Move this constructor to comply with Java Code Conventions"
Diffstat (limited to 'message-router')
-rwxr-xr-xmessage-router/consumer/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/consumer/provider/impl/ConsumerFactory.java64
1 files changed, 43 insertions, 21 deletions
diff --git a/message-router/consumer/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/consumer/provider/impl/ConsumerFactory.java b/message-router/consumer/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/consumer/provider/impl/ConsumerFactory.java
index 051380e1a..0802bec2f 100755
--- a/message-router/consumer/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/consumer/provider/impl/ConsumerFactory.java
+++ b/message-router/consumer/provider/src/main/java/org/onap/ccsdk/sli/adaptors/messagerouter/consumer/provider/impl/ConsumerFactory.java
@@ -1,3 +1,25 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 - 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.consumer.provider.impl;
import java.io.UnsupportedEncodingException;
@@ -34,7 +56,27 @@ public class ConsumerFactory {
private Integer timeoutQueryParamValue;
private String filter;
protected String auth;
-
+
+ public ConsumerFactory(Properties properties) {
+ // Required properties
+ username = properties.getProperty("username");
+ password = properties.getProperty("password");
+ host = properties.getProperty("host");
+ auth = properties.getProperty("auth");
+ group = properties.getProperty("group");
+ id = properties.getProperty("id");
+
+ // Optional properties
+ connectTimeout = readOptionalInteger(properties, "connectTimeoutSeconds");
+ readTimeout = readOptionalInteger(properties, "readTimeoutMinutes");
+ fetchPause = readOptionalInteger(properties, "fetchPause");
+ limit = readOptionalInteger(properties, "limit");
+ timeoutQueryParamValue = readOptionalInteger(properties, "timeout");
+ processFilter(properties.getProperty("filter"));
+
+ setDefaults();
+ }
+
public String getAuth() {
return auth;
}
@@ -100,26 +142,6 @@ public class ConsumerFactory {
setDefaults();
}
- public ConsumerFactory(Properties properties) {
- // Required properties
- username = properties.getProperty("username");
- password = properties.getProperty("password");
- host = properties.getProperty("host");
- auth = properties.getProperty("auth");
- group = properties.getProperty("group");
- id = properties.getProperty("id");
-
- // Optional properties
- connectTimeout = readOptionalInteger(properties, "connectTimeoutSeconds");
- readTimeout = readOptionalInteger(properties, "readTimeoutMinutes");
- fetchPause = readOptionalInteger(properties, "fetchPause");
- limit = readOptionalInteger(properties, "limit");
- timeoutQueryParamValue = readOptionalInteger(properties, "timeout");
- processFilter(properties.getProperty("filter"));
-
- setDefaults();
- }
-
private Integer readOptionalInteger(Properties properties, String propertyName) {
String stringValue = properties.getProperty(propertyName);
if (stringValue != null && stringValue.length() > 0) {