Skip to content

Commit 0d7d392

Browse files
committed
add support for elastic v7
1 parent d69caf1 commit 0d7d392

34 files changed

+3458
-4
lines changed

build.sbt

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,59 @@ lazy val persistence = project.in(file("persistence"))
9696
core % "compile->compile;test->test;it->it"
9797
)
9898

99+
lazy val es7rest = project.in(file("es7/rest"))
100+
.configs(IntegrationTest)
101+
.settings(
102+
Defaults.itSettings,
103+
moduleSettings,
104+
elasticSearchVersion := Versions.es7,
105+
)
106+
.dependsOn(
107+
core % "compile->compile;test->test;it->it"
108+
)
109+
110+
lazy val es7restp = project.in(file("es7/rest/persistence"))
111+
.configs(IntegrationTest)
112+
.settings(
113+
Defaults.itSettings,
114+
moduleSettings,
115+
elasticSearchVersion := Versions.es7,
116+
)
117+
.dependsOn(
118+
persistence % "compile->compile;test->test;it->it"
119+
)
120+
.dependsOn(
121+
es7rest % "compile->compile;test->test;it->it"
122+
)
123+
124+
lazy val es7testkit = project.in(file("es7/testkit"))
125+
.configs(IntegrationTest)
126+
.settings(
127+
Defaults.itSettings,
128+
app.softnetwork.Info.infoSettings,
129+
moduleSettings,
130+
elasticSearchVersion := Versions.es7,
131+
buildInfoKeys += BuildInfoKey("elasticVersion" -> elasticSearchVersion.value)
132+
)
133+
.enablePlugins(BuildInfoPlugin)
134+
.dependsOn(
135+
es7restp % "compile->compile;test->test;it->it"
136+
)
137+
138+
lazy val es7 = project.in(file("es7"))
139+
.configs(IntegrationTest)
140+
.settings(
141+
Defaults.itSettings,
142+
Publish.noPublishSettings,
143+
crossScalaVersions := Nil,
144+
elasticSearchVersion := Versions.es7
145+
)
146+
.aggregate(
147+
es7rest,
148+
es7restp,
149+
es7testkit
150+
)
151+
99152
lazy val es8java = project.in(file("es8/java"))
100153
.configs(IntegrationTest)
101154
.settings(

es7/build.sbt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import SoftClient4es.*
2+
organization := "app.softnetwork.elastic"
3+
name := s"softclient4es${elasticSearchMajorVersion(elasticSearchVersion.value)}"
4+
publish / skip := true
5+
Compile / sources := Nil
6+
Test / sources := Nil
7+

es7/rest/build.sbt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import SoftClient4es.*
2+
3+
organization := "app.softnetwork.elastic"
4+
5+
name := s"softclient4es${elasticSearchMajorVersion(elasticSearchVersion.value)}-rest-client"
6+
7+
libraryDependencies ++= restClientDependencies(elasticSearchVersion.value) ++
8+
elastic4sDependencies(elasticSearchVersion.value)

es7/rest/persistence/build.sbt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import SoftClient4es.{elasticSearchMajorVersion, elasticSearchVersion}
2+
3+
organization := "app.softnetwork.elastic"
4+
5+
name := s"softclient4es${elasticSearchMajorVersion(elasticSearchVersion.value)}-rest-persistence"
6+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package app.softnetwork.elastic.persistence.query
2+
3+
import app.softnetwork.elastic.client.rest.RestHighLevelClientApi
4+
import app.softnetwork.persistence.ManifestWrapper
5+
import app.softnetwork.persistence.model.Timestamped
6+
7+
trait RestHighLevelClientProvider[T <: Timestamped]
8+
extends ElasticProvider[T]
9+
with RestHighLevelClientApi {
10+
_: ManifestWrapper[T] =>
11+
12+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package app.softnetwork.elastic.persistence.query
2+
3+
import app.softnetwork.persistence.message.CrudEvent
4+
import app.softnetwork.persistence.model.Timestamped
5+
import app.softnetwork.persistence.query.{JournalProvider, OffsetProvider}
6+
7+
trait State2ElasticProcessorStreamWithRestProvider[T <: Timestamped, E <: CrudEvent]
8+
extends State2ElasticProcessorStream[T, E]
9+
with RestHighLevelClientProvider[T] { _: JournalProvider with OffsetProvider => }

0 commit comments

Comments
 (0)