Merge pull request #6 from isystk/feature/solrj

SpringDataSolrを辞めてSolrJを導入

Author: isystk

batch/src/main/java/com/isystk/sample/batch/service/SolrStockService.java

@@ -1,6 +1,7 @@
 package com.isystk.sample.batch.service;
 
 import com.google.common.collect.Lists;
+import com.isystk.sample.common.util.DateUtils;
 import com.isystk.sample.common.util.ObjectMapperUtils;
 import com.isystk.sample.domain.dto.StockCriteria;
 import com.isystk.sample.domain.repository.StockRepository;
@@ -44,14 +45,20 @@ public void refresh() {
         .forEach(stock -> {
           SolrStock solrStock = ObjectMapperUtils.map(stock, SolrStock.class);
           solrStock.setStockId(stock.getId().intValue());
+          solrStock.setCreatedAtDate(DateUtils.toDate(stock.getCreatedAt()));
           solrStockList.add(solrStock);
         });
 
-    // Solrをすべて削除
-    solrStockRepository.deleteAll();
+    try {
+      // Solrをすべて削除
+      solrStockRepository.deleteStockByQuery("*:*");
+
+      // Solrに保存
+      solrStockRepository.addStocks(solrStockList);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
 
-    // Solrに保存
-    solrStockRepository.saveAll(solrStockList);
   }
 
 }

build.gradle

@@ -70,7 +70,7 @@ subprojects {
     runtimeOnly("org.springframework.boot:spring-boot-devtools")
 
     /* solr */
-    implementation("org.springframework.boot:spring-boot-starter-data-solr:${springBootSolrVersion}")
+    implementation("org.apache.solr:solr-solrj:${solrJVersion}")
 
     /* spring security */
     implementation("org.springframework.boot:spring-boot-starter-security")

business/src/main/java/com/isystk/sample/solr/BaseSolrConfig.java

@@ -1,25 +1,18 @@
 package com.isystk.sample.solr;
 
-import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
-import org.springframework.data.solr.core.SolrTemplate;
-import org.springframework.data.solr.repository.config.EnableSolrRepositories;
+import org.springframework.context.annotation.Configuration;
 
-@EnableSolrRepositories(basePackages = "com.isystk.sample.solr.repository")
 public class BaseSolrConfig {
 
   @Value("#{'${spring.data.solr.host:*}'}")
-  String solrURL;
+  String solrHost;
 
   @Bean
-  public SolrClient solrClient() {
-    return new HttpSolrClient.Builder(solrURL).build();
+  public HttpSolrClient stockSolrClient() {
+    return new HttpSolrClient.Builder(solrHost + "/stock").build();
   }
 
-  @Bean
-  public SolrTemplate solrTemplate(SolrClient client) throws Exception {
-    return new SolrTemplate(client);
-  }
 }

business/src/main/java/com/isystk/sample/solr/dto/SolrStock.java

@@ -1,102 +1,37 @@
 package com.isystk.sample.solr.dto;
 
 import com.isystk.sample.common.dto.Dto;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.solr.core.mapping.Indexed;
-import org.springframework.data.solr.core.mapping.SolrDocument;
+import java.util.Date;
+import lombok.Data;
+import org.apache.solr.client.solrj.beans.Field;
 
 import java.time.LocalDateTime;
 
-@SolrDocument(collection = "stock")
+@Data
 public class SolrStock implements Dto {
 
-  @Id
-  @Indexed(name = "id")
+  @Field("id")
   private String id;
 
-  @Indexed(name = "stock_id")
+  @Field("stock_id")
   private Integer stockId;
 
-  @Indexed(name = "name")
+  @Field("name")
   private String name;
 
-  @Indexed(name = "detail")
+  @Field("detail")
   private String detail;
 
-  @Indexed(name = "price")
+  @Field("price")
   private Integer price;
 
-  @Indexed(name = "imgpath")
+  @Field("imgpath")
   private String imgpath;
 
-  @Indexed(name = "quantity")
+  @Field("quantity")
   private Integer quantity;
 
-  @Indexed(name = "created_at")
-  private LocalDateTime createdAt;
+  @Field("created_at")
+  private Date createdAtDate;
 
-
-  public String getId() {
-    return id;
-  }
-
-  public void setId(String id) {
-    this.id = id;
-  }
-
-  public Integer getStockId() {
-    return stockId;
-  }
-
-  public void setStockId(Integer stockId) {
-    this.stockId = stockId;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getDetail() {
-    return detail;
-  }
-
-  public void setDetail(String detail) {
-    this.detail = detail;
-  }
-
-  public Integer getPrice() {
-    return price;
-  }
-
-  public void setPrice(Integer price) {
-    this.price = price;
-  }
-
-  public String getImgpath() {
-    return imgpath;
-  }
-
-  public void setImgpath(String imgpath) {
-    this.imgpath = imgpath;
-  }
-
-  public Integer getQuantity() {
-    return quantity;
-  }
-
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-  public LocalDateTime getCreatedAt() {
-    return createdAt;
-  }
-
-  public void setCreatedAt(LocalDateTime createdAt) {
-    this.createdAt = createdAt;
-  }
 }