Use forked modules

Author: wreulicke

calculate.go

@@ -1,23 +1,18 @@
 package emc
 
 import (
-	"github.com/cloudfoundry/java-buildpack-memory-calculator/v4/calculator"
-	"github.com/cloudfoundry/java-buildpack-memory-calculator/v4/flags"
+	"github.com/wreulicke/emc/calculator"
 )
 
 func Calculate(totalMemory int64, loadedClassCount int64, threadCount int64, javaOptons string, headRoom int) ([]string, error) {
-	h := flags.HeadRoom(headRoom)
-	options := flags.JVMOptions{}
+	options := calculator.JVMOptions{}
 	options.Set(javaOptons)
-	tc := flags.ThreadCount(threadCount)
-	tm := flags.TotalMemory(totalMemory)
-	lcc := flags.LoadedClassCount(loadedClassCount)
 	calc := calculator.Calculator{
-		HeadRoom:         &h,
+		HeadRoom:         headRoom,
 		JvmOptions:       &options,
-		ThreadCount:      &tc,
-		TotalMemory:      &tm,
-		LoadedClassCount: &lcc,
+		ThreadCount:      threadCount,
+		TotalMemory:      calculator.Size(totalMemory),
+		LoadedClassCount: loadedClassCount,
 	}
 	str, err := calc.Calculate()
 	if err != nil {

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d
 	github.com/cloudfoundry/java-buildpack-memory-calculator/v4 v4.2.0
 	github.com/saracen/walker v0.1.1
+	github.com/stretchr/testify v1.7.1 // indirect
 	github.com/wreulicke/go-java-class-parser v0.0.0-20200210000755-ea0c5bba6606
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6

go.sum

@@ -40,6 +40,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/wreulicke/go-java-class-parser v0.0.0-20200210000755-ea0c5bba6606 h1:Hk5USgnCYCxzejsEJx1qApWrgHkM/F/rUwQyZ+4dehA=
 github.com/wreulicke/go-java-class-parser v0.0.0-20200210000755-ea0c5bba6606/go.mod h1:rH+Ei3TGttVxPLRncqJW32rwlo9lKP9lYs8rw6JRAFE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -81,3 +83,5 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=