Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
djinni
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
djinni
Commits
3aa7b6e8
Commit
3aa7b6e8
authored
May 26, 2015
by
Danny Weinberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add nullity annotations to the test suite and example project
parent
02cd03e1
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
117 additions
and
24 deletions
+117
-24
example/android/app/build.gradle
example/android/app/build.gradle
+1
-0
example/generated-src/java/com/dropbox/textsort/ItemList.java
...ple/generated-src/java/com/dropbox/textsort/ItemList.java
+4
-1
example/generated-src/java/com/dropbox/textsort/SortItems.java
...le/generated-src/java/com/dropbox/textsort/SortItems.java
+4
-1
example/generated-src/java/com/dropbox/textsort/SortOrder.java
...le/generated-src/java/com/dropbox/textsort/SortOrder.java
+3
-0
example/generated-src/java/com/dropbox/textsort/TextboxListener.java
...erated-src/java/com/dropbox/textsort/TextboxListener.java
+4
-1
example/run_djinni.sh
example/run_djinni.sh
+2
-0
test-suite/generated-src/java/com/dropbox/djinni/test/AssortedIntegers.java
...ed-src/java/com/dropbox/djinni/test/AssortedIntegers.java
+12
-5
test-suite/generated-src/java/com/dropbox/djinni/test/ClientInterface.java
...ted-src/java/com/dropbox/djinni/test/ClientInterface.java
+6
-1
test-suite/generated-src/java/com/dropbox/djinni/test/ClientReturnedRecord.java
...rc/java/com/dropbox/djinni/test/ClientReturnedRecord.java
+7
-2
test-suite/generated-src/java/com/dropbox/djinni/test/Color.java
...ite/generated-src/java/com/dropbox/djinni/test/Color.java
+3
-0
test-suite/generated-src/java/com/dropbox/djinni/test/Constants.java
...generated-src/java/com/dropbox/djinni/test/Constants.java
+8
-1
test-suite/generated-src/java/com/dropbox/djinni/test/ConstantsInterface.java
...-src/java/com/dropbox/djinni/test/ConstantsInterface.java
+2
-0
test-suite/generated-src/java/com/dropbox/djinni/test/CppException.java
...erated-src/java/com/dropbox/djinni/test/CppException.java
+3
-0
test-suite/generated-src/java/com/dropbox/djinni/test/DateRecord.java
...enerated-src/java/com/dropbox/djinni/test/DateRecord.java
+4
-1
test-suite/generated-src/java/com/dropbox/djinni/test/MapDateRecord.java
...rated-src/java/com/dropbox/djinni/test/MapDateRecord.java
+4
-1
test-suite/generated-src/java/com/dropbox/djinni/test/MapListRecord.java
...rated-src/java/com/dropbox/djinni/test/MapListRecord.java
+4
-1
test-suite/generated-src/java/com/dropbox/djinni/test/MapRecord.java
...generated-src/java/com/dropbox/djinni/test/MapRecord.java
+4
-1
test-suite/generated-src/java/com/dropbox/djinni/test/NestedCollection.java
...ed-src/java/com/dropbox/djinni/test/NestedCollection.java
+4
-1
test-suite/generated-src/java/com/dropbox/djinni/test/PrimitiveList.java
...rated-src/java/com/dropbox/djinni/test/PrimitiveList.java
+4
-1
test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithDerivings.java
...src/java/com/dropbox/djinni/test/RecordWithDerivings.java
+6
-2
test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithNestedDerivings.java
...va/com/dropbox/djinni/test/RecordWithNestedDerivings.java
+6
-2
test-suite/generated-src/java/com/dropbox/djinni/test/SetRecord.java
...generated-src/java/com/dropbox/djinni/test/SetRecord.java
+4
-1
test-suite/generated-src/java/com/dropbox/djinni/test/TestHelpers.java
...nerated-src/java/com/dropbox/djinni/test/TestHelpers.java
+13
-0
test-suite/generated-src/java/com/dropbox/djinni/test/Token.java
...ite/generated-src/java/com/dropbox/djinni/test/Token.java
+2
-0
test-suite/java/build.xml
test-suite/java/build.xml
+1
-1
test-suite/java/jsr305-3.0.0.jar
test-suite/java/jsr305-3.0.0.jar
+0
-0
test-suite/run_djinni.sh
test-suite/run_djinni.sh
+2
-0
No files found.
example/android/app/build.gradle
View file @
3aa7b6e8
...
@@ -28,6 +28,7 @@ android {
...
@@ -28,6 +28,7 @@ android {
dependencies
{
dependencies
{
compile
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
compile
fileTree
(
dir:
'libs'
,
include:
[
'*.jar'
])
compile
'com.google.code.findbugs:jsr305:3.0.0'
}
}
task
ndkBuild
(
type:
Exec
)
{
task
ndkBuild
(
type:
Exec
)
{
...
...
example/generated-src/java/com/dropbox/textsort/ItemList.java
View file @
3aa7b6e8
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
package
com.dropbox.textsort
;
package
com.dropbox.textsort
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
ItemList
{
public
final
class
ItemList
{
...
@@ -11,10 +13,11 @@ public final class ItemList {
...
@@ -11,10 +13,11 @@ public final class ItemList {
/*package*/
final
ArrayList
<
String
>
mItems
;
/*package*/
final
ArrayList
<
String
>
mItems
;
public
ItemList
(
public
ItemList
(
ArrayList
<
String
>
items
)
{
@Nonnull
ArrayList
<
String
>
items
)
{
this
.
mItems
=
items
;
this
.
mItems
=
items
;
}
}
@Nonnull
public
ArrayList
<
String
>
getItems
()
{
public
ArrayList
<
String
>
getItems
()
{
return
mItems
;
return
mItems
;
}
}
...
...
example/generated-src/java/com/dropbox/textsort/SortItems.java
View file @
3aa7b6e8
...
@@ -4,10 +4,13 @@
...
@@ -4,10 +4,13 @@
package
com.dropbox.textsort
;
package
com.dropbox.textsort
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
abstract
class
SortItems
{
public
abstract
class
SortItems
{
public
abstract
void
sort
(
SortOrder
order
,
ItemList
items
);
public
abstract
void
sort
(
@Nonnull
SortOrder
order
,
@Nonnull
ItemList
items
);
@Nonnull
public
static
native
SortItems
createWithListener
(
TextboxListener
listener
);
public
static
native
SortItems
createWithListener
(
TextboxListener
listener
);
public
static
final
class
CppProxy
extends
SortItems
public
static
final
class
CppProxy
extends
SortItems
...
...
example/generated-src/java/com/dropbox/textsort/SortOrder.java
View file @
3aa7b6e8
...
@@ -3,6 +3,9 @@
...
@@ -3,6 +3,9 @@
package
com.dropbox.textsort
;
package
com.dropbox.textsort
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
enum
SortOrder
{
public
enum
SortOrder
{
ASCENDING
,
ASCENDING
,
DESCENDING
,
DESCENDING
,
...
...
example/generated-src/java/com/dropbox/textsort/TextboxListener.java
View file @
3aa7b6e8
...
@@ -3,6 +3,9 @@
...
@@ -3,6 +3,9 @@
package
com.dropbox.textsort
;
package
com.dropbox.textsort
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
abstract
class
TextboxListener
{
public
abstract
class
TextboxListener
{
public
abstract
void
update
(
ItemList
items
);
public
abstract
void
update
(
@Nonnull
ItemList
items
);
}
}
example/run_djinni.sh
View file @
3aa7b6e8
...
@@ -53,6 +53,8 @@ fi
...
@@ -53,6 +53,8 @@ fi
"
$base_dir
/../src/run-assume-built"
\
"
$base_dir
/../src/run-assume-built"
\
--java-out
"
$temp_out
/java"
\
--java-out
"
$temp_out
/java"
\
--java-package
$java_package
\
--java-package
$java_package
\
--java-nullable-annotation
"javax.annotation.CheckForNull"
\
--java-nonnull-annotation
"javax.annotation.Nonnull"
\
--ident-java-field
mFooBar
\
--ident-java-field
mFooBar
\
\
\
--cpp-out
"
$temp_out
/cpp"
\
--cpp-out
"
$temp_out
/cpp"
\
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/AssortedIntegers.java
View file @
3aa7b6e8
...
@@ -3,6 +3,9 @@
...
@@ -3,6 +3,9 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
AssortedIntegers
{
public
final
class
AssortedIntegers
{
...
@@ -27,10 +30,10 @@ public final class AssortedIntegers {
...
@@ -27,10 +30,10 @@ public final class AssortedIntegers {
short
sixteen
,
short
sixteen
,
int
thirtytwo
,
int
thirtytwo
,
long
sixtyfour
,
long
sixtyfour
,
Byte
oEight
,
@CheckForNull
Byte
oEight
,
Short
oSixteen
,
@CheckForNull
Short
oSixteen
,
Integer
oThirtytwo
,
@CheckForNull
Integer
oThirtytwo
,
Long
oSixtyfour
)
{
@CheckForNull
Long
oSixtyfour
)
{
this
.
mEight
=
eight
;
this
.
mEight
=
eight
;
this
.
mSixteen
=
sixteen
;
this
.
mSixteen
=
sixteen
;
this
.
mThirtytwo
=
thirtytwo
;
this
.
mThirtytwo
=
thirtytwo
;
...
@@ -57,24 +60,28 @@ public final class AssortedIntegers {
...
@@ -57,24 +60,28 @@ public final class AssortedIntegers {
return
mSixtyfour
;
return
mSixtyfour
;
}
}
@CheckForNull
public
Byte
getOEight
()
{
public
Byte
getOEight
()
{
return
mOEight
;
return
mOEight
;
}
}
@CheckForNull
public
Short
getOSixteen
()
{
public
Short
getOSixteen
()
{
return
mOSixteen
;
return
mOSixteen
;
}
}
@CheckForNull
public
Integer
getOThirtytwo
()
{
public
Integer
getOThirtytwo
()
{
return
mOThirtytwo
;
return
mOThirtytwo
;
}
}
@CheckForNull
public
Long
getOSixtyfour
()
{
public
Long
getOSixtyfour
()
{
return
mOSixtyfour
;
return
mOSixtyfour
;
}
}
@Override
@Override
public
boolean
equals
(
Object
obj
)
{
public
boolean
equals
(
@CheckForNull
Object
obj
)
{
if
(!(
obj
instanceof
AssortedIntegers
))
{
if
(!(
obj
instanceof
AssortedIntegers
))
{
return
false
;
return
false
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/ClientInterface.java
View file @
3aa7b6e8
...
@@ -3,9 +3,14 @@
...
@@ -3,9 +3,14 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
abstract
class
ClientInterface
{
public
abstract
class
ClientInterface
{
/** Returns record of given string */
/** Returns record of given string */
public
abstract
ClientReturnedRecord
getRecord
(
long
recordId
,
String
utf8string
,
String
misc
);
@Nonnull
public
abstract
ClientReturnedRecord
getRecord
(
long
recordId
,
@Nonnull
String
utf8string
,
@CheckForNull
String
misc
);
@Nonnull
public
abstract
String
returnStr
();
public
abstract
String
returnStr
();
}
}
test-suite/generated-src/java/com/dropbox/djinni/test/ClientReturnedRecord.java
View file @
3aa7b6e8
...
@@ -3,6 +3,9 @@
...
@@ -3,6 +3,9 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
ClientReturnedRecord
{
public
final
class
ClientReturnedRecord
{
...
@@ -14,8 +17,8 @@ public final class ClientReturnedRecord {
...
@@ -14,8 +17,8 @@ public final class ClientReturnedRecord {
public
ClientReturnedRecord
(
public
ClientReturnedRecord
(
long
recordId
,
long
recordId
,
String
content
,
@Nonnull
String
content
,
String
misc
)
{
@CheckForNull
String
misc
)
{
this
.
mRecordId
=
recordId
;
this
.
mRecordId
=
recordId
;
this
.
mContent
=
content
;
this
.
mContent
=
content
;
this
.
mMisc
=
misc
;
this
.
mMisc
=
misc
;
...
@@ -25,10 +28,12 @@ public final class ClientReturnedRecord {
...
@@ -25,10 +28,12 @@ public final class ClientReturnedRecord {
return
mRecordId
;
return
mRecordId
;
}
}
@Nonnull
public
String
getContent
()
{
public
String
getContent
()
{
return
mContent
;
return
mContent
;
}
}
@CheckForNull
public
String
getMisc
()
{
public
String
getMisc
()
{
return
mMisc
;
return
mMisc
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/Color.java
View file @
3aa7b6e8
...
@@ -3,6 +3,9 @@
...
@@ -3,6 +3,9 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
enum
Color
{
public
enum
Color
{
RED
,
RED
,
ORANGE
,
ORANGE
,
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/Constants.java
View file @
3aa7b6e8
...
@@ -3,6 +3,9 @@
...
@@ -3,6 +3,9 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
Constants
{
public
final
class
Constants
{
public
static
final
boolean
BOOL_CONSTANT
=
true
;
public
static
final
boolean
BOOL_CONSTANT
=
true
;
...
@@ -17,10 +20,13 @@ public final class Constants {
...
@@ -17,10 +20,13 @@ public final class Constants {
public
static
final
double
F64_CONSTANT
=
5.0
;
public
static
final
double
F64_CONSTANT
=
5.0
;
@Nonnull
public
static
final
String
STRING_CONSTANT
=
"string-constant"
;
public
static
final
String
STRING_CONSTANT
=
"string-constant"
;
@CheckForNull
public
static
final
Integer
OPTIONAL_INTEGER_CONSTANT
=
1
;
public
static
final
Integer
OPTIONAL_INTEGER_CONSTANT
=
1
;
@Nonnull
public
static
final
Constants
OBJECT_CONSTANT
=
new
Constants
(
public
static
final
Constants
OBJECT_CONSTANT
=
new
Constants
(
I32_CONSTANT
/* mSomeInteger */
,
I32_CONSTANT
/* mSomeInteger */
,
STRING_CONSTANT
/* mSomeString */
);
STRING_CONSTANT
/* mSomeString */
);
...
@@ -32,7 +38,7 @@ public final class Constants {
...
@@ -32,7 +38,7 @@ public final class Constants {
public
Constants
(
public
Constants
(
int
someInteger
,
int
someInteger
,
String
someString
)
{
@Nonnull
String
someString
)
{
this
.
mSomeInteger
=
someInteger
;
this
.
mSomeInteger
=
someInteger
;
this
.
mSomeString
=
someString
;
this
.
mSomeString
=
someString
;
}
}
...
@@ -41,6 +47,7 @@ public final class Constants {
...
@@ -41,6 +47,7 @@ public final class Constants {
return
mSomeInteger
;
return
mSomeInteger
;
}
}
@Nonnull
public
String
getSomeString
()
{
public
String
getSomeString
()
{
return
mSomeString
;
return
mSomeString
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/ConstantsInterface.java
View file @
3aa7b6e8
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
abstract
class
ConstantsInterface
{
public
abstract
class
ConstantsInterface
{
public
static
final
boolean
BOOL_CONSTANT
=
true
;
public
static
final
boolean
BOOL_CONSTANT
=
true
;
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/CppException.java
View file @
3aa7b6e8
...
@@ -4,10 +4,13 @@
...
@@ -4,10 +4,13 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
abstract
class
CppException
{
public
abstract
class
CppException
{
public
abstract
int
throwAnException
();
public
abstract
int
throwAnException
();
@Nonnull
public
static
native
CppException
get
();
public
static
native
CppException
get
();
public
static
final
class
CppProxy
extends
CppException
public
static
final
class
CppProxy
extends
CppException
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/DateRecord.java
View file @
3aa7b6e8
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
java.util.Date
;
import
java.util.Date
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
DateRecord
{
public
final
class
DateRecord
{
...
@@ -11,10 +13,11 @@ public final class DateRecord {
...
@@ -11,10 +13,11 @@ public final class DateRecord {
/*package*/
final
Date
mCreatedAt
;
/*package*/
final
Date
mCreatedAt
;
public
DateRecord
(
public
DateRecord
(
Date
createdAt
)
{
@Nonnull
Date
createdAt
)
{
this
.
mCreatedAt
=
createdAt
;
this
.
mCreatedAt
=
createdAt
;
}
}
@Nonnull
public
Date
getCreatedAt
()
{
public
Date
getCreatedAt
()
{
return
mCreatedAt
;
return
mCreatedAt
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/MapDateRecord.java
View file @
3aa7b6e8
...
@@ -5,6 +5,8 @@ package com.dropbox.djinni.test;
...
@@ -5,6 +5,8 @@ package com.dropbox.djinni.test;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
MapDateRecord
{
public
final
class
MapDateRecord
{
...
@@ -12,10 +14,11 @@ public final class MapDateRecord {
...
@@ -12,10 +14,11 @@ public final class MapDateRecord {
/*package*/
final
HashMap
<
String
,
Date
>
mDatesById
;
/*package*/
final
HashMap
<
String
,
Date
>
mDatesById
;
public
MapDateRecord
(
public
MapDateRecord
(
HashMap
<
String
,
Date
>
datesById
)
{
@Nonnull
HashMap
<
String
,
Date
>
datesById
)
{
this
.
mDatesById
=
datesById
;
this
.
mDatesById
=
datesById
;
}
}
@Nonnull
public
HashMap
<
String
,
Date
>
getDatesById
()
{
public
HashMap
<
String
,
Date
>
getDatesById
()
{
return
mDatesById
;
return
mDatesById
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/MapListRecord.java
View file @
3aa7b6e8
...
@@ -5,6 +5,8 @@ package com.dropbox.djinni.test;
...
@@ -5,6 +5,8 @@ package com.dropbox.djinni.test;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
MapListRecord
{
public
final
class
MapListRecord
{
...
@@ -12,10 +14,11 @@ public final class MapListRecord {
...
@@ -12,10 +14,11 @@ public final class MapListRecord {
/*package*/
final
ArrayList
<
HashMap
<
String
,
Long
>>
mMapList
;
/*package*/
final
ArrayList
<
HashMap
<
String
,
Long
>>
mMapList
;
public
MapListRecord
(
public
MapListRecord
(
ArrayList
<
HashMap
<
String
,
Long
>>
mapList
)
{
@Nonnull
ArrayList
<
HashMap
<
String
,
Long
>>
mapList
)
{
this
.
mMapList
=
mapList
;
this
.
mMapList
=
mapList
;
}
}
@Nonnull
public
ArrayList
<
HashMap
<
String
,
Long
>>
getMapList
()
{
public
ArrayList
<
HashMap
<
String
,
Long
>>
getMapList
()
{
return
mMapList
;
return
mMapList
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/MapRecord.java
View file @
3aa7b6e8
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
MapRecord
{
public
final
class
MapRecord
{
...
@@ -11,10 +13,11 @@ public final class MapRecord {
...
@@ -11,10 +13,11 @@ public final class MapRecord {
/*package*/
final
HashMap
<
String
,
Long
>
mMap
;
/*package*/
final
HashMap
<
String
,
Long
>
mMap
;
public
MapRecord
(
public
MapRecord
(
HashMap
<
String
,
Long
>
map
)
{
@Nonnull
HashMap
<
String
,
Long
>
map
)
{
this
.
mMap
=
map
;
this
.
mMap
=
map
;
}
}
@Nonnull
public
HashMap
<
String
,
Long
>
getMap
()
{
public
HashMap
<
String
,
Long
>
getMap
()
{
return
mMap
;
return
mMap
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/NestedCollection.java
View file @
3aa7b6e8
...
@@ -5,6 +5,8 @@ package com.dropbox.djinni.test;
...
@@ -5,6 +5,8 @@ package com.dropbox.djinni.test;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
NestedCollection
{
public
final
class
NestedCollection
{
...
@@ -12,10 +14,11 @@ public final class NestedCollection {
...
@@ -12,10 +14,11 @@ public final class NestedCollection {
/*package*/
final
ArrayList
<
HashSet
<
String
>>
mSetList
;
/*package*/
final
ArrayList
<
HashSet
<
String
>>
mSetList
;
public
NestedCollection
(
public
NestedCollection
(
ArrayList
<
HashSet
<
String
>>
setList
)
{
@Nonnull
ArrayList
<
HashSet
<
String
>>
setList
)
{
this
.
mSetList
=
setList
;
this
.
mSetList
=
setList
;
}
}
@Nonnull
public
ArrayList
<
HashSet
<
String
>>
getSetList
()
{
public
ArrayList
<
HashSet
<
String
>>
getSetList
()
{
return
mSetList
;
return
mSetList
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/PrimitiveList.java
View file @
3aa7b6e8
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
PrimitiveList
{
public
final
class
PrimitiveList
{
...
@@ -11,10 +13,11 @@ public final class PrimitiveList {
...
@@ -11,10 +13,11 @@ public final class PrimitiveList {
/*package*/
final
ArrayList
<
Long
>
mList
;
/*package*/
final
ArrayList
<
Long
>
mList
;
public
PrimitiveList
(
public
PrimitiveList
(
ArrayList
<
Long
>
list
)
{
@Nonnull
ArrayList
<
Long
>
list
)
{
this
.
mList
=
list
;
this
.
mList
=
list
;
}
}
@Nonnull
public
ArrayList
<
Long
>
getList
()
{
public
ArrayList
<
Long
>
getList
()
{
return
mList
;
return
mList
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithDerivings.java
View file @
3aa7b6e8
...
@@ -3,6 +3,9 @@
...
@@ -3,6 +3,9 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
RecordWithDerivings
implements
Comparable
<
RecordWithDerivings
>
{
public
final
class
RecordWithDerivings
implements
Comparable
<
RecordWithDerivings
>
{
...
@@ -12,7 +15,7 @@ public final class RecordWithDerivings implements Comparable<RecordWithDerivings
...
@@ -12,7 +15,7 @@ public final class RecordWithDerivings implements Comparable<RecordWithDerivings
public
RecordWithDerivings
(
public
RecordWithDerivings
(
int
key1
,
int
key1
,
String
key2
)
{
@Nonnull
String
key2
)
{
this
.
mKey1
=
key1
;
this
.
mKey1
=
key1
;
this
.
mKey2
=
key2
;
this
.
mKey2
=
key2
;
}
}
...
@@ -21,12 +24,13 @@ public final class RecordWithDerivings implements Comparable<RecordWithDerivings
...
@@ -21,12 +24,13 @@ public final class RecordWithDerivings implements Comparable<RecordWithDerivings
return
mKey1
;
return
mKey1
;
}
}
@Nonnull
public
String
getKey2
()
{
public
String
getKey2
()
{
return
mKey2
;
return
mKey2
;
}
}
@Override
@Override
public
boolean
equals
(
Object
obj
)
{
public
boolean
equals
(
@CheckForNull
Object
obj
)
{
if
(!(
obj
instanceof
RecordWithDerivings
))
{
if
(!(
obj
instanceof
RecordWithDerivings
))
{
return
false
;
return
false
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/RecordWithNestedDerivings.java
View file @
3aa7b6e8
...
@@ -3,6 +3,9 @@
...
@@ -3,6 +3,9 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
RecordWithNestedDerivings
implements
Comparable
<
RecordWithNestedDerivings
>
{
public
final
class
RecordWithNestedDerivings
implements
Comparable
<
RecordWithNestedDerivings
>
{
...
@@ -12,7 +15,7 @@ public final class RecordWithNestedDerivings implements Comparable<RecordWithNes
...
@@ -12,7 +15,7 @@ public final class RecordWithNestedDerivings implements Comparable<RecordWithNes
public
RecordWithNestedDerivings
(
public
RecordWithNestedDerivings
(
int
key
,
int
key
,
RecordWithDerivings
rec
)
{
@Nonnull
RecordWithDerivings
rec
)
{
this
.
mKey
=
key
;
this
.
mKey
=
key
;
this
.
mRec
=
rec
;
this
.
mRec
=
rec
;
}
}
...
@@ -21,12 +24,13 @@ public final class RecordWithNestedDerivings implements Comparable<RecordWithNes
...
@@ -21,12 +24,13 @@ public final class RecordWithNestedDerivings implements Comparable<RecordWithNes
return
mKey
;
return
mKey
;
}
}
@Nonnull
public
RecordWithDerivings
getRec
()
{
public
RecordWithDerivings
getRec
()
{
return
mRec
;
return
mRec
;
}
}
@Override
@Override
public
boolean
equals
(
Object
obj
)
{
public
boolean
equals
(
@CheckForNull
Object
obj
)
{
if
(!(
obj
instanceof
RecordWithNestedDerivings
))
{
if
(!(
obj
instanceof
RecordWithNestedDerivings
))
{
return
false
;
return
false
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/SetRecord.java
View file @
3aa7b6e8
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
final
class
SetRecord
{
public
final
class
SetRecord
{
...
@@ -11,10 +13,11 @@ public final class SetRecord {
...
@@ -11,10 +13,11 @@ public final class SetRecord {
/*package*/
final
HashSet
<
String
>
mSet
;
/*package*/
final
HashSet
<
String
>
mSet
;
public
SetRecord
(
public
SetRecord
(
HashSet
<
String
>
set
)
{
@Nonnull
HashSet
<
String
>
set
)
{
this
.
mSet
=
set
;
this
.
mSet
=
set
;
}
}
@Nonnull
public
HashSet
<
String
>
getSet
()
{
public
HashSet
<
String
>
getSet
()
{
return
mSet
;
return
mSet
;
}
}
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/TestHelpers.java
View file @
3aa7b6e8
...
@@ -5,28 +5,36 @@ package com.dropbox.djinni.test;
...
@@ -5,28 +5,36 @@ package com.dropbox.djinni.test;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
abstract
class
TestHelpers
{
public
abstract
class
TestHelpers
{
@Nonnull
public
static
native
SetRecord
getSetRecord
();
public
static
native
SetRecord
getSetRecord
();
public
static
native
boolean
checkSetRecord
(
SetRecord
rec
);
public
static
native
boolean
checkSetRecord
(
SetRecord
rec
);
@Nonnull
public
static
native
PrimitiveList
getPrimitiveList
();
public
static
native
PrimitiveList
getPrimitiveList
();
public
static
native
boolean
checkPrimitiveList
(
PrimitiveList
pl
);
public
static
native
boolean
checkPrimitiveList
(
PrimitiveList
pl
);
@Nonnull
public
static
native
NestedCollection
getNestedCollection
();
public
static
native
NestedCollection
getNestedCollection
();
public
static
native
boolean
checkNestedCollection
(
NestedCollection
nc
);
public
static
native
boolean
checkNestedCollection
(
NestedCollection
nc
);
@Nonnull
public
static
native
HashMap
<
String
,
Long
>
getMap
();
public
static
native
HashMap
<
String
,
Long
>
getMap
();
public
static
native
boolean
checkMap
(
HashMap
<
String
,
Long
>
m
);
public
static
native
boolean
checkMap
(
HashMap
<
String
,
Long
>
m
);
@Nonnull
public
static
native
HashMap
<
String
,
Long
>
getEmptyMap
();
public
static
native
HashMap
<
String
,
Long
>
getEmptyMap
();
public
static
native
boolean
checkEmptyMap
(
HashMap
<
String
,
Long
>
m
);
public
static
native
boolean
checkEmptyMap
(
HashMap
<
String
,
Long
>
m
);
@Nonnull
public
static
native
MapListRecord
getMapListRecord
();
public
static
native
MapListRecord
getMapListRecord
();
public
static
native
boolean
checkMapListRecord
(
MapListRecord
m
);
public
static
native
boolean
checkMapListRecord
(
MapListRecord
m
);
...
@@ -39,19 +47,24 @@ public abstract class TestHelpers {
...
@@ -39,19 +47,24 @@ public abstract class TestHelpers {
public
static
native
void
checkEnum
(
Color
c
);
public
static
native
void
checkEnum
(
Color
c
);
@Nonnull
public
static
native
Token
tokenId
(
Token
t
);
public
static
native
Token
tokenId
(
Token
t
);
@Nonnull
public
static
native
Token
createCppToken
();
public
static
native
Token
createCppToken
();
public
static
native
void
checkCppToken
(
Token
t
);
public
static
native
void
checkCppToken
(
Token
t
);
public
static
native
long
cppTokenId
(
Token
t
);
public
static
native
long
cppTokenId
(
Token
t
);
@CheckForNull
public
static
native
Integer
returnNone
();
public
static
native
Integer
returnNone
();
/** Ensures that we generate integer translation code */
/** Ensures that we generate integer translation code */
@Nonnull
public
static
native
AssortedIntegers
assortedIntegersId
(
AssortedIntegers
i
);
public
static
native
AssortedIntegers
assortedIntegersId
(
AssortedIntegers
i
);
@Nonnull
public
static
native
byte
[]
idBinary
(
byte
[]
b
);
public
static
native
byte
[]
idBinary
(
byte
[]
b
);
public
static
final
class
CppProxy
extends
TestHelpers
public
static
final
class
CppProxy
extends
TestHelpers
...
...
test-suite/generated-src/java/com/dropbox/djinni/test/Token.java
View file @
3aa7b6e8
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
package
com.dropbox.djinni.test
;
package
com.dropbox.djinni.test
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
public
abstract
class
Token
{
public
abstract
class
Token
{
...
...
test-suite/java/build.xml
View file @
3aa7b6e8
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
</exec>
</exec>
<mkdir
dir=
"classes"
/>
<mkdir
dir=
"classes"
/>
<javac
destdir=
"classes"
>
<javac
destdir=
"classes"
>
<classpath
path=
"hamcrest-core-1.3.jar:junit-4.11.jar"
/>
<classpath
path=
"hamcrest-core-1.3.jar:junit-4.11.jar
:jsr305-3.0.0.jar
"
/>
<src
path=
"../generated-src"
/>
<src
path=
"../generated-src"
/>
<src
path=
"../handwritten-src"
/>
<src
path=
"../handwritten-src"
/>
</javac>
</javac>
...
...
test-suite/java/jsr305-3.0.0.jar
0 → 100644
View file @
3aa7b6e8
File added
test-suite/run_djinni.sh
View file @
3aa7b6e8
...
@@ -53,6 +53,8 @@ fi
...
@@ -53,6 +53,8 @@ fi
"
$base_dir
/../src/run-assume-built"
\
"
$base_dir
/../src/run-assume-built"
\
--java-out
"
$temp_out
/java"
\
--java-out
"
$temp_out
/java"
\
--java-package
$java_package
\
--java-package
$java_package
\
--java-nullable-annotation
"javax.annotation.CheckForNull"
\
--java-nonnull-annotation
"javax.annotation.Nonnull"
\
--ident-java-field
mFooBar
\
--ident-java-field
mFooBar
\
\
\
--cpp-out
"
$temp_out
/cpp"
\
--cpp-out
"
$temp_out
/cpp"
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment