From f6dec2fc256560f53420e48e89d78d2e14ed0206 Mon Sep 17 00:00:00 2001 From: "Lone H. Olesen" Date: Thu, 12 May 2022 10:44:30 +0200 Subject: [PATCH 1/2] Removed boost handling --- build.sbt | 6 +- project/plugins.sbt | 3 +- scalastyle-config.xml | 117 ------------------ .../processors/PatternReplaceProcessor.scala | 2 - 4 files changed, 4 insertions(+), 124 deletions(-) delete mode 100644 scalastyle-config.xml diff --git a/build.sbt b/build.sbt index 6dd8d4d..ff90994 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "solrprocessors" -version := "4.6" +version := "4.7" description := "Solr processors for use in the update request processor chain." @@ -18,7 +18,7 @@ libraryDependencies += "org.scalatest" % "scalatest_2.11" % "2.2.4" % "test" libraryDependencies += "org.slf4j" % "slf4j-jdk14" % "1.7.2" % "test" -resolvers += "Public online Restlet repository" at "http://maven.restlet.org/" +resolvers += "Public online Restlet repository" at "https://maven.restlet.org/" pomExtra := solrprocessors @@ -27,7 +27,7 @@ pomExtra := Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt manual diff --git a/project/plugins.sbt b/project/plugins.sbt index 7e65b5c..2996790 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,2 @@ -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") -resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/" \ No newline at end of file +resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/" diff --git a/scalastyle-config.xml b/scalastyle-config.xml deleted file mode 100644 index dec0a76..0000000 --- a/scalastyle-config.xml +++ /dev/null @@ -1,117 +0,0 @@ - - Scalastyle standard configuration - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/scala/dk/industria/solr/processors/PatternReplaceProcessor.scala b/src/main/scala/dk/industria/solr/processors/PatternReplaceProcessor.scala index 9bf6ea8..790afb2 100644 --- a/src/main/scala/dk/industria/solr/processors/PatternReplaceProcessor.scala +++ b/src/main/scala/dk/industria/solr/processors/PatternReplaceProcessor.scala @@ -59,8 +59,6 @@ class PatternReplaceProcessor(fieldPatternRules: List[FieldPatternReplaceRules], newValues.add(value); } } - val boost = field.get.getBoost() - field.get.setValue(newValues, boost) } } } From 50c3b1a020c3a33b43ff8160d5058415047be3d1 Mon Sep 17 00:00:00 2001 From: "Lone H. Olesen" Date: Mon, 16 May 2022 14:18:41 +0200 Subject: [PATCH 2/2] Removed boost handling --- build.sbt | 4 ++-- .../solr/processors/HTMLStripCharFilterProcessor.scala | 3 +-- .../industria/solr/processors/PatternReplaceProcessor.scala | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index ff90994..c4c2a52 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "solrprocessors" -version := "4.7" +version := "4.8" description := "Solr processors for use in the update request processor chain." @@ -10,7 +10,7 @@ scalaVersion := "2.11.7" scalacOptions ++= Seq("-unchecked", "-deprecation", "-optimise", "-feature", "-Xlint", "-language:postfixOps") -libraryDependencies += "org.apache.solr" % "solr-core" % "4.6.0" % "compile" +libraryDependencies += "org.apache.solr" % "solr-core" % "8.11.1" % "compile" libraryDependencies += "org.slf4j" % "slf4j-api" % "1.7.2" % "compile" diff --git a/src/main/scala/dk/industria/solr/processors/HTMLStripCharFilterProcessor.scala b/src/main/scala/dk/industria/solr/processors/HTMLStripCharFilterProcessor.scala index 57ad20c..8c5dd16 100644 --- a/src/main/scala/dk/industria/solr/processors/HTMLStripCharFilterProcessor.scala +++ b/src/main/scala/dk/industria/solr/processors/HTMLStripCharFilterProcessor.scala @@ -133,8 +133,7 @@ class HTMLStripCharFilterProcessor(fieldsToProcess: List[String], spaceNormalize newValues.add(value) } } - val boost = field.get.getBoost() - field.get.setValue(newValues, boost) + field.get.setValue(newValues) } } } diff --git a/src/main/scala/dk/industria/solr/processors/PatternReplaceProcessor.scala b/src/main/scala/dk/industria/solr/processors/PatternReplaceProcessor.scala index 790afb2..0b7da74 100644 --- a/src/main/scala/dk/industria/solr/processors/PatternReplaceProcessor.scala +++ b/src/main/scala/dk/industria/solr/processors/PatternReplaceProcessor.scala @@ -59,6 +59,7 @@ class PatternReplaceProcessor(fieldPatternRules: List[FieldPatternReplaceRules], newValues.add(value); } } + field.get.setValue(newValues) } } }