Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove legacy certificate handling
[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / distribution / engine / DmaapClientFactory.java
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java
index 4fb4122..593bf51 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/distribution/engine/DmaapClientFactory.java
@@ -7,9 +7,9 @@
  * 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,33 +17,33 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.components.distribution.engine;
 
 import com.att.nsa.mr.client.MRBatchingPublisher;
 import com.att.nsa.mr.client.MRClientFactory;
 import com.att.nsa.mr.client.MRConsumer;
 import fj.data.Either;
+import java.io.File;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.Properties;
 import org.onap.sdc.security.SecurityUtil;
 import org.openecomp.sdc.be.config.DmaapConsumerConfiguration;
 import org.openecomp.sdc.be.config.DmaapProducerConfiguration;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.util.Properties;
-
 /**
  * Allows to create DMAAP client of type MRConsumer according received configuration parameters
  */
 @Component("dmaapClientFactory")
 public class DmaapClientFactory {
+
     private static final Logger logger = Logger.getLogger(DmaapClientFactory.class.getName());
 
     /**
      * Creates DMAAP consumer according to received parameters
+     *
      * @param parameters
      * @return an instance object of type MRConsumer
      * @throws IOException
@@ -53,9 +53,10 @@ public class DmaapClientFactory {
         logger.info("MRConsumer created for topic {}", parameters.getTopic());
         return consumer;
     }
-    
+
     /**
      * Creates DMAAP consumer according to received parameters
+     *
      * @param parameters
      * @return an instance object of type MRConsumer
      * @throws IOException
@@ -69,8 +70,8 @@ public class DmaapClientFactory {
 
     private Properties buildProperties(DmaapConsumerConfiguration parameters) throws GeneralSecurityException, IOException {
         Properties props = new Properties();
-        Either<String,String> passkey = SecurityUtil.INSTANCE.decrypt(parameters.getCredential().getPassword() );
-        if (passkey.isRight()){
+        Either<String, String> passkey = SecurityUtil.decrypt(parameters.getCredential().getPassword());
+        if (passkey.isRight()) {
             throw new GeneralSecurityException("invalid password, cannot build properties");
         }
         props.setProperty("Latitude", Double.toString(parameters.getLatitude()));
@@ -79,34 +80,28 @@ public class DmaapClientFactory {
         props.setProperty("ServiceName", parameters.getServiceName());
         props.setProperty("Environment", parameters.getEnvironment());
         props.setProperty("Partner", parameters.getPartner());
-        props.setProperty("routeOffer", parameters.getRouteOffer());        
-        props.setProperty("Protocol", parameters.getProtocol());        
+        props.setProperty("routeOffer", parameters.getRouteOffer());
+        props.setProperty("Protocol", parameters.getProtocol());
         props.setProperty("username", parameters.getCredential().getUsername());
-        props.setProperty("password", passkey.left().value() );
-        props.setProperty("contenttype", parameters.getContenttype());        
+        props.setProperty("password", passkey.left().value());
+        props.setProperty("contenttype", parameters.getContenttype());
         props.setProperty("host", parameters.getHosts());
         props.setProperty("topic", parameters.getTopic());
         props.setProperty("group", parameters.getConsumerGroup());
         props.setProperty("id", parameters.getConsumerId());
         props.setProperty("timeout", Integer.toString(parameters.getTimeoutMs()));
-        props.setProperty("limit", Integer.toString(parameters.getLimit()));        
+        props.setProperty("limit", Integer.toString(parameters.getLimit()));
         props.setProperty("AFT_DME2_REQ_TRACE_ON", Boolean.toString(parameters.isDme2TraceOn()));
         props.setProperty("AFT_ENVIRONMENT", parameters.getAftEnvironment());
         props.setProperty("AFT_DME2_EP_CONN_TIMEOUT", Integer.toString(parameters.getAftDme2ConnectionTimeoutMs()));
         props.setProperty("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", Integer.toString(parameters.getAftDme2RoundtripTimeoutMs()));
         props.setProperty("AFT_DME2_EP_READ_TIMEOUT_MS", Integer.toString(parameters.getAftDme2ReadTimeoutMs()));
-
         props.setProperty("AFT_DME2_SSL_ENABLE", Boolean.toString(parameters.isAftDme2SslEnable()));
         props.setProperty("AFT_DME2_CLIENT_IGNORE_SSL_CONFIG", Boolean.toString(parameters.isAftDme2ClientIgnoreSslConfig()));
-        props.setProperty("AFT_DME2_CLIENT_KEYSTORE", parameters.getAftDme2ClientKeystore());
-        props.setProperty("AFT_DME2_CLIENT_KEYSTORE_PASSWORD", parameters.getAftDme2ClientKeystorePassword());
         props.setProperty("AFT_DME2_CLIENT_SSL_CERT_ALIAS", parameters.getAftDme2ClientSslCertAlias());
-
-        
         String dme2PreferredRouterFilePath = parameters.getDme2preferredRouterFilePath();
         ensureFileExists(dme2PreferredRouterFilePath);
         props.setProperty("DME2preferredRouterFilePath", dme2PreferredRouterFilePath);
-        
         props.setProperty("TransportType", "DME2");
         props.setProperty("SubContextPath", "/");
         props.setProperty("MethodType", "GET");
@@ -116,15 +111,14 @@ public class DmaapClientFactory {
         props.setProperty("AFT_DME2_EXCHANGE_REQUEST_HANDLERS", "");
         props.setProperty("AFT_DME2_EXCHANGE_REPLY_HANDLERS", "");
         props.setProperty("sessionstickinessrequired", "no");
-
         return props;
     }
 
-    private Properties buildProducerProperties(DmaapProducerConfiguration parameters) throws GeneralSecurityException, IOException { 
+    private Properties buildProducerProperties(DmaapProducerConfiguration parameters) throws GeneralSecurityException, IOException {
         logger.info("The DmaapProducerConfiguration is {} ", parameters);
         Properties props = new Properties();
-        Either<String,String> passkey = SecurityUtil.INSTANCE.decrypt(parameters.getCredential().getPassword() );
-        if (passkey.isRight()){
+        Either<String, String> passkey = SecurityUtil.decrypt(parameters.getCredential().getPassword());
+        if (passkey.isRight()) {
             throw new GeneralSecurityException("invalid password, cannot build properties");
         }
         props.setProperty("Latitude", Double.toString(parameters.getLatitude()));
@@ -136,7 +130,7 @@ public class DmaapClientFactory {
         props.setProperty("routeOffer", parameters.getRouteOffer());
         props.setProperty("Protocol", parameters.getProtocol());
         props.setProperty("username", parameters.getCredential().getUsername());
-        props.setProperty("password", passkey.left().value() );
+        props.setProperty("password", passkey.left().value());
         props.setProperty("contenttype", parameters.getContenttype());
         props.setProperty("host", parameters.getHosts());
         props.setProperty("topic", parameters.getTopic());
@@ -147,13 +141,9 @@ public class DmaapClientFactory {
         props.setProperty("AFT_DME2_EP_CONN_TIMEOUT", Integer.toString(parameters.getAftDme2ConnectionTimeoutMs()));
         props.setProperty("AFT_DME2_ROUNDTRIP_TIMEOUT_MS", Integer.toString(parameters.getAftDme2RoundtripTimeoutMs()));
         props.setProperty("AFT_DME2_EP_READ_TIMEOUT_MS", Integer.toString(parameters.getAftDme2ReadTimeoutMs()));
-        
         props.setProperty("AFT_DME2_SSL_ENABLE", Boolean.toString(parameters.isAftDme2SslEnable()));
         props.setProperty("AFT_DME2_CLIENT_IGNORE_SSL_CONFIG", Boolean.toString(parameters.isAftDme2ClientIgnoreSslConfig()));
-        props.setProperty("AFT_DME2_CLIENT_KEYSTORE", parameters.getAftDme2ClientKeystore());
-        props.setProperty("AFT_DME2_CLIENT_KEYSTORE_PASSWORD", parameters.getAftDme2ClientKeystorePassword());
         props.setProperty("AFT_DME2_CLIENT_SSL_CERT_ALIAS", parameters.getAftDme2ClientSslCertAlias());
-
         String dme2PreferredRouterFilePath = parameters.getDme2preferredRouterFilePath();
         ensureFileExists(dme2PreferredRouterFilePath);
         props.setProperty("DME2preferredRouterFilePath", dme2PreferredRouterFilePath);
@@ -165,22 +155,19 @@ public class DmaapClientFactory {
         props.setProperty("AFT_DME2_EXCHANGE_REQUEST_HANDLERS", "");
         props.setProperty("AFT_DME2_EXCHANGE_REPLY_HANDLERS", "");
         props.setProperty("sessionstickinessrequired", "no");
-
-        props.setProperty("maxBatchSize","1");
-        props.setProperty("maxAgeMs","250");
-        props.setProperty("partition","1");
-        props.setProperty("MessageSentThreadOccurance","10");
-        props.setProperty("Authorization","Basic bTEzMzMxQGNjZC5hdHQuY29tOkFhMTIzNDU2");
-
+        props.setProperty("maxBatchSize", "1");
+        props.setProperty("maxAgeMs", "250");
+        props.setProperty("partition", "1");
+        props.setProperty("MessageSentThreadOccurance", "10");
+        props.setProperty("Authorization", "Basic bTEzMzMxQGNjZC5hdHQuY29tOkFhMTIzNDU2");
         return props;
     }
 
     private void ensureFileExists(String filePath) throws IOException {
         File file = new File(filePath);
-        if(file.createNewFile()) {
+        if (file.createNewFile()) {
             logger.info("The file {} has been created on the disk", file.getAbsolutePath());
-        }
-        else{
+        } else {
             logger.info("The file {} already exists", file.getAbsolutePath());
         }
     }
SDC Parent Project Catalog FE and BE