Google Java Format

arakoodev · Aug 4, 2023 · 701a5c3 · 701a5c3
1 parent 53895b0
commit 701a5c3
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 47 deletions.
diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/chains/PineconeRetrieval.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/chains/PineconeRetrieval.java
@@ -9,7 +9,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class PineconeRetrieval extends Retrieval {
 
   private final Logger logger = LoggerFactory.getLogger(getClass());

diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/chains/RedisRetrieval.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/chains/RedisRetrieval.java
@@ -10,7 +10,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class RedisRetrieval extends Retrieval {
 
   private final Logger logger = LoggerFactory.getLogger(getClass());

diff --git a/...pring/edgechain-app/src/main/java/com/edgechain/lib/configuration/RedisConfiguration.java b/...pring/edgechain-app/src/main/java/com/edgechain/lib/configuration/RedisConfiguration.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -11,7 +10,6 @@
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import redis.clients.jedis.JedisPooled;

diff --git a/...hain-app/src/main/java/com/edgechain/lib/index/repositories/PostgresClientRepository.java b/...hain-app/src/main/java/com/edgechain/lib/index/repositories/PostgresClientRepository.java
@@ -14,7 +14,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 @Repository
 public class PostgresClientRepository {
@@ -65,8 +64,8 @@ public List<Map<String, Object>> query(
 
     return jdbcTemplate.queryForList(
         String.format(
-            "SELECT id, raw_text, namespace, filename, timestamp FROM %s WHERE namespace='%s' ORDER BY"
-                + " embedding %s '%s' LIMIT %s;",
+            "SELECT id, raw_text, namespace, filename, timestamp FROM %s WHERE namespace='%s' ORDER"
+                + " BY embedding %s '%s' LIMIT %s;",
             tableName,
             namespace,
             PostgresDistanceMetric.getDistanceMetric(metric),

diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/supabase/security/JwtFilter.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/supabase/security/JwtFilter.java
@@ -30,7 +30,6 @@ public class JwtFilter extends OncePerRequestFilter {
 
   @Autowired private SecurityUUID securityUUID;
 
-
   @Override
   protected void doFilterInternal(
       HttpServletRequest request, HttpServletResponse response, FilterChain filter)

diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/supabase/security/JwtHelper.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/supabase/security/JwtHelper.java
@@ -18,7 +18,6 @@ public Jws<Claims> parseToken(String accessToken) {
           new SecretKeySpec(
               env.getProperty("jwt.secret").getBytes(), SignatureAlgorithm.HS256.getJcaName());
 
-
       return Jwts.parser().setSigningKey(hmacKey).parseClaimsJws(accessToken);
 
     } catch (MalformedJwtException e) {

diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/supabase/utils/AuthUtils.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/supabase/utils/AuthUtils.java
@@ -7,13 +7,11 @@ public class AuthUtils {
 
   public static String extractToken(HttpServletRequest request) {
     String header = request.getHeader("Authorization");
-    if (header != null && header.startsWith("Bearer"))
-      return header.replace("Bearer ", "");
+    if (header != null && header.startsWith("Bearer")) return header.replace("Bearer ", "");
 
     return null;
   }
 
-
   public static String extractToken(ArkRequest request) {
     String header = request.getHeader("Authorization");
     if (header != null && header.startsWith("Bearer")) return header.replace("Bearer ", "");

diff --git a/...gechain-app/src/main/java/com/edgechain/service/controllers/index/PineconeController.java b/...gechain-app/src/main/java/com/edgechain/service/controllers/index/PineconeController.java
@@ -16,8 +16,7 @@
 @RequestMapping(value = WebConfiguration.CONTEXT_PATH + "/index/pinecone")
 public class PineconeController {
 
-  @Autowired
-  private PineconeClient pineconeClient;
+  @Autowired private PineconeClient pineconeClient;
 
   @PostMapping("/upsert")
   public Single<StringResponse> upsert(@RequestBody PineconeEndpoint pineconeEndpoint) {

diff --git a/...gechain-app/src/main/java/com/edgechain/service/controllers/index/PostgresController.java b/...gechain-app/src/main/java/com/edgechain/service/controllers/index/PostgresController.java
@@ -18,9 +18,7 @@
 @RequestMapping(value = WebConfiguration.CONTEXT_PATH + "/index/postgres")
 public class PostgresController {
 
-  @Autowired
-  @Lazy
-  private PostgresClient postgresClient;
+  @Autowired @Lazy private PostgresClient postgresClient;
 
   @PostMapping("/upsert")
   public Single<StringResponse> upsert(@RequestBody PostgresEndpoint postgresEndpoint) {

diff --git a/.../edgechain-app/src/main/java/com/edgechain/service/controllers/index/RedisController.java b/.../edgechain-app/src/main/java/com/edgechain/service/controllers/index/RedisController.java
@@ -18,42 +18,40 @@
 @RequestMapping(value = WebConfiguration.CONTEXT_PATH + "/index/redis")
 public class RedisController {
 
-    @Autowired
-    @Lazy
-    private RedisClient redisClient;
+  @Autowired @Lazy private RedisClient redisClient;
 
-    @PostMapping("/upsert")
-    public Single<StringResponse> upsert(@RequestBody RedisEndpoint redisEndpoint) {
+  @PostMapping("/upsert")
+  public Single<StringResponse> upsert(@RequestBody RedisEndpoint redisEndpoint) {
 
-        this.redisClient.setEndpoint(redisEndpoint);
+    this.redisClient.setEndpoint(redisEndpoint);
 
-        EdgeChain<StringResponse> edgeChain =
-                this.redisClient.upsert(
-                        redisEndpoint.getWordEmbeddings(),
-                        redisEndpoint.getDimensions(),
-                        redisEndpoint.getMetric());
+    EdgeChain<StringResponse> edgeChain =
+        this.redisClient.upsert(
+            redisEndpoint.getWordEmbeddings(),
+            redisEndpoint.getDimensions(),
+            redisEndpoint.getMetric());
 
-        return edgeChain.toSingle();
-    }
+    return edgeChain.toSingle();
+  }
 
-    @PostMapping("/query")
-    public Single<List<WordEmbeddings>> query(@RequestBody RedisEndpoint redisEndpoint) {
+  @PostMapping("/query")
+  public Single<List<WordEmbeddings>> query(@RequestBody RedisEndpoint redisEndpoint) {
 
-        this.redisClient.setEndpoint(redisEndpoint);
+    this.redisClient.setEndpoint(redisEndpoint);
 
-        EdgeChain<List<WordEmbeddings>> edgeChain =
-                this.redisClient.query(redisEndpoint.getWordEmbeddings(), redisEndpoint.getTopK());
+    EdgeChain<List<WordEmbeddings>> edgeChain =
+        this.redisClient.query(redisEndpoint.getWordEmbeddings(), redisEndpoint.getTopK());
 
-        return edgeChain.toSingle();
-    }
+    return edgeChain.toSingle();
+  }
 
-    @DeleteMapping("/delete")
-    public Completable deleteByPattern(
-            @RequestParam("pattern") String pattern, @RequestBody RedisEndpoint redisEndpoint) {
+  @DeleteMapping("/delete")
+  public Completable deleteByPattern(
+      @RequestParam("pattern") String pattern, @RequestBody RedisEndpoint redisEndpoint) {
 
-        this.redisClient.setEndpoint(redisEndpoint);
+    this.redisClient.setEndpoint(redisEndpoint);
 
-        EdgeChain<StringResponse> edgeChain = this.redisClient.deleteByPattern(pattern);
-        return edgeChain.await();
-    }
+    EdgeChain<StringResponse> edgeChain = this.redisClient.deleteByPattern(pattern);
+    return edgeChain.await();
+  }
 }
diff --git a/...dgechain-app/src/main/java/com/edgechain/service/controllers/openai/OpenAiController.java b/...dgechain-app/src/main/java/com/edgechain/service/controllers/openai/OpenAiController.java
@@ -62,7 +62,7 @@ public Single<ChatCompletionResponse> chatCompletion(@RequestBody OpenAiEndpoint
     EdgeChain<ChatCompletionResponse> edgeChain =
         openAiClient.createChatCompletion(chatCompletionRequest);
 
-      if (Objects.nonNull(env.getProperty("postgres.db.host"))) {
+    if (Objects.nonNull(env.getProperty("postgres.db.host"))) {
 
       ChatCompletionLog chatCompletionLog = new ChatCompletionLog();
       chatCompletionLog.setName(openAiEndpoint.getChainName());
@@ -119,7 +119,7 @@ public SseEmitter chatCompletionStream(@RequestBody OpenAiEndpoint openAiEndpoin
 
             AtomInteger chunks = AtomInteger.of(0);
 
-              if (Objects.nonNull(env.getProperty("postgres.db.host")))  {
+            if (Objects.nonNull(env.getProperty("postgres.db.host"))) {
 
               ChatCompletionLog chatCompletionLog = new ChatCompletionLog();
               chatCompletionLog.setName(openAiEndpoint.getChainName());
@@ -224,7 +224,7 @@ public Single<OpenAiEmbeddingResponse> embeddings(@RequestBody OpenAiEndpoint op
         openAiClient.createEmbeddings(
             new OpenAiEmbeddingRequest(openAiEndpoint.getModel(), openAiEndpoint.getInput()));
 
-      if (Objects.nonNull(env.getProperty("postgres.db.host")))  {
+    if (Objects.nonNull(env.getProperty("postgres.db.host"))) {
 
       EmbeddingLog embeddingLog = new EmbeddingLog();
       embeddingLog.setCreatedAt(LocalDateTime.now());