loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

also work on java 7

Browse Source
This commit is contained in:
Ivan Porto Carrero 2014-09-16 20:52:07 -07:00
parent ed86bfb79b
commit 86d56b978a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sbt
View File

@ -21,6 +21,7 @@ libraryDependencies ++= Seq(
"org.json4s" %% "json4s-jackson" % "3.2.10", "org.json4s" %% "json4s-jackson" % "3.2.10",
"io.backchat.inflector" %% "scala-inflector" % "1.3.5", "io.backchat.inflector" %% "scala-inflector" % "1.3.5",
"commons-io" % "commons-io" % "2.3", "commons-io" % "commons-io" % "2.3",
"net.iharder" % "base64" % "2.3.8",
"ch.qos.logback" % "logback-classic" % "1.0.13" % "provided", "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided",
"org.rogach" %% "scallop" % "0.9.5", "org.rogach" %% "scallop" % "0.9.5",
"junit" % "junit" % "4.11" % "test", "junit" % "junit" % "4.11" % "test",

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=0.13.0 sbt.version=0.13.5

5
src/main/scala/com/wordnik/swagger/codegen/BasicGenerator.scala
View File

@ -16,8 +16,6 @@
package com.wordnik.swagger.codegen package com.wordnik.swagger.codegen
import java.util.Base64
import com.wordnik.swagger.codegen._ import com.wordnik.swagger.codegen._
import com.wordnik.swagger.codegen.util._ import com.wordnik.swagger.codegen.util._
import com.wordnik.swagger.codegen.language.CodegenConfig import com.wordnik.swagger.codegen.language.CodegenConfig
@ -30,6 +28,7 @@ import com.wordnik.swagger.util.ValidationException
import java.io.{ File, FileWriter } import java.io.{ File, FileWriter }
import net.iharder.Base64
import org.json4s.jackson.JsonMethods._ import org.json4s.jackson.JsonMethods._
import org.json4s.jackson.Serialization.write import org.json4s.jackson.Serialization.write
@ -195,7 +194,7 @@ abstract class BasicGenerator extends CodegenConfig with PathUtil {
ApiKeyValue(authInfo(0), "header", authInfo(1)) ApiKeyValue(authInfo(0), "header", authInfo(1))
} }
val basicAuth = sys.props.get("auth.basic") map { e => val basicAuth = sys.props.get("auth.basic") map { e =>
val creds = if (e.contains(":")) Base64.getEncoder.encodeToString(e.getBytes) else e val creds = if (e.contains(":")) Base64.encodeBytes(e.getBytes) else e
ApiKeyValue("Authorization", "header", s"Basic $creds") ApiKeyValue("Authorization", "header", s"Basic $creds")
} }
val apiKeyAuth = apiKey map { key => val apiKeyAuth = apiKey map { key =>