From fb1fe0eb4f993897e37e1330a95f4e9539aacdb3 Mon Sep 17 00:00:00 2001 From: Stephane Gamard Date: Mon, 2 Jun 2014 16:07:23 +0200 Subject: [PATCH] SONAR-5329 - Created LogDoc from Index --- .../org/sonar/server/log/index/LogDoc.java | 49 +++++++++++++++++++ .../org/sonar/server/log/index/LogIndex.java | 12 +++-- 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 sonar-server/src/main/java/org/sonar/server/log/index/LogDoc.java diff --git a/sonar-server/src/main/java/org/sonar/server/log/index/LogDoc.java b/sonar-server/src/main/java/org/sonar/server/log/index/LogDoc.java new file mode 100644 index 00000000000..3d77b273e81 --- /dev/null +++ b/sonar-server/src/main/java/org/sonar/server/log/index/LogDoc.java @@ -0,0 +1,49 @@ +package org.sonar.server.log.index; + +import org.sonar.core.log.Log; +import org.sonar.core.log.LogDto; +import org.sonar.server.search.BaseDoc; + +import java.io.Serializable; +import java.util.Date; +import java.util.Map; + +/** + * @since 4.4 + */ +public class LogDoc extends BaseDoc implements Log { + + protected LogDoc(Map fields) { + super(fields); + } + + @Override + public Date time() { + return this.getField(LogNormalizer.LogFields.TIME.field()); + } + + @Override + public String author() { + return this.getField(LogNormalizer.LogFields.AUTHOR.field()); + } + + @Override + public LogDto.Type type() { + return LogDto.Type.valueOf((String)this.getField(LogNormalizer.LogFields.TYPE.field())); + } + + @Override + public LogDto.Status status() { + return LogDto.Status.valueOf((String)this.getField(LogNormalizer.LogFields.STATUS.field())); + } + + @Override + public Long executionTime() { + return this.getField(LogNormalizer.LogFields.EXECUTION.field()); + } + + @Override + public K getPayload() { + return null; + } +} diff --git a/sonar-server/src/main/java/org/sonar/server/log/index/LogIndex.java b/sonar-server/src/main/java/org/sonar/server/log/index/LogIndex.java index e6b3b7a5c97..2dae9b66acc 100644 --- a/sonar-server/src/main/java/org/sonar/server/log/index/LogIndex.java +++ b/sonar-server/src/main/java/org/sonar/server/log/index/LogIndex.java @@ -19,17 +19,21 @@ */ package org.sonar.server.log.index; +import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.sonar.core.cluster.WorkQueue; import org.sonar.core.log.Log; import org.sonar.core.log.LogDto; import org.sonar.core.log.db.LogKey; +import org.sonar.server.search.BaseDoc; import org.sonar.server.search.BaseIndex; import org.sonar.server.search.ESNode; import org.sonar.server.search.IndexDefinition; import org.sonar.server.search.IndexField; import java.io.IOException; +import java.io.Serializable; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -44,12 +48,12 @@ public class LogIndex extends BaseIndex{ @Override protected String getKeyValue(LogKey key) { - return null; + return key.toString(); } @Override protected Settings getIndexSettings() throws IOException { - return null; + ImmutableSettings.builder().build(); } @Override @@ -69,7 +73,7 @@ public class LogIndex extends BaseIndex{ } @Override - protected Log toDoc(Map fields) { - return null; + protected Log toDoc(final Map fields) { + return new LogDoc(fields); } } -- 2.39.5