Removed bad imports of BillEntry and AbstractBillEntry

diff --git a/src/main/scala/gr/grnet/aquarium/actor/message/GetUserBillResponse.scala b/src/main/scala/gr/grnet/aquarium/actor/message/GetUserBillResponse.scala
index fe6c494..bcc8e72 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/message/GetUserBillResponse.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/message/GetUserBillResponse.scala
@@ -36,9 +36,7 @@
 package gr.grnet.aquarium.actor.message
 
 import gr.grnet.aquarium.AquariumInternalError
-import gr.grnet.aquarium.charging.bill.{AbstractBillEntry, BillEntry}
 import gr.grnet.aquarium.message.avro.gen.BillEntryMsg
-import gr.grnet.aquarium.converter.{PrettyJsonTextFormat, StdConverters}
 import gr.grnet.aquarium.message.avro.AvroHelpers
 
 /**

diff --git a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
index aae64e1..065107d 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
+++ b/src/main/scala/gr/grnet/aquarium/actor/service/user/UserActor.scala
@@ -51,7 +51,6 @@ import gr.grnet.aquarium.actor.message.GetUserWalletResponse
 import gr.grnet.aquarium.actor.message.GetUserWalletResponseData
 import gr.grnet.aquarium.actor.message.config.AquariumPropertiesLoaded
 import gr.grnet.aquarium.actor.message.config.InitializeUserActorState
-import gr.grnet.aquarium.charging.bill.{BillEntry, AbstractBillEntry}
 import gr.grnet.aquarium.charging.state.{UserStateModel, UserAgreementHistoryModel, UserStateBootstrap}
 import gr.grnet.aquarium.computation.BillingMonthInfo
 import gr.grnet.aquarium.message.avro.gen.{IMEventMsg, ResourceEventMsg, UserStateMsg}
@@ -60,6 +59,7 @@ import gr.grnet.aquarium.service.event.BalanceEvent
 import gr.grnet.aquarium.util.date.TimeHelpers
 import gr.grnet.aquarium.util.{LogHelpers, shortClassNameOf}
 import gr.grnet.aquarium.policy.{ResourceType, PolicyModel}
+import gr.grnet.aquarium.charging.bill.BillEntryMsg
 
 /**
  *
@@ -401,7 +401,7 @@ class UserActor extends ReflectiveRoleableActor {
           case Some(policy:PolicyModel) => policy.resourceTypesMap
       }
       val state= if(haveUserState) Some(this._userState.msg) else None
-      val billEntryMsg = BillEntry.fromWorkingUserState(timeslot,this._userID,state,resourceTypes)
+      val billEntryMsg = BillEntryMsg.fromWorkingUserState(timeslot,this._userID,state,resourceTypes)
       //val billEntryMsg = MessageFactory.createBillEntryMsg(billEntry)
       //logger.debug("BILL ENTRY MSG: " + billEntryMsg.toString)
       val billData = GetUserBillResponseData(this._userID,billEntryMsg)

diff --git a/src/main/scala/gr/grnet/aquarium/charging/bill/BillEntry.scala b/src/main/scala/gr/grnet/aquarium/charging/bill/BillEntry.scala
index 020523c..2ccfa0b 100644 (file)
--- a/src/main/scala/gr/grnet/aquarium/charging/bill/BillEntry.scala
+++ b/src/main/scala/gr/grnet/aquarium/charging/bill/BillEntry.scala
@@ -55,7 +55,7 @@ import java.util
 /*
 * @author Prodromos Gerakios <pgerakios@grnet.gr>
 */
-
+/*
 case class ChargeEntry(val id:String,
                        val unitPrice:String,
                        val startTime:String,
@@ -103,9 +103,9 @@ class BillEntry(val id:String,
                 val bill:List[ServiceEntry]
               )
  extends JsonSupport {}
+*/
 
-
-object BillEntry {
+object BillEntryMsg {
 
   private[this] val counter = new AtomicLong(0L)
   private[this] def nextUIDObject() = counter.getAndIncrement

diff --git a/src/test/scala/gr/grnet/aquarium/BillTest.scala b/src/test/scala/gr/grnet/aquarium/BillTest.scala
index e1f8b9f..f32521a 100644 (file)
--- a/src/test/scala/gr/grnet/aquarium/BillTest.scala
+++ b/src/test/scala/gr/grnet/aquarium/BillTest.scala
@@ -508,6 +508,7 @@ class User(serverAndPort:String,month:Int) {
 
   def addFiles(no:Int,action:String/*,value:Int,minVal:Int,maxVal:Int*/,spec:String) : User =
     add(no,"disk",{i =>
+       Console.err.println("Adding file : " + "/Papers/file_%d.PDF".format(i))
        Map("action" -> action,
            "path"->"/Papers/file_%d.PDF".format(i),
            //"value"->UID.random(minVal,maxVal).toString,