*/
package org.onap.dcaegen2.services.service;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Optional;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.client.ResponseHandler;
import org.onap.dcaegen2.services.utils.RequestVerbs;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.lang.NonNull;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Optional;
+
public class AAIExtendedHttpClientImpl implements AAIExtendedHttpClient {
Logger logger = LoggerFactory.getLogger(AAIExtendedHttpClientImpl.class);
private final String aaiProtocol;
private final Integer aaiHostPortNumber;
- @Autowired
+
public AAIExtendedHttpClientImpl (AAIHttpClientConfiguration aaiHttpClientConfiguration) {
final AAIHttpClient aaiHttpClient = new AAIHttpClientImpl(aaiHttpClientConfiguration);
closeableHttpClient = aaiHttpClient.getAAIHttpClient();
logger.error("Exception while executing HTTP request: {}", e);
}
- if (extendedDetails.isPresent()) {
- return extendedDetails;
- } else {
- return Optional.empty();
- }
+ return extendedDetails;
}
private URI createAAIExtendedURI(final String path, Map<String, String> queryParams) {
+
URI extendedURI = null;
final URIBuilder uriBuilder = new URIBuilder().setScheme(this.aaiProtocol).setHost(this.aaiHost)
}
try {
- logger.info("Building extended URI");
extendedURI = uriBuilder.build();
+ logger.info("Building extended URI: {}", extendedURI);
} catch (URISyntaxException e) {
logger.error("Exception while building extended URI: {}", e);
}
}
private Boolean isExtendedURINotNull(URI extendedURI) {
- return extendedURI != null ? true : false;
+ return extendedURI != null;
}
private Optional<StringEntity> createStringEntity(Optional<String> jsonBody) {
+++ /dev/null
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.dcaegen2.services.consumer;
-
-import java.util.Date;
-import org.onap.dcaegen2.services.response.DMaaPConsumerResponse;
-
-/**
- * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/17/18
- */
-public interface DMaaPConsumer extends AutoCloseable {
-
- DMaaPConsumerResponse fetchMessages();
-
- Date getSubscriberCreationTime();
-}
+++ /dev/null
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.dcaegen2.services.consumer;
-
-import org.onap.dcaegen2.services.config.DmaapConsumerConfiguration;
-
-/**
- * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/17/18
- */
-public interface DMaaPConsumerFactory {
-
- DMaaPConsumer create(DmaapConsumerConfiguration dmaapConsumerConfiguration);
-}
+++ /dev/null
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.dcaegen2.services.consumer;
-
-import java.net.URI;
-import java.time.Instant;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.onap.dcaegen2.services.config.DmaapConsumerConfiguration;
-import org.onap.dcaegen2.services.response.DMaaPConsumerResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 4/17/18
- */
-public class DMaaPConsumerImpl implements DMaaPConsumer {
-
- private static final Logger logger = LoggerFactory.getLogger(DMaaPConsumerImpl.class);
- private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
-
- private final DmaapConsumerConfiguration dmaapConsumerConfiguration;
- private final CloseableHttpClient closeableHttpClient;
- private final URI subscriberUri;
- private final Date subscriberCreationTime;
-
- public DMaaPConsumerImpl(DmaapConsumerConfiguration dmaapConsumerConfiguration,
- CloseableHttpClient closeableHttpClient, URI subscriberUri) {
- this.dmaapConsumerConfiguration = dmaapConsumerConfiguration;
- this.closeableHttpClient = closeableHttpClient;
- this.subscriberUri = subscriberUri;
- this.subscriberCreationTime = Date.from(Instant.from(LocalTime.now()));
- }
-
- @Override
- public DMaaPConsumerResponse fetchMessages() {
- return null;
- }
-
- @Override
- public Date getSubscriberCreationTime() {
- return null;
- }
-
- @Override
- public void close() throws Exception {
-
- }
-}
return httpClientBuilder.build();
}
-
}
private final String dmaapContentType;
- public ExtendedDmaapConsumerHttpClientImpl(DmaapConsumerConfiguration configuration) {
+ ExtendedDmaapConsumerHttpClientImpl(DmaapConsumerConfiguration configuration) {
this.closeableHttpClient = new DmaapHttpClientImpl(configuration).getHttpClient();
this.dmaapHostName = configuration.dmaapHostName();
this.dmaapProtocol = configuration.dmaapProtocol();
logger.error("Exception while executing HTTP request: {}", e);
}
- if (extendedDetails.isPresent()) {
- return extendedDetails;
- } else {
- return Optional.empty();
- }
+ return extendedDetails;
}
private static HttpRequestBase createHttpRequest(URI extendedURI) {
final URI extendedURI = createDmaapConsumerExtendedURI();
if ("application/json".equals(dmaapContentType)) {
- request = Optional.of(createHttpRequest(extendedURI));
+ request = Optional.ofNullable(createHttpRequest(extendedURI));
request.get().addHeader("Content-type", dmaapContentType);
}
.setPath(createRequestPath());
try {
- logger.info("Building extended URI");
extendedURI = uriBuilder.build();
+ logger.info("Building extended URI: {}", extendedURI);
} catch (URISyntaxException e) {
logger.error("Exception while building extended URI: {}", e);
}
this.dmaapContentType = configuration.dmaapContentType();
}
- public Optional<String> getHttpProducerResponse(DmaapPublisherRequestDetails requestDetails) {
+ Optional<String> getHttpProducerResponse(DmaapPublisherRequestDetails requestDetails) {
Optional<String> extendedDetails = Optional.empty();
Optional<HttpRequestBase> request = createRequest(requestDetails);
logger.error("Exception while executing HTTP request: {}", e);
}
- if (extendedDetails.isPresent()) {
- return extendedDetails;
- } else {
- return Optional.empty();
- }
+ return extendedDetails;
}
private Boolean isExtendedURINotNull(URI extendedURI) {
final URI extendedURI = createDmaapPublisherExtendedURI(requestDetails);
if ("application/json".equals(dmaapContentType)) {
- request = Optional.of(createRequest(extendedURI, requestDetails));
+ request = Optional.ofNullable(createRequest(extendedURI, requestDetails));
request.get().addHeader("Content-type", dmaapContentType);
}
.setPath(requestDetails.dmaapAPIPath() + "/" + dmaapTopicName);
try {
- logger.info("Building extended URI");
extendedURI = uriBuilder.build();
+ logger.info("Building extended URI: {}",extendedURI);
} catch (URISyntaxException e) {
logger.error("Exception while building extended URI: {}", e);
}
post.setEntity(stringEntity.get());
return post;
}
-
-
}
Code Review / dcaegen2 / services / prh.git / commitdiff