Merge remote-tracking branch 'origin/main' into main

Author: Milos Vasic

.gitignore

@@ -20,6 +20,6 @@ target
 .gradle
 build
 
-*.iml
 .idea
-
+*.iml
+gradle

src/main/java/io/harness/cf/client/Example.java

@@ -1,12 +1,12 @@
-package io.harness.cf.client.example;
+package io.harness.cf.client;
 
 import com.google.common.collect.ImmutableMap;
 import io.harness.cf.client.api.CfClient;
 import io.harness.cf.client.dto.Target;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class Example {
+class Example {
 
   public static final String FEATURE_FLAG_KEY = "toggle";
   public static final String API_KEY = "8b3bf1d0-6c88-4cdb-99a1-36aff131911a";

src/main/java/io/harness/cf/client/api/analytics/AnalyticsPublisherService.java

@@ -1,5 +1,6 @@
 package io.harness.cf.client.api.analytics;
 
+import com.google.common.base.Strings;
 import io.harness.cf.client.api.CfClientException;
 import io.harness.cf.client.api.Config;
 import io.harness.cf.client.dto.Analytics;
@@ -122,8 +123,15 @@ private Metrics prepareMessageBody(Map<Analytics, Integer> all) {
               }
               targetData.addAttributesItem(keyValue);
             });
+
         targetData.setIdentifier(target.getIdentifier());
-        targetData.setName(target.getName());
+        if (Strings.isNullOrEmpty(target.getName())) {
+
+          targetData.setName(target.getIdentifier());
+        } else {
+
+          targetData.setName(target.getName());
+        }
         metrics.addTargetDataItem(targetData);
       }
 

src/main/java/io/harness/cf/client/dto/Target.java

@@ -19,18 +19,22 @@
 @AllArgsConstructor
 @EqualsAndHashCode
 public class Target {
-  private String identifier;
+
   private String name;
+  private String identifier;
+
   @Default private Map<String, Object> attributes = new HashMap<>();
   private boolean isPrivate; // If the target is private
   private Set<String> privateAttributes; // Custom set to set the attributes which are private
 
   @Override
   public String toString() {
+
     return "TargetId: " + identifier;
   }
 
   public boolean isValid() {
-    return !Strings.isNullOrEmpty(name) && !Strings.isNullOrEmpty(identifier);
+
+    return !Strings.isNullOrEmpty(identifier);
   }
 }