Skip to content

Commit 2fe657d

Browse files
ReamerReamer
committed
Remove raw types for AngularObject
1 parent e928edb commit 2fe657d

File tree

17 files changed

+79
-87
lines changed

17 files changed

+79
-87
lines changed

‎spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularElem.scala‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import scala.xml._
2929
*/
3030
abstract class AbstractAngularElem(val interpreterContext: InterpreterContext,
3131
val modelName: String,
32-
val angularObjects: Map[String, AngularObject[Any]],
32+
val angularObjects: Map[String, AngularObject],
3333
prefix: String,
3434
label: String,
3535
attributes1: MetaData,
@@ -70,7 +70,7 @@ abstract class AbstractAngularElem(val interpreterContext: InterpreterContext,
7070
* @return
7171
*/
7272
@ZeppelinApi
73-
def model(name: String, value: Any): AbstractAngularElem = {
73+
def model(name: String, value: AnyRef): AbstractAngularElem = {
7474
val registry = interpreterContext.getAngularObjectRegistry
7575

7676
// create AngularFunction in current paragraph
@@ -79,7 +79,7 @@ abstract class AbstractAngularElem(val interpreterContext: InterpreterContext,
7979
Null)
8080

8181
val angularObject = addAngularObject(name, value)
82-
.asInstanceOf[AngularObject[Any]]
82+
.asInstanceOf[AngularObject]
8383

8484
newElem(
8585
interpreterContext,
@@ -111,7 +111,7 @@ abstract class AbstractAngularElem(val interpreterContext: InterpreterContext,
111111
* @return
112112
*/
113113
@ZeppelinApi
114-
def model(): Any = {
114+
def model(): AnyRef = {
115115
if (angularObjects.contains(modelName)) {
116116
angularObjects(modelName).get()
117117
} else {
@@ -134,7 +134,7 @@ abstract class AbstractAngularElem(val interpreterContext: InterpreterContext,
134134
Text(s"${functionName}=${functionName} + 1"),
135135
Null)
136136

137-
val angularObject = addAngularObject(functionName, 0)
137+
val angularObject = addAngularObject(functionName, Int.box(0))
138138

139139
angularObject.addWatcher(new AngularObjectWatcher(interpreterContext) {
140140
override def watch(oldObject: scala.Any, newObject: scala.Any, context: InterpreterContext)
@@ -151,11 +151,11 @@ abstract class AbstractAngularElem(val interpreterContext: InterpreterContext,
151151
elem)
152152
}
153153

154-
protected def addAngularObject(name: String, value: Any): AngularObject[Any]
154+
protected def addAngularObject(name: String, value: AnyRef): AngularObject
155155

156156
protected def newElem(interpreterContext: InterpreterContext,
157157
name: String,
158-
angularObjects: Map[String, AngularObject[Any]],
158+
angularObjects: Map[String, AngularObject],
159159
elem: scala.xml.Elem): AbstractAngularElem
160160

161161
/**

‎spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/AbstractAngularModel.scala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ abstract class AbstractAngularModel(name: String) {
3535
* @param newValue value
3636
*/
3737
@ZeppelinApi
38-
def this(name: String, newValue: Any) = {
38+
def this(name: String, newValue: AnyRef) = {
3939
this(name)
4040
value(newValue)
4141
}
4242

43-
protected def getAngularObject(): AngularObject[Any]
44-
protected def addAngularObject(value: Any): AngularObject[Any]
43+
protected def getAngularObject(): AngularObject
44+
protected def addAngularObject(value: AnyRef): AngularObject
4545

4646
/**
4747
* Get value of the model
4848
*
4949
* @return
5050
*/
5151
@ZeppelinApi
52-
def apply(): Any = {
52+
def apply(): AnyRef = {
5353
value()
5454
}
5555

@@ -59,7 +59,7 @@ abstract class AbstractAngularModel(name: String) {
5959
* @return
6060
*/
6161
@ZeppelinApi
62-
def value(): Any = {
62+
def value(): AnyRef = {
6363
val angularObject = getAngularObject()
6464
if (angularObject == null) {
6565
None
@@ -69,7 +69,7 @@ abstract class AbstractAngularModel(name: String) {
6969
}
7070

7171
@ZeppelinApi
72-
def apply(newValue: Any): Unit = {
72+
def apply(newValue: AnyRef): Unit = {
7373
value(newValue)
7474
}
7575

@@ -80,7 +80,7 @@ abstract class AbstractAngularModel(name: String) {
8080
* @param newValue
8181
*/
8282
@ZeppelinApi
83-
def value(newValue: Any): Unit = {
83+
def value(newValue: AnyRef): Unit = {
8484
var angularObject = getAngularObject()
8585
if (angularObject == null) {
8686
// create new object
@@ -92,7 +92,7 @@ abstract class AbstractAngularModel(name: String) {
9292
}
9393

9494
@ZeppelinApi
95-
def remove(): Any = {
95+
def remove(): AnyRef = {
9696
val angularObject = getAngularObject()
9797

9898
if (angularObject == null) {

‎spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularElem.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import scala.xml._
2929
*/
3030
class AngularElem(override val interpreterContext: InterpreterContext,
3131
override val modelName: String,
32-
override val angularObjects: Map[String, AngularObject[Any]],
32+
override val angularObjects: Map[String, AngularObject],
3333
prefix: String,
3434
label: String,
3535
attributes1: MetaData,
@@ -40,15 +40,15 @@ class AngularElem(override val interpreterContext: InterpreterContext,
4040
interpreterContext, modelName, angularObjects, prefix, label, attributes1, scope,
4141
minimizeEmpty, child: _*) {
4242

43-
override protected def addAngularObject(name: String, value: Any): AngularObject[Any] = {
43+
override protected def addAngularObject(name: String, value: AnyRef): AngularObject = {
4444
val registry = interpreterContext.getAngularObjectRegistry
45-
registry.add(name, value, interpreterContext.getNoteId, null).asInstanceOf[AngularObject[Any]]
45+
registry.add(name, value, interpreterContext.getNoteId, null).asInstanceOf[AngularObject]
4646

4747
}
4848

4949
override protected def newElem(interpreterContext: InterpreterContext,
5050
name: String,
51-
angularObjects: Map[String, AngularObject[Any]],
51+
angularObjects: Map[String, AngularObject],
5252
elem: scala.xml.Elem): angular.AbstractAngularElem = {
5353
new AngularElem(
5454
interpreterContext,
@@ -66,7 +66,7 @@ class AngularElem(override val interpreterContext: InterpreterContext,
6666
object AngularElem {
6767
implicit def Elem2AngularDisplayElem(elem: Elem): AbstractAngularElem = {
6868
new AngularElem(InterpreterContext.get(), null,
69-
Map[String, AngularObject[Any]](),
69+
Map[String, AngularObject](),
7070
elem.prefix, elem.label, elem.attributes, elem.scope, elem.minimizeEmpty, elem.child:_*);
7171
}
7272

‎spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModel.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ import org.apache.zeppelin.interpreter.InterpreterContext
2626
class AngularModel(name: String)
2727
extends org.apache.zeppelin.display.angular.AbstractAngularModel(name) {
2828

29-
def this(name: String, newValue: Any) = {
29+
def this(name: String, newValue: AnyRef) = {
3030
this(name)
3131
value(newValue)
3232
}
3333

34-
override protected def getAngularObject(): AngularObject[Any] = {
35-
registry.get(name, context.getNoteId, null).asInstanceOf[AngularObject[Any]]
34+
override protected def getAngularObject(): AngularObject = {
35+
registry.get(name, context.getNoteId, null).asInstanceOf[AngularObject]
3636
}
3737

38-
override protected def addAngularObject(value: Any): AngularObject[Any] = {
39-
registry.add(name, value, context.getNoteId, null).asInstanceOf[AngularObject[Any]]
38+
override protected def addAngularObject(value: AnyRef): AngularObject = {
39+
registry.add(name, value, context.getNoteId, null).asInstanceOf[AngularObject]
4040
}
4141
}
4242

@@ -46,7 +46,7 @@ object AngularModel {
4646
new AngularModel(name)
4747
}
4848

49-
def apply(name: String, newValue: Any): AbstractAngularModel = {
49+
def apply(name: String, newValue: AnyRef): AbstractAngularModel = {
5050
new AngularModel(name, newValue)
5151
}
5252
}

‎spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularElem.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import scala.xml._
3030
*/
3131
class AngularElem(override val interpreterContext: InterpreterContext,
3232
override val modelName: String,
33-
override val angularObjects: Map[String, AngularObject[Any]],
33+
override val angularObjects: Map[String, AngularObject],
3434
prefix: String,
3535
label: String,
3636
attributes1: MetaData,
@@ -41,16 +41,16 @@ class AngularElem(override val interpreterContext: InterpreterContext,
4141
interpreterContext, modelName, angularObjects, prefix, label, attributes1, scope,
4242
minimizeEmpty, child: _*) {
4343

44-
override protected def addAngularObject(name: String, value: Any): AngularObject[Any] = {
44+
override protected def addAngularObject(name: String, value: Object): AngularObject = {
4545
val registry = interpreterContext.getAngularObjectRegistry
4646
registry.add(name, value, interpreterContext.getNoteId, interpreterContext.getParagraphId)
47-
.asInstanceOf[AngularObject[Any]]
47+
.asInstanceOf[AngularObject]
4848

4949
}
5050

5151
override protected def newElem(interpreterContext: InterpreterContext,
5252
name: String,
53-
angularObjects: Map[String, AngularObject[Any]],
53+
angularObjects: Map[String, AngularObject],
5454
elem: scala.xml.Elem): angular.AbstractAngularElem = {
5555
new AngularElem(
5656
interpreterContext,
@@ -68,7 +68,7 @@ class AngularElem(override val interpreterContext: InterpreterContext,
6868
object AngularElem {
6969
implicit def Elem2AngularDisplayElem(elem: Elem): AbstractAngularElem = {
7070
new AngularElem(InterpreterContext.get(), null,
71-
Map[String, AngularObject[Any]](),
71+
Map[String, AngularObject](),
7272
elem.prefix, elem.label, elem.attributes, elem.scope, elem.minimizeEmpty, elem.child:_*);
7373
}
7474

‎spark/interpreter/src/main/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModel.scala‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ import org.apache.zeppelin.display.angular.AbstractAngularModel
2525
class AngularModel(name: String)
2626
extends org.apache.zeppelin.display.angular.AbstractAngularModel(name) {
2727

28-
def this(name: String, newValue: Any) = {
28+
def this(name: String, newValue: AnyRef) = {
2929
this(name)
3030
value(newValue)
3131
}
3232

33-
override protected def getAngularObject(): AngularObject[Any] = {
33+
override protected def getAngularObject(): AngularObject = {
3434
registry.get(name,
35-
context.getNoteId, context.getParagraphId).asInstanceOf[AngularObject[Any]]
35+
context.getNoteId, context.getParagraphId).asInstanceOf[AngularObject]
3636
}
3737

38-
override protected def addAngularObject(value: Any): AngularObject[Any] = {
38+
override protected def addAngularObject(value: AnyRef): AngularObject = {
3939
registry.add(name, value,
40-
context.getNoteId, context.getParagraphId).asInstanceOf[AngularObject[Any]]
40+
context.getNoteId, context.getParagraphId).asInstanceOf[AngularObject]
4141
}
4242
}
4343

@@ -47,7 +47,7 @@ object AngularModel {
4747
new AngularModel(name)
4848
}
4949

50-
def apply(name: String, newValue: Any): AbstractAngularModel = {
50+
def apply(name: String, newValue: AnyRef): AbstractAngularModel = {
5151
new AngularModel(name, newValue)
5252
}
5353
}

‎spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularElemTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ trait AbstractAngularElemTest
142142

143143
// simulate click
144144
def fireEvent(eventName: String, elem: org.apache.zeppelin.display.angular.AbstractAngularElem) = {
145-
val angularObject: AngularObject[Any] = elem.angularObjects(eventName);
145+
val angularObject: AngularObject = elem.angularObjects(eventName);
146146
angularObject.set("event");
147147
}
148148
}

‎spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/AbstractAngularModelTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ with BeforeAndAfter with BeforeAndAfterEach with Eventually {
4141
}
4242

4343
def angularModel(name: String): AbstractAngularModel
44-
def angularModel(name: String, value: Any): AbstractAngularModel
44+
def angularModel(name: String, value: AnyRef): AbstractAngularModel
4545

4646
"AngularModel" should "able to create AngularObject" in {
4747
val registry = InterpreterContext.get().getAngularObjectRegistry

‎spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/notebookscope/AngularModelTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AngularModelTest extends AbstractAngularModelTest {
2626
AngularModel(name)
2727
}
2828

29-
override def angularModel(name: String, value: Any): AbstractAngularModel = {
29+
override def angularModel(name: String, value: AnyRef): AbstractAngularModel = {
3030
AngularModel(name, value)
3131
}
3232
}

‎spark/interpreter/src/test/scala/org/apache/zeppelin/display/angular/paragraphscope/AngularModelTest.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AngularModelTest extends AbstractAngularModelTest {
2626
AngularModel(name)
2727
}
2828

29-
override def angularModel(name: String, value: Any): AbstractAngularModel = {
29+
override def angularModel(name: String, value: AnyRef): AbstractAngularModel = {
3030
AngularModel(name, value)
3131
}
3232
}

0 commit comments

Comments
 (0)