Project

General

Profile

« Previous | Next » 

Revision 7144

include Session-less interface methods and updated jars that define them.

View differences:

src/edu/ucsb/nceas/metacat/dataone/MNodeService.java
60 60
import org.dataone.service.mn.tier3.v1.MNStorage;
61 61
import org.dataone.service.mn.tier4.v1.MNReplication;
62 62
import org.dataone.service.types.v1.Checksum;
63
import org.dataone.service.types.v1.DescribeResponse;
63 64
import org.dataone.service.types.v1.Event;
64 65
import org.dataone.service.types.v1.Group;
65 66
import org.dataone.service.types.v1.Identifier;
......
1181 1182
			InvalidRequest {
1182 1183
		throw new NotImplemented("2194", "Member Node does not implement generateIdentifier method");
1183 1184
	}
1185

  
1186
	@Override
1187
	public boolean isAuthorized(Identifier pid, Permission permission)
1188
			throws ServiceFailure, InvalidRequest, InvalidToken, NotFound,
1189
			NotAuthorized, NotImplemented {
1190

  
1191
		return isAuthorized(null, pid, permission);
1192
	}
1193

  
1194
	@Override
1195
	public boolean systemMetadataChanged(Identifier pid, long serialVersion, Date dateSysMetaLastModified)
1196
			throws InvalidToken, ServiceFailure, NotAuthorized, NotImplemented,
1197
			InvalidRequest {
1198

  
1199
		return systemMetadataChanged(null, pid, serialVersion, dateSysMetaLastModified);
1200
	}
1201

  
1202
	@Override
1203
	public Log getLogRecords(Date fromDate, Date toDate, Event event, String pidFilter,
1204
			Integer start, Integer count) throws InvalidRequest, InvalidToken,
1205
			NotAuthorized, NotImplemented, ServiceFailure {
1206

  
1207
		return getLogRecords(null, fromDate, toDate, event, pidFilter, start, count);
1208
	}
1209

  
1210
	@Override
1211
	public DescribeResponse describe(Identifier pid) throws InvalidToken,
1212
			NotAuthorized, NotImplemented, ServiceFailure, NotFound {
1213

  
1214
		return describe(null, pid);
1215
	}
1216

  
1217
	@Override
1218
	public InputStream get(Identifier pid) throws InvalidToken, NotAuthorized,
1219
			NotImplemented, ServiceFailure, NotFound, InsufficientResources {
1220

  
1221
		return get(null, pid);
1222
	}
1223

  
1224
	@Override
1225
	public Checksum getChecksum(Identifier pid, String algorithm)
1226
			throws InvalidRequest, InvalidToken, NotAuthorized, NotImplemented,
1227
			ServiceFailure, NotFound {
1228

  
1229
		return getChecksum(null, pid, algorithm);
1230
	}
1231

  
1232
	@Override
1233
	public SystemMetadata getSystemMetadata(Identifier pid)
1234
			throws InvalidToken, NotAuthorized, NotImplemented, ServiceFailure,
1235
			NotFound {
1236

  
1237
		return getSystemMetadata(null, pid);
1238
	}
1239

  
1240
	@Override
1241
	public ObjectList listObjects(Date startTime, Date endTime,
1242
			ObjectFormatIdentifier objectFormatId, Boolean replicaStatus, Integer start,
1243
			Integer count) throws InvalidRequest, InvalidToken, NotAuthorized,
1244
			NotImplemented, ServiceFailure {
1245

  
1246
		return listObjects(null, startTime, endTime, objectFormatId, replicaStatus, start, count);
1247
	}
1248

  
1249
	@Override
1250
	public boolean synchronizationFailed(SynchronizationFailed syncFailed)
1251
			throws InvalidToken, NotAuthorized, NotImplemented, ServiceFailure {
1252

  
1253
		return synchronizationFailed(null, syncFailed);
1254
	}
1255

  
1256
	@Override
1257
	public InputStream getReplica(Identifier pid) throws InvalidToken,
1258
			NotAuthorized, NotImplemented, ServiceFailure, NotFound,
1259
			InsufficientResources {
1260

  
1261
		return getReplica(null, pid);
1262
	}
1263

  
1264
	@Override
1265
	public boolean replicate(SystemMetadata sysmeta, NodeReference sourceNode)
1266
			throws NotImplemented, ServiceFailure, NotAuthorized,
1267
			InvalidRequest, InvalidToken, InsufficientResources,
1268
			UnsupportedType {
1269

  
1270
		return replicate(null, sysmeta, sourceNode);
1271
	}
1272

  
1273
	@Override
1274
	public Identifier create(Identifier pid, InputStream object,
1275
			SystemMetadata sysmeta) throws IdentifierNotUnique,
1276
			InsufficientResources, InvalidRequest, InvalidSystemMetadata,
1277
			InvalidToken, NotAuthorized, NotImplemented, ServiceFailure,
1278
			UnsupportedType {
1279

  
1280
		return create(null, pid, object, sysmeta);
1281
	}
1282

  
1283
	@Override
1284
	public Identifier delete(Identifier pid) throws InvalidToken,
1285
			ServiceFailure, NotAuthorized, NotFound, NotImplemented {
1286

  
1287
		return delete(null, pid);
1288
	}
1289

  
1290
	@Override
1291
	public Identifier generateIdentifier(String arg0, String arg1)
1292
			throws InvalidToken, ServiceFailure, NotAuthorized, NotImplemented,
1293
			InvalidRequest {
1294

  
1295
		return generateIdentifier(null, arg0, arg1);
1296
	}
1297

  
1298
	@Override
1299
	public Identifier update(Identifier pid, InputStream object,
1300
			Identifier newPid, SystemMetadata sysmeta) throws IdentifierNotUnique,
1301
			InsufficientResources, InvalidRequest, InvalidSystemMetadata,
1302
			InvalidToken, NotAuthorized, NotImplemented, ServiceFailure,
1303
			UnsupportedType, NotFound {
1304

  
1305
		return update(null, pid, object, newPid, sysmeta);
1306
	}
1184 1307
    
1185 1308
}
src/edu/ucsb/nceas/metacat/dataone/CNodeService.java
56 56
import org.dataone.service.types.v1.AccessPolicy;
57 57
import org.dataone.service.types.v1.Checksum;
58 58
import org.dataone.service.types.v1.ChecksumAlgorithmList;
59
import org.dataone.service.types.v1.DescribeResponse;
60
import org.dataone.service.types.v1.Event;
59 61
import org.dataone.service.types.v1.Identifier;
62
import org.dataone.service.types.v1.Log;
60 63
import org.dataone.service.types.v1.Node;
61 64
import org.dataone.service.types.v1.NodeList;
62 65
import org.dataone.service.types.v1.NodeReference;
......
1598 1601
          }
1599 1602
      }
1600 1603
  }
1604

  
1605
	@Override
1606
	public boolean isAuthorized(Identifier pid, Permission permission)
1607
			throws ServiceFailure, InvalidToken, NotFound, NotAuthorized,
1608
			NotImplemented, InvalidRequest {
1609
		
1610
		return isAuthorized(null, pid, permission);
1611
	}
1612
	
1613
	@Override
1614
	public boolean setAccessPolicy(Identifier pid, AccessPolicy accessPolicy, long serialVersion)
1615
			throws InvalidToken, NotFound, NotImplemented, NotAuthorized,
1616
			ServiceFailure, InvalidRequest, VersionMismatch {
1617
		
1618
		return setAccessPolicy(null, pid, accessPolicy, serialVersion);
1619
	}
1620
	
1621
	@Override
1622
	public Identifier setRightsHolder(Identifier pid, Subject userId, long serialVersion)
1623
			throws InvalidToken, ServiceFailure, NotFound, NotAuthorized,
1624
			NotImplemented, InvalidRequest, VersionMismatch {
1625
		
1626
		return setRightsHolder(null, pid, userId, serialVersion);
1627
	}
1628
	
1629
	@Override
1630
	public Identifier create(Identifier pid, InputStream object, SystemMetadata sysmeta)
1631
			throws InvalidToken, ServiceFailure, NotAuthorized,
1632
			IdentifierNotUnique, UnsupportedType, InsufficientResources,
1633
			InvalidSystemMetadata, NotImplemented, InvalidRequest {
1634

  
1635
		return create(null, pid, object, sysmeta);
1636
	}
1637
	
1638
	@Override
1639
	public Identifier delete(Identifier pid) throws InvalidToken, ServiceFailure,
1640
			InvalidRequest, NotAuthorized, NotFound, NotImplemented {
1641

  
1642
		return delete(null, pid);
1643
	}
1644
	
1645
	@Override
1646
	public Identifier generateIdentifier(String scheme, String fragment)
1647
			throws InvalidToken, ServiceFailure, NotAuthorized, NotImplemented,
1648
			InvalidRequest {
1649

  
1650
		return generateIdentifier(null, scheme, fragment);
1651
	}
1652
	
1653
	@Override
1654
	public Log getLogRecords(Date fromDate, Date toDate, Event event, String pidFilter,
1655
			Integer start, Integer count) throws InvalidToken, InvalidRequest,
1656
			ServiceFailure, NotAuthorized, NotImplemented, InsufficientResources {
1657

  
1658
		return getLogRecords(null, fromDate, toDate, event, pidFilter, start, count);
1659
	}
1660
	
1661
	@Override
1662
	public boolean hasReservation(Subject subject, Identifier pid)
1663
			throws InvalidToken, ServiceFailure, NotFound, NotAuthorized,
1664
			NotImplemented, InvalidRequest, IdentifierNotUnique {
1665

  
1666
		return hasReservation(null, subject, pid);
1667
	}
1668
	
1669
	@Override
1670
	public Identifier registerSystemMetadata(Identifier pid, SystemMetadata sysmeta)
1671
			throws NotImplemented, NotAuthorized, ServiceFailure, InvalidRequest,
1672
			InvalidSystemMetadata, InvalidToken {
1673

  
1674
		return registerSystemMetadata(null, pid, sysmeta);
1675
	}
1676
	
1677
	@Override
1678
	public Identifier reserveIdentifier(Identifier pid) throws InvalidToken,
1679
			ServiceFailure, NotAuthorized, IdentifierNotUnique, NotImplemented,
1680
			InvalidRequest {
1681

  
1682
		return reserveIdentifier(null, pid);
1683
	}
1684
	
1685
	@Override
1686
	public boolean setObsoletedBy(Identifier pid, Identifier obsoletedByPid, long serialVersion)
1687
			throws NotImplemented, NotFound, NotAuthorized, ServiceFailure,
1688
			InvalidRequest, InvalidToken, VersionMismatch {
1689

  
1690
		return setObsoletedBy(null, pid, obsoletedByPid, serialVersion);
1691
	}
1692
	
1693
	@Override
1694
	public DescribeResponse describe(Identifier pid) throws InvalidToken,
1695
			NotAuthorized, NotImplemented, ServiceFailure, NotFound {
1696

  
1697
		return describe(null, pid);
1698
	}
1699
	
1700
	@Override
1701
	public InputStream get(Identifier pid) throws InvalidToken, ServiceFailure,
1702
			NotAuthorized, NotFound, NotImplemented {
1703

  
1704
		return get(null, pid);
1705
	}
1706
	
1707
	@Override
1708
	public Checksum getChecksum(Identifier pid) throws InvalidToken,
1709
			ServiceFailure, NotAuthorized, NotFound, NotImplemented {
1710

  
1711
		return getChecksum(null, pid);
1712
	}
1713
	
1714
	@Override
1715
	public SystemMetadata getSystemMetadata(Identifier pid) throws InvalidToken,
1716
			ServiceFailure, NotAuthorized, NotFound, NotImplemented {
1717

  
1718
		return getSystemMetadata(null, pid);
1719
	}
1720
	
1721
	@Override
1722
	public ObjectList listObjects(Date startTime, Date endTime,
1723
			ObjectFormatIdentifier formatid, Boolean replicaStatus, Integer start, Integer count)
1724
			throws InvalidRequest, InvalidToken, NotAuthorized, NotImplemented,
1725
			ServiceFailure {
1726

  
1727
		return listObjects(null, startTime, endTime, formatid, replicaStatus, start, count);
1728
	}
1729
	
1730
	@Override
1731
	public ObjectLocationList resolve(Identifier pid) throws InvalidToken,
1732
			ServiceFailure, NotAuthorized, NotFound, NotImplemented {
1733

  
1734
		return resolve(null, pid);
1735
	}
1736
	
1737
	@Override
1738
	public ObjectList search(String queryType, String query) throws InvalidToken,
1739
			ServiceFailure, NotAuthorized, InvalidRequest, NotImplemented {
1740

  
1741
		return search(null, queryType, query);
1742
	}
1743
	
1744
	@Override
1745
	public boolean deleteReplicationMetadata(Identifier pid, NodeReference nodeId,
1746
			long serialVersion) throws InvalidToken, InvalidRequest, ServiceFailure,
1747
			NotAuthorized, NotFound, NotImplemented, VersionMismatch {
1748

  
1749
		return deleteReplicationMetadata(null, pid, nodeId, serialVersion);
1750
	}
1751
	
1752
	@Override
1753
	public boolean isNodeAuthorized(Subject targetNodeSubject, Identifier pid)
1754
			throws NotImplemented, NotAuthorized, InvalidToken, ServiceFailure,
1755
			NotFound, InvalidRequest {
1756

  
1757
		return isNodeAuthorized(null, targetNodeSubject, pid);
1758
	}
1759
	
1760
	@Override
1761
	public boolean setReplicationPolicy(Identifier pid, ReplicationPolicy policy,
1762
			long serialVersion) throws NotImplemented, NotFound, NotAuthorized,
1763
			ServiceFailure, InvalidRequest, InvalidToken, VersionMismatch {
1764

  
1765
		return setReplicationPolicy(null, pid, policy, serialVersion);
1766
	}
1767
	
1768
	@Override
1769
	public boolean setReplicationStatus(Identifier pid, NodeReference targetNode,
1770
			ReplicationStatus status, BaseException failure) throws ServiceFailure,
1771
			NotImplemented, InvalidToken, NotAuthorized, InvalidRequest, NotFound {
1772

  
1773
		return setReplicationStatus(null, pid, targetNode, status, failure);
1774
	}
1775
	
1776
	@Override
1777
	public boolean updateReplicationMetadata(Identifier pid, Replica replica,
1778
			long serialVersion) throws NotImplemented, NotAuthorized, ServiceFailure,
1779
			NotFound, InvalidRequest, InvalidToken, VersionMismatch {
1780

  
1781
		return updateReplicationMetadata(null, pid, replica, serialVersion);
1782
	}
1601 1783
}

Also available in: Unified diff