Used encapsulated system properties for AWS layer

opencharles · Aug 9, 2017 · eae1dc8 · eae1dc8
1 parent 90fd3e5
commit eae1dc8
Show file tree

Hide file tree

Showing 22 changed files with 482 additions and 178 deletions.
diff --git a/src/main/java/com/amihaiemil/charles/aws/AccessKeyId.java b/src/main/java/com/amihaiemil/charles/aws/AccessKeyId.java
@@ -32,5 +32,30 @@
  * @since 1.0.0
  */
 public interface AccessKeyId extends SystemProperty {
+
+    /**
+     * Actual name of the aws access key id sys prop.
+     */
+    String NAME = "aws.accessKeyId";
+
+    /**
+     * Fake for unit testing.
+     */
+    public static final class Fake implements AccessKeyId {
 
+        private String value;
+
+        public Fake() {
+            this("testAccessKeyId");
+        }
+
+        public Fake(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String read() {
+            return this.value;
+        }
+    }
 }
diff --git a/src/main/java/com/amihaiemil/charles/aws/AmazonEsRepository.java b/src/main/java/com/amihaiemil/charles/aws/AmazonEsRepository.java
@@ -63,12 +63,46 @@ public final class AmazonEsRepository implements AwsEsRepository {
      */
     private String indexName;
 
+    /**
+     * AWS access key.
+     */
+    private AccessKeyId accesskey;
+
+    /**
+     * Aws secret key;
+     */
+    private SecretKey secretKey;
+
+    /**
+     * Aws ES region.
+     */
+    private Region reg;
+
+    /**
+     * ElasticSearch URL.
+     */
+    private EsEndPoint esEdp;
+
     /**
      * ctor.
      * @param indexName Name of the Es index where the pages will be exported.
+     * @param accessKey Aws access key.
+     * @param secretKey Aws secret key.
+     * @param reg AWS ElasticSearch region.
+     * @param es ElasticSearch URL.
      */
-    public AmazonEsRepository(String indexName) {
+    public AmazonEsRepository(
+		final String indexName,
+		final AccessKeyId accesskey,
+        final SecretKey secretKey,
+        final Region reg,
+        final EsEndPoint es
+    ) {
         this.indexName = indexName;
+        this.accesskey = accesskey;
+        this.secretKey = secretKey;
+        this.reg = reg;
+        this.esEdp = es;
     }
 
     @Override
@@ -82,13 +116,17 @@ public void export(List<WebPage> pages) throws DataExportException {
                     new AwsHttpHeaders<>(
                         new AwsPost<>(
                             new EsHttpRequest<>(
+                            	this.esEdp,
                                 "_bulk",
                                 new SimpleAwsResponseHandler(false),
                                 new SimpleAwsErrorHandler(false)
                             ),
                             new ByteArrayInputStream(data.getBytes())
                         ), headers
-                     )
+                     ),
+                     this.accesskey,
+                     this.secretKey,
+                     this.reg
                 );
                 index.perform();
         } catch (IOException e) {
@@ -108,11 +146,15 @@ public boolean exists() {
             new SignedRequest<>(
                 new AwsHead<>(
                     new EsHttpRequest<>(
+                        this.esEdp,
                         this.indexName,
                         new BooleanAwsResponseHandler(),
                         new SimpleAwsErrorHandler(false)
                     )
-                )
+                ),
+                this.accesskey,
+                this.secretKey,
+                this.reg
             );
         boolean exists = false;
         try {
@@ -134,11 +176,15 @@ public void delete() {
             new SignedRequest<>(
                 new AwsDelete<>(
                     new EsHttpRequest<>(
+                    	this.esEdp,
                         this.indexName,
                         new SimpleAwsResponseHandler(false),
                         new SimpleAwsErrorHandler(false)
                     )
-                )
+                ),
+                this.accesskey,
+                this.secretKey,
+                this.reg
            );
        deleteIndex.perform();
     }

diff --git a/src/main/java/com/amihaiemil/charles/aws/AmazonEsSearch.java b/src/main/java/com/amihaiemil/charles/aws/AmazonEsSearch.java
@@ -55,14 +55,46 @@ public final class AmazonEsSearch {
      */
     private String indexName;
 
+    /**
+     * ElasticSearch URL.
+     */
+    private EsEndPoint esEdp;
+
+    /**
+     * AWS access key.
+     */
+    private AccessKeyId accesskey;
+
+    /**
+     * Aws secret key;
+     */
+    private SecretKey secretKey;
+
+    /**
+     * Aws ES region.
+     */
+    private Region reg;
+
     /**
      * Ctor.
-     * @param qry
-     * @param idxName
+     * @param es ElasticSearch URL.
+     * @param qry Search query.
+     * @param idxName Index Name.
      */
-    public AmazonEsSearch(SearchQuery qry, String idxName) {
+    public AmazonEsSearch(
+        final EsEndPoint es,
+        final AccessKeyId accesskey,
+        final SecretKey secretKey,
+        final Region reg,
+        final SearchQuery qry,
+        final String idxName
+    ) {
+    	this.esEdp = es;
         this.query = qry;
         this.indexName = idxName;
+        this.accesskey = accesskey;
+        this.secretKey = secretKey;
+        this.reg = reg;
     }
 
     /**
@@ -77,12 +109,17 @@ public SearchResultsPage search() {
     	        new AwsHttpHeaders<>(
     	            new AwsPost<>(
     	                new EsHttpRequest<>(
+    	                	this.esEdp,
     	            	    this.indexName + "/_search",
-    	                    new SearchResponseHandler(), new SimpleAwsErrorHandler(false)
+    	                    new SearchResponseHandler(),
+    	                    new SimpleAwsErrorHandler(false)
     	                ),
     	                new ByteArrayInputStream(this.query.toJson().toString().getBytes())
     	            ), headers
-    	        )
+    	        ),
+    	        this.accesskey,
+                this.secretKey,
+                this.reg
     	    );
         return search.perform();
     }

diff --git a/src/main/java/com/amihaiemil/charles/aws/EsEndPoint.java b/src/main/java/com/amihaiemil/charles/aws/EsEndPoint.java
@@ -33,4 +33,29 @@
  */
 public interface EsEndPoint extends SystemProperty {
 
+    /**
+     * Actual name of the aws es endpoint sys prop.
+     */
+    String NAME = "aws.es.endpoint";
+
+    /**
+     * Fake for unit testing.
+     */
+    public static final class Fake implements EsEndPoint {
+
+        private String value;
+
+        public Fake() {
+            this("testAccessEsEndpoint");
+        }
+
+        public Fake(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String read() {
+            return this.value;
+        }
+    }
 }
diff --git a/src/main/java/com/amihaiemil/charles/aws/Region.java b/src/main/java/com/amihaiemil/charles/aws/Region.java
@@ -26,12 +26,36 @@
 package com.amihaiemil.charles.aws;
 
 /**
- * AWS Region system property.
+ * AWS ElasticSearch Region system property.
  * @author Sherif Waly ([email protected])
  * @version $Id$
  * @since 1.0.0
  *
  */
 public interface Region extends SystemProperty {
+	/**
+     * Actual name of the aws ES region sys prop.
+     */
+    String NAME = "aws.es.region";
+
+    /**
+     * Fake for unit testing.
+     */
+    public static final class Fake implements Region {
 
+        private String value;
+
+        public Fake() {
+            this("testAwsEsRegion");
+        }
+
+        public Fake(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String read() {
+            return this.value;
+        }
+    }
 }
diff --git a/src/main/java/com/amihaiemil/charles/aws/SecretKey.java b/src/main/java/com/amihaiemil/charles/aws/SecretKey.java
@@ -32,5 +32,29 @@
  * @since 1.0.0
  */
 public interface SecretKey extends SystemProperty {
+	/**
+     * Actual name of the aws secret key sys prop.
+     */
+    String NAME = "aws.secretKey";
 
+    /**
+     * Fake for unit testing.
+     */
+    public static final class Fake implements SecretKey {
+
+        private String value;
+
+        public Fake() {
+            this("testAwsSecretKey");
+        }
+
+        public Fake(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String read() {
+            return this.value;
+        }
+    }
 }
diff --git a/src/main/java/com/amihaiemil/charles/aws/StAccessKeyId.java b/src/main/java/com/amihaiemil/charles/aws/StAccessKeyId.java
@@ -32,13 +32,12 @@
  * @since 1.0.0
  */
 public final class StAccessKeyId extends AbstractSystemProperty implements AccessKeyId {
-
-    /**
-     * Ctor. 
-     * @param String name
-     */
-    public StAccessKeyId(final String name) {
-        super(name);
+
+	/**
+	 * Ctor.
+	 */
+    public StAccessKeyId() {
+        super(AccessKeyId.NAME);
     }
 
 }
diff --git a/src/main/java/com/amihaiemil/charles/aws/StEsEndPoint.java b/src/main/java/com/amihaiemil/charles/aws/StEsEndPoint.java
@@ -35,18 +35,9 @@ public final class StEsEndPoint extends AbstractSystemProperty implements EsEndP
 
     /**
      * Ctor. 
-     * @param String name
      */
-    public StEsEndPoint(final String name) {
-        super(name);
+    public StEsEndPoint() {
+        super(EsEndPoint.NAME);
     }
 
-    @Override
-    public String read() {
-        String endPoint = super.read();
-        if(!endPoint.endsWith("/")) {
-            endPoint += "/";
-        }
-        return endPoint;
-    }
 }
diff --git a/src/main/java/com/amihaiemil/charles/aws/StRegion.java b/src/main/java/com/amihaiemil/charles/aws/StRegion.java
@@ -32,13 +32,12 @@
  * @since 1.0.0
  */
 public final class StRegion extends AbstractSystemProperty implements Region {
-    
+
     /**
      * Ctor. 
-     * @param String name
      */
-    public StRegion(final String name) {
-        super(name);
+    public StRegion() {
+        super(Region.NAME);
     }
 
 }
diff --git a/src/main/java/com/amihaiemil/charles/aws/StSecretKey.java b/src/main/java/com/amihaiemil/charles/aws/StSecretKey.java
@@ -32,13 +32,12 @@
  * @since 1.0.0
  */
 public final class StSecretKey extends AbstractSystemProperty implements SecretKey {
-    
+
     /**
      * Ctor. 
-     * @param String name
      */
-    public StSecretKey(final String name) {
-        super(name);
+    public StSecretKey() {
+        super(SecretKey.NAME);
     }
-
+    
 }