@@ -88,17 +88,17 @@ public void close() throws IOException {
8888 }
8989
9090 @ Override
91- public < T extends VersionedData > T getInternal (VersionedDataKind <T > kind , String key ) {
91+ public VersionedData getInternal (VersionedDataKind <? > kind , String key ) {
9292 GetItemResult result = getItemByKeys (namespaceForKind (kind ), key );
9393 return unmarshalItem (kind , result .getItem ());
9494 }
9595
9696 @ Override
97- public < T extends VersionedData > Map <String , T > getAllInternal (VersionedDataKind <T > kind ) {
98- Map <String , T > itemsOut = new HashMap <>();
97+ public Map <String , VersionedData > getAllInternal (VersionedDataKind <? > kind ) {
98+ Map <String , VersionedData > itemsOut = new HashMap <>();
9999 for (QueryResult result : paginateQuery (makeQueryForKind (kind ))) {
100100 for (Map <String , AttributeValue > item : result .getItems ()) {
101- T itemOut = unmarshalItem (kind , item );
101+ VersionedData itemOut = unmarshalItem (kind , item );
102102 if (itemOut != null ) {
103103 itemsOut .put (itemOut .getKey (), itemOut );
104104 }
@@ -108,15 +108,15 @@ public <T extends VersionedData> Map<String, T> getAllInternal(VersionedDataKind
108108 }
109109
110110 @ Override
111- public void initInternal (Map <VersionedDataKind <?>, Map <String , ? extends VersionedData >> allData ) {
111+ public void initInternal (Map <VersionedDataKind <?>, Map <String , VersionedData >> allData ) {
112112 // Start by reading the existing keys; we will later delete any of these that weren't in allData.
113113 Set <Map .Entry <String , String >> unusedOldKeys = readExistingKeys (allData .keySet ());
114114
115115 List <WriteRequest > requests = new ArrayList <>();
116116 int numItems = 0 ;
117117
118118 // Insert or update every provided item
119- for (Map .Entry <VersionedDataKind <?>, Map <String , ? extends VersionedData >> entry : allData .entrySet ()) {
119+ for (Map .Entry <VersionedDataKind <?>, Map <String , VersionedData >> entry : allData .entrySet ()) {
120120 VersionedDataKind <?> kind = entry .getKey ();
121121 for (VersionedData item : entry .getValue ().values ()) {
122122 Map <String , AttributeValue > encodedItem = marshalItem (kind , item );
@@ -152,7 +152,7 @@ partitionKey, new AttributeValue(initedKey()),
152152 }
153153
154154 @ Override
155- public < T extends VersionedData > T upsertInternal (VersionedDataKind <T > kind , T item ) {
155+ public VersionedData upsertInternal (VersionedDataKind <? > kind , VersionedData item ) {
156156 Map <String , AttributeValue > encodedItem = marshalItem (kind , item );
157157
158158 if (updateHook != null ) { // instrumentation for tests
@@ -246,7 +246,7 @@ itemJsonAttribute, new AttributeValue(json)
246246 );
247247 }
248248
249- private < T extends VersionedData > T unmarshalItem (VersionedDataKind <T > kind , Map <String , AttributeValue > item ) {
249+ private VersionedData unmarshalItem (VersionedDataKind <? > kind , Map <String , AttributeValue > item ) {
250250 if (item == null || item .size () == 0 ) {
251251 return null ;
252252 }
0 commit comments