Skip to content

Fixed error when accessing resource files on Windows 10 machines #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 18, 2020
Merged

Fixed error when accessing resource files on Windows 10 machines #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7ceb907
Merge pull request #48 from delphi-hub/develop
bhermann Nov 26, 2019
674c7ee
Bumped version
bhermann Jan 6, 2020
d65a699
Merge pull request #56 from delphi-hub/release/v0.9.5
bhermann Jan 6, 2020
1be4cf5
Bugfix for artifactId
bhermann Jan 16, 2020
8d369b6
Bumped version for hotfix
bhermann Jan 16, 2020
957d109
Merge branch 'master' into develop
Jun 17, 2020
e52f872
Fixed encoding errors when loading resources on windwos machines
Jun 17, 2020
099f3f7
Adjusted version number for develop branch
Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "delphi-webapi"

version := "0.9.5-SNAPSHOT"
version := "0.9.6-SNAPSHOT"

scalaVersion := "2.13.1"

Expand Down
7 changes: 1 addition & 6 deletions src/main/resources/features.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{
"name" : "maven.artifactId",
"description": "ArtifactId of a Maven Package",
"internalName": "identifier.artifactid"
"internalName": "identifier.artifactId"
},
{
"name" : "maven.version",
Expand Down Expand Up @@ -674,11 +674,6 @@
"internalName": "hermes.features.public fields\nonly used by defininig type ",
"name": "metrics.fields.publicvisiblelocal"
},
{
"description": "",
"internalName": "hermes.features.sun",
"name": "sun"
},
{
"description": "Object-based Thread Notification (Object.notify, notifyAll, or wait).",
"internalName": "hermes.features.Object-based Thread Notification",
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/de/upb/cs/swt/delphi/webapi/FeatureQuery.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import org.slf4j.LoggerFactory
import spray.json._
import de.upb.cs.swt.delphi.webapi.FeatureJson._

import scala.io.Source
import scala.io.{Codec, Source}

class FeatureQuery(configuration: Configuration) {
private val log = LoggerFactory.getLogger(this.getClass)

lazy val featureList: Iterable[Feature] =
Source.fromResource("features.json")
Source.fromResource("features.json")(Codec.UTF8)
.getLines()
.mkString("\n")
.parseJson
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/de/upb/cs/swt/delphi/webapi/artifacts/ArtifactTransformer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import de.upb.cs.swt.delphi.webapi.InternalFeature
import org.joda.time.format.ISODateTimeFormat
import spray.json.JsArray

import scala.io.Source
import scala.io.{Codec, Source}
import spray.json._
import de.upb.cs.swt.delphi.webapi.FeatureJson._
import de.upb.cs.swt.delphi.webapi.search.SearchResults

object ArtifactTransformer {
private lazy val internalFeatures = Source.fromResource("features.json")
private lazy val internalFeatures = Source.fromResource("features.json")(Codec.UTF8)
.getLines()
.mkString("\n")
.parseJson
Expand Down
7 changes: 4 additions & 3 deletions src/main/scala/de/upb/cs/swt/delphi/webapi/search/SearchQuery.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ package de.upb.cs.swt.delphi.webapi.search
import com.sksamuel.elastic4s.http.ElasticDsl._
import com.sksamuel.elastic4s.http.search.SearchHits
import com.sksamuel.elastic4s.http.{ElasticClient, RequestFailure, RequestSuccess}
import com.sksamuel.elastic4s.searches.queries.matches.MatchQuery
import com.sksamuel.elastic4s.searches.queries.{NoopQuery, Query}
import de.upb.cs.swt.delphi.core.model._
import de.upb.cs.swt.delphi.core.ql._
import de.upb.cs.swt.delphi.webapi.artifacts.ArtifactTransformer
import de.upb.cs.swt.delphi.webapi.{Configuration, Feature, FeatureQuery, InternalFeature}
import spray.json.JsArray

import scala.io.Source
import scala.io.{Codec, Source}
import scala.util.{Failure, Success, Try}
import spray.json._
import de.upb.cs.swt.delphi.webapi.FeatureJson._
Expand All @@ -35,7 +36,7 @@ import de.upb.cs.swt.delphi.webapi.FeatureJson._
class SearchQuery(configuration: Configuration, featureExtractor: FeatureQuery) {
private val client = ElasticClient(configuration.elasticsearchClientUri)

lazy val internalFeatures = Source.fromResource("features.json")
lazy val internalFeatures = Source.fromResource("features.json")(Codec.UTF8)
.getLines()
.mkString("\n")
.parseJson
Expand Down Expand Up @@ -112,7 +113,7 @@ class SearchQuery(configuration: Configuration, featureExtractor: FeatureQuery)
)
)
}
case EqualExpr(field, value) => matchQuery(externalToInternalFeature(field.fieldName), value)
case EqualExpr(field, value) => matchQuery(externalToInternalFeature(field.fieldName), value)
case NotEqualExpr(field, value) => bool(not(matchQuery(externalToInternalFeature(field.fieldName), value)))
case GreaterThanExpr(field, value) => rangeQuery(externalToInternalFeature(field.fieldName)).gt(value.toLong)
case GreaterOrEqualExpr(field, value) => rangeQuery(externalToInternalFeature(field.fieldName)).gte(value.toLong)
Expand Down