From 72a9ab9e886cdeabc4b43418a7054a5796a0ff55 Mon Sep 17 00:00:00 2001 From: sliard Date: Mon, 12 Apr 2021 15:58:22 +0200 Subject: [DMAAP-CLIENT] First sonar issues review part2 update Copyright informations fix checkstyle warning and fix code review comments remove Prop Issue-ID: DMAAP-1585 Change-Id: I445ca5d0888a555acbac70af7ed571be26d74f79 Signed-off-by: sliard --- .../org/onap/dmaap/mr/client/impl/MRConstants.java | 295 ++++++++++----------- 1 file changed, 145 insertions(+), 150 deletions(-) (limited to 'src/main/java/org/onap/dmaap/mr/client/impl/MRConstants.java') diff --git a/src/main/java/org/onap/dmaap/mr/client/impl/MRConstants.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRConstants.java index dbf6b4d..b05d839 100644 --- a/src/main/java/org/onap/dmaap/mr/client/impl/MRConstants.java +++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRConstants.java @@ -4,11 +4,13 @@ * ================================================================================ * Copyright © 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications Copyright © 2021 Orange. + * ================================================================================ * 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. @@ -17,162 +19,155 @@ * ============LICENSE_END========================================================= * * ECOMP is a trademark and service mark of AT&T Intellectual Property. - * + * *******************************************************************************/ + package org.onap.dmaap.mr.client.impl; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.List; - import org.apache.http.HttpHost; -class MRConstants -{ - private static final String PROTOCOL = "http"; - public static final String CONTEXT = "/"; - public static final String BASE_PATH = "events/"; - public static final int STD_MR_SERVICE_PORT = 8080; - - public static String escape ( String s ) - { - try - { - return URLEncoder.encode ( s, "UTF-8"); - } - catch ( UnsupportedEncodingException e ) - { - throw new IllegalArgumentException(e); - } - } - - public static String makeUrl ( String rawTopic ) - { - final String cleanTopic = escape ( rawTopic ); - - final StringBuffer url = new StringBuffer(). - append ( MRConstants.CONTEXT). - append ( MRConstants.BASE_PATH). - append ( cleanTopic ); - return url.toString (); - } - - public static String makeUrl ( final String host, final String rawTopic ) - { - final String cleanTopic = escape ( rawTopic ); - final StringBuffer url = new StringBuffer(); - - if (!host.startsWith("http") && !host.startsWith("https") ) { - url.append( PROTOCOL + "://" ); - } - url.append(host); - url.append ( MRConstants.CONTEXT); - url.append ( MRConstants.BASE_PATH); - url.append ( cleanTopic ); - return url.toString (); - } - - public static String makeUrl ( final String host, final String rawTopic, final String transferprotocol,final String parttion ) - { - final String cleanTopic = escape ( rawTopic ); - - final StringBuffer url = new StringBuffer(); - - if (transferprotocol !=null && !transferprotocol.equals("")) { - url.append( transferprotocol + "://" ); - }else{ - url.append( PROTOCOL + "://" ); - } - url.append(host); - url.append ( MRConstants.CONTEXT); - url.append ( MRConstants.BASE_PATH); - url.append ( cleanTopic ); - if(parttion!=null && !parttion.equalsIgnoreCase("")) - url.append("?partitionKey=").append(parttion); - return url.toString (); - } - public static String makeConsumerUrl ( String topic, String rawConsumerGroup, String rawConsumerId ) - { - final String cleanConsumerGroup = escape ( rawConsumerGroup ); - final String cleanConsumerId = escape ( rawConsumerId ); - return MRConstants.CONTEXT + MRConstants.BASE_PATH + topic + "/" + cleanConsumerGroup + "/" + cleanConsumerId; - } - - /** - * Create a list of HttpHosts from an input list of strings. Input strings have - * host[:port] as format. If the port section is not provided, the default port is used. - * - * @param hosts - * @return a list of hosts - */ - public static List createHostsList(Collection hosts) - { - final ArrayList convertedHosts = new ArrayList<> (); - for ( String host : hosts ) - { - if ( host.length () == 0 ) continue; - convertedHosts.add ( hostForString ( host ) ); - } - return convertedHosts; - } - - /** - * Return an HttpHost from an input string. Input string has - * host[:port] as format. If the port section is not provided, the default port is used. - * - * @param host - * @return a list of hosts - */ - public static HttpHost hostForString ( String host ) - { - if ( host.length() < 1 ) throw new IllegalArgumentException ( "An empty host entry is invalid." ); - - String hostPart = host; - int port = STD_MR_SERVICE_PORT; - - final int colon = host.indexOf ( ':' ); - if ( colon == 0 ) throw new IllegalArgumentException ( "Host entry '" + host + "' is invalid." ); - if ( colon > 0 ) - { - hostPart = host.substring ( 0, colon ).trim(); - - final String portPart = host.substring ( colon + 1 ).trim(); - if ( portPart.length () > 0 ) - { - try - { - port = Integer.parseInt ( portPart ); - } - catch ( NumberFormatException x ) - { - throw new IllegalArgumentException ( "Host entry '" + host + "' is invalid.", x ); - } - } - // else: use default port on "foo:" - } - - return new HttpHost ( hostPart, port ); - } - - public static String makeConsumerUrl(String host, String fTopic, String fGroup, String fId,final String transferprotocol) { - final String cleanConsumerGroup = escape ( fGroup ); - final String cleanConsumerId = escape ( fId ); - - StringBuffer url = new StringBuffer(); - - if (transferprotocol !=null && !transferprotocol.equals("")) { - url.append( transferprotocol + "://" ); - }else{ - url.append( PROTOCOL + "://" ); - } - - url.append(host); - url.append(CONTEXT); - url.append(BASE_PATH); - url.append(fTopic + "/" + cleanConsumerGroup + "/" + cleanConsumerId); - - return url.toString(); - } +class MRConstants { + + private MRConstants() { + + } + + private static final String PROTOCOL = "http"; + public static final String CONTEXT = "/"; + public static final String BASE_PATH = "events/"; + public static final int STD_MR_SERVICE_PORT = 8080; + + public static String escape(String url) { + return URLEncoder.encode(url, StandardCharsets.UTF_8); + } + + public static String makeUrl(String rawTopic) { + final String cleanTopic = escape(rawTopic); + + return new StringBuilder() + .append(MRConstants.CONTEXT) + .append(MRConstants.BASE_PATH) + .append(cleanTopic).toString(); + } + + public static String makeUrl(final String host, final String rawTopic) { + final String cleanTopic = escape(rawTopic); + final StringBuilder url = new StringBuilder(); + + if (!host.startsWith("http") && !host.startsWith("https")) { + url.append(PROTOCOL).append("://"); + } + url.append(host); + url.append(MRConstants.CONTEXT); + url.append(MRConstants.BASE_PATH); + url.append(cleanTopic); + return url.toString(); + } + + public static String makeUrl(final String host, final String rawTopic, final String transferProtocol, final String partition) { + final String cleanTopic = escape(rawTopic); + + final StringBuilder url = new StringBuilder(); + + if (transferProtocol != null && !transferProtocol.isEmpty()) { + url.append(transferProtocol).append("://"); + } else { + url.append(PROTOCOL).append("://"); + } + url.append(host); + url.append(MRConstants.CONTEXT); + url.append(MRConstants.BASE_PATH); + url.append(cleanTopic); + if (partition != null && !partition.isEmpty()) { + url.append("?partitionKey=").append(partition); + } + return url.toString(); + } + + public static String makeConsumerUrl(String topic, String rawConsumerGroup, String rawConsumerId) { + final String cleanConsumerGroup = escape(rawConsumerGroup); + final String cleanConsumerId = escape(rawConsumerId); + return MRConstants.CONTEXT + MRConstants.BASE_PATH + topic + "/" + cleanConsumerGroup + "/" + cleanConsumerId; + } + + /** + * Create a list of HttpHosts from an input list of strings. Input strings have + * host[:port] as format. If the port section is not provided, the default port is used. + * + * @param hosts + * @return a list of hosts + */ + public static List createHostsList(Collection hosts) { + final ArrayList convertedHosts = new ArrayList<>(); + for (String host : hosts) { + if (host.length() == 0) { + continue; + } + convertedHosts.add(hostForString(host)); + } + return convertedHosts; + } + + /** + * Return an HttpHost from an input string. Input string has + * host[:port] as format. If the port section is not provided, the default port is used. + * + * @param host + * @return a list of hosts + */ + public static HttpHost hostForString(String host) { + if (host.length() < 1) { + throw new IllegalArgumentException("An empty host entry is invalid."); + } + + String hostPart = host; + int port = STD_MR_SERVICE_PORT; + + final int colon = host.indexOf(':'); + if (colon == 0) { + throw new IllegalArgumentException("Host entry '" + host + "' is invalid."); + } + if (colon > 0) { + hostPart = host.substring(0, colon).trim(); + + final String portPart = host.substring(colon + 1).trim(); + if (portPart.length() > 0) { + try { + port = Integer.parseInt(portPart); + } catch (NumberFormatException x) { + throw new IllegalArgumentException("Host entry '" + host + "' is invalid.", x); + } + } + // else: use default port on "foo:" + } + + return new HttpHost(hostPart, port); + } + + public static String makeConsumerUrl(String host, String topic, String group, String id, final String transferprotocol) { + final String cleanConsumerGroup = escape(group); + final String cleanConsumerId = escape(id); + + StringBuilder url = new StringBuilder(); + + if (transferprotocol != null && !transferprotocol.equals("")) { + url.append(transferprotocol).append("://"); + } else { + url.append(PROTOCOL).append("://"); + } + + url.append(host) + .append(CONTEXT) + .append(BASE_PATH) + .append(topic) + .append("/").append(cleanConsumerGroup) + .append("/").append(cleanConsumerId); + + return url.toString(); + } } -- cgit 1.2.3-korg