code cleanups

cloudsufi · Mar 18, 2024 · 1493856 · 1493856
1 parent 07881ea
commit 1493856
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 42 deletions.
diff --git a/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java b/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java
@@ -1301,28 +1301,28 @@ public static void createBucketWithLifeCycle() throws IOException, URISyntaxExce
     gcsTargetBucketName = createGCSBucketLifeCycle();
     BeforeActions.scenario.write("GCS target bucket name - " + gcsTargetBucketName); }
 
-  @Before(order=1, value = "@DATASTORE_SOURCE_ENTITY")
+  @Before(order = 1, value = "@DATASTORE_SOURCE_ENTITY")
   public static void createEntityInCloudDataStore() throws IOException, URISyntaxException {
-    kindName= "cdf-test-"+ UUID.randomUUID().toString().substring(0, 8);
-   String EntityName = DataStoreClient.createKind(kindName);
-    PluginPropertyUtils.addPluginProp(" kindName", EntityName);
-    BeforeActions.scenario.write("Kind name - " + EntityName + "created successfully");
+    kindName = "cdf-test-" + UUID.randomUUID().toString().substring(0, 8);
+   String entityName = DataStoreClient.createKind(kindName);
+    PluginPropertyUtils.addPluginProp(" kindName", entityName);
+    BeforeActions.scenario.write("Kind name - " + entityName + "created successfully");
     }
 
-  @After(order=1, value = "@DATASTORE_SOURCE_ENTITY")
+  @After(order = 1, value = "@DATASTORE_SOURCE_ENTITY")
   public static void deleteEntityInCloudDataStore() throws IOException, URISyntaxException {
     DataStoreClient.deleteEntity(kindName);
     BeforeActions.scenario.write("Kind name - " + kindName + "deleted successfully");
 }
 
   @Before(order = 2, value = "@DATASTORE_TARGET_ENTITY")
   public static void setTempTargetKindName() {
-    targetKind = "cdf-target-test-"+ UUID.randomUUID().toString().substring(0, 8);
+    targetKind = "cdf-target-test-" + UUID.randomUUID().toString().substring(0, 8);
     PluginPropertyUtils.addPluginProp("targetKind", targetKind);
     BeforeActions.scenario.write("Target kind name - " + targetKind);
   }
 
-  @After(order=1, value = "@DATASTORE_TARGET_ENTITY")
+  @After(order = 1, value = "@DATASTORE_TARGET_ENTITY")
   public static void deleteTargetEntityInCloudDataStore() throws IOException, URISyntaxException {
     DataStoreClient.deleteEntity(targetKind);
     BeforeActions.scenario.write("Target Kind name - " + targetKind + "deleted successfully");

diff --git a/...stepsdesign/Actions/DataStoreActions.java → ...n/datastore/actions/DataStoreActions.java b/...stepsdesign/Actions/DataStoreActions.java → ...n/datastore/actions/DataStoreActions.java
@@ -14,24 +14,27 @@
  * the License.
  */
 
-package io.cdap.plugin.datastore.stepsdesign.Actions;
+package io.cdap.plugin.datastore.actions;
 
 import io.cdap.e2e.utils.ElementHelper;
 import io.cdap.e2e.utils.SeleniumHelper;
-import io.cdap.plugin.datastore.stepsdesign.Locators.DataStoreLocators;
+import io.cdap.plugin.datastore.locators.DataStoreLocators;
 import io.cdap.plugin.utils.DataStoreClient;
 
+/**
+ * DataStore Plugin related actions.
+ */
 public class DataStoreActions {
   static {
 
     SeleniumHelper.getPropertiesLocators(DataStoreLocators.class);
   }
+
   public static void enterKind(String kindName) {
     ElementHelper.sendKeys(DataStoreLocators.kind, kindName);
   }
 
-  public static void enterAncestor()
-  {
+  public static void enterAncestor() {
     ElementHelper.sendKeys(DataStoreLocators.ancestor, DataStoreClient.getKeyLiteral());
   }
 }
diff --git a/...ore/stepsdesign/Actions/package-info.java → ...lugin/datastore/actions/package-info.java b/...ore/stepsdesign/Actions/package-info.java → ...lugin/datastore/actions/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Package contains the actions for the DataStore features.
  */
-package io.cdap.plugin.datastore.stepsdesign.Actions;
+package io.cdap.plugin.datastore.actions;
diff --git a/...epsdesign/Locators/DataStoreLocators.java → ...datastore/locators/DataStoreLocators.java b/...epsdesign/Locators/DataStoreLocators.java → ...datastore/locators/DataStoreLocators.java
@@ -14,12 +14,15 @@
  * the License.
  */
 
-package io.cdap.plugin.datastore.stepsdesign.Locators;
+package io.cdap.plugin.datastore.locators;
 
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.How;
 
+/**
+ * DataStore Plugin related step design.
+ */
 public class DataStoreLocators {
   @FindBy(how = How.XPATH, using = "//input[@data-testid='kind']")
   public static WebElement kind;

diff --git a/...re/stepsdesign/Locators/package-info.java → ...ugin/datastore/locators/package-info.java b/...re/stepsdesign/Locators/package-info.java → ...ugin/datastore/locators/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Package contains the locators for the DataStore features.
  */
-package io.cdap.plugin.datastore.stepsdesign.Locators;
+package io.cdap.plugin.datastore.locators;
diff --git a/.../stepsdesign/Stepdesigns/StepDesigns.java → ...gin/datastore/stepsdesign/StepDesign.java b/.../stepsdesign/Stepdesigns/StepDesigns.java → ...gin/datastore/stepsdesign/StepDesign.java
@@ -14,13 +14,16 @@
  * the License.
  */
 
-package io.cdap.plugin.datastore.stepsdesign.Stepdesigns;
+package io.cdap.plugin.datastore.stepsdesign;
 import io.cdap.plugin.common.stepsdesign.TestSetupHooks;
 
-import io.cdap.plugin.datastore.stepsdesign.Actions.DataStoreActions;
+import io.cdap.plugin.datastore.actions.DataStoreActions;
 import io.cucumber.java.en.Then;
 
-public class StepDesigns {
+/**
+ * DataStore Plugin related step design.
+ */
+public class StepDesign {
   @Then("Enter kind for datastore plugin")
   public void enterKindForDatastorePlugin() {
   DataStoreActions.enterKind(TestSetupHooks.kindName);

diff --git a/...stepsdesign/Stepdesigns/package-info.java → ...n/datastore/stepsdesign/package-info.java b/...stepsdesign/Stepdesigns/package-info.java → ...n/datastore/stepsdesign/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Package contains the stepDesign for the DataStore features.
  */
-package io.cdap.plugin.datastore.stepsdesign.Stepdesigns;
+package io.cdap.plugin.datastore.stepsdesign;
diff --git a/src/e2e-test/java/io/cdap/plugin/utils/DataStoreClient.java b/src/e2e-test/java/io/cdap/plugin/utils/DataStoreClient.java
@@ -15,6 +15,9 @@
 
 import java.util.Date;
 
+/**
+ * Represents DataStore client.
+ */
 public class DataStoreClient {
   private static final Logger logger = LoggerFactory.getLogger(PubSubClient.class);
   static Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
@@ -42,7 +45,7 @@ public static String createKind(String kindName) {
     // Save the entity
     Entity savedEntity = datastore.put(entity);
     key = savedEntity.getKey();
-   logger.info("Entity saved with key: " + key);
+    logger.info("Entity saved with key: " + key);
 
     return kindName;
   }
@@ -52,34 +55,33 @@ public static String createKind(String kindName) {
    *
    * @param kindName the kind name of the entities to be deleted
    */
-    public static void deleteEntity(String kindName) {
-      Query<Entity> query = Query.newEntityQueryBuilder()
-        .setKind(kindName)
-        .build();
-      // Execute the query
-      QueryResults<Entity> queryResults = datastore.run(query);
-      // Delete each entity
-      while (queryResults.hasNext()) {
-        Entity entity = queryResults.next();
-        Key entityKey = entity.getKey();
-        datastore.delete(entityKey);
-        logger.info("Entity deleted: " + entityKey);
-      }
-
-      logger.info("All entities of kind '" + kindName + "' deleted successfully.");
+  public static void deleteEntity(String kindName) {
+    Query<Entity> query = Query.newEntityQueryBuilder()
+      .setKind(kindName)
+      .build();
+    // Execute the query
+    QueryResults<Entity> queryResults = datastore.run(query);
+    // Delete each entity
+    while (queryResults.hasNext()) {
+      Entity entity = queryResults.next();
+      Key entityKey = entity.getKey();
+      datastore.delete(entityKey);
+      logger.info("Entity deleted: " + entityKey);
     }
 
+    logger.info("All entities of kind '" + kindName + "' deleted successfully.");
+  }
+
   /**
    * Returns the key-literal representation of the current entity key.
    *
    * @return the key-literal representation of the current entity key
    */
-    public static String getKeyLiteral()
-    {
-      String kind = key.getKind();  // Get the kind of the entity
-      long id = key.getId();        // Get the ID of the entity
-      String keyLiteral = String.format("Key(%s, %d)", kind, id);
+  public static String getKeyLiteral() {
+    String kind = key.getKind();  // Get the kind of the entity
+    long id = key.getId();        // Get the ID of the entity
+    String keyLiteral = String.format("Key(%s, %d)", kind, id);
 
-      return keyLiteral;
-    }
+    return keyLiteral;
   }
+}