Project

General

Profile

Revision 6470

Removing incorrect @Override annotations that were preventing compilation. The methods marked did not actually override a method in the superclass, so they were not compiling. I think @Overrides was being mistaken for methods that implement an interface but aren't actually in the superclass.

View differences:

src/edu/ucsb/nceas/metacat/dataone/MNodeService.java
167 167
   * @throws NotImplemented
168 168
   * @throws InvalidRequest
169 169
   */
170
  @Override
170
  //@Override
171 171
  public Identifier delete(Session session, Identifier pid) 
172 172
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound, 
173 173
    NotImplemented, InvalidRequest {
......
264 264
   * @throws InvalidSystemMetadata
265 265
   * @throws InvalidRequest
266 266
   */
267
  @Override
267
  //@Override
268 268
  public Identifier update(Session session, Identifier pid, InputStream object,
269 269
    Identifier newPid, SystemMetadata sysmeta) 
270 270
    throws InvalidToken, ServiceFailure, NotAuthorized, IdentifierNotUnique, 
......
409 409
   * @throws InsufficientResources
410 410
   * @throws InvalidRequest
411 411
   */
412
  @Override
413 412
  public boolean replicate(Session session, SystemMetadata sysmeta, 
414 413
    NodeReference sourceNode)
415 414
    throws NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest,
......
475 474
   * @throws NotImplemented
476 475
   * @throws InvalidRequest
477 476
   */
478
  @Override
479 477
  public DescribeResponse describe(Session session, Identifier pid)
480 478
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
481 479
    NotImplemented, InvalidRequest {
......
541 539
   * @throws InvalidRequest
542 540
   * @throws NotImplemented
543 541
   */
544
  @Override
545 542
  public Checksum getChecksum(Session session, Identifier pid, String algorithm)
546 543
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound,
547 544
    InvalidRequest, NotImplemented {
......
625 622
   * @throws InvalidRequest
626 623
   * @throws NotImplemented
627 624
   */
628
  @Override
629 625
  public ObjectList listObjects(Session session, Date startTime, Date endTime,
630 626
    ObjectFormatIdentifier objectFormatId, Boolean replicaStatus, Integer start, Integer count)
631 627
    throws NotAuthorized, InvalidRequest, NotImplemented, ServiceFailure,
......
653 649
   * @throws InvalidRequest
654 650
   * @throws NotImplemented
655 651
   */
656
  @Override
657 652
  public Node getCapabilities() throws NotImplemented, NotAuthorized,
658 653
      ServiceFailure, InvalidRequest {
659 654
    
......
828 823
   * @throws InvalidRequest
829 824
   * @throws NotImplemented
830 825
   */
831
  @Override
832 826
  public MonitorList getOperationStatistics(Session session, Date startTime,
833 827
  		Date endTime, Subject requestor, Event event, ObjectFormatIdentifier formatId) 
834 828
    throws NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest, 
......
881 875
   * @throws InvalidRequest
882 876
   * @throws NotImplemented
883 877
   */
884
  @Override
885 878
  public boolean ping() 
886 879
    throws NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest, 
887 880
    InsufficientResources, UnsupportedType {
......
921 914
   * @throws InvalidRequest
922 915
   * @throws NotImplemented
923 916
   */
924
  @Override
925 917
  public void synchronizationFailed(Session session, SynchronizationFailed syncFailed)
926 918
      throws NotImplemented, ServiceFailure, NotAuthorized, InvalidRequest {
927 919

  
......
951 943
  }
952 944

  
953 945
  /**
954
   * Essentially a get() but with different logging behavior
946
   * Essentially a get() but with different logging behavior and different access control.
955 947
   */
956
	@Override
957 948
  public InputStream getReplica(Session session, Identifier pid)
958 949
    throws InvalidRequest, InvalidToken, NotAuthorized, NotImplemented,
959 950
    ServiceFailure, NotFound {
src/edu/ucsb/nceas/metacat/dataone/CNodeService.java
119 119
   * @throws InvalidRequest
120 120
   * 
121 121
   */
122
  @Override
123 122
  public boolean setReplicationPolicy(Session session, Identifier pid,
124 123
    ReplicationPolicy policy) 
125 124
    throws NotImplemented, NotFound, NotAuthorized, ServiceFailure, InvalidRequest, InvalidToken {
......
175 174
   * @throws NotFound
176 175
   * 
177 176
   */
178
  @Override
179 177
  public boolean setReplicationStatus(Session session, Identifier pid,
180 178
    NodeReference targetNode, ReplicationStatus status) 
181 179
    throws ServiceFailure, NotImplemented, InvalidToken, NotAuthorized, 
......
237 235
   * @throws InvalidRequest
238 236
   * @throws NotImplemented
239 237
   */
240
  @Override
241 238
  public boolean assertRelation(Session session, Identifier pidOfSubject, 
242 239
    String relationship, Identifier pidOfObject) 
243 240
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound, 
......
302 299
   * @throws InvalidRequest
303 300
   * @throws NotImplemented
304 301
   */
305
  @Override
306 302
  public Checksum getChecksum(Session session, Identifier pid)
307 303
    throws InvalidToken, ServiceFailure, NotAuthorized, NotFound, 
308 304
    InvalidRequest, NotImplemented {
......
336 332
   * @throws NotFound
337 333
   * @throws NotImplemented
338 334
   */
339
  @Override
340 335
  public ObjectLocationList resolve(Session session, Identifier pid)
341 336
    throws InvalidRequest, InvalidToken, ServiceFailure, NotAuthorized,
342 337
    NotFound, NotImplemented {
......
362 357
   * @throws InvalidRequest
363 358
   * @throws NotImplemented
364 359
   */
365
  @Override
366 360
  public ObjectList search(Session session, String queryType, String query)
367 361
    throws InvalidToken, ServiceFailure, NotAuthorized, InvalidRequest,
368 362
    NotImplemented {
......
450 444
   * @throws InsufficientResources
451 445
   * @throws NotImplemented
452 446
   */
453
  @Override
454 447
  public ObjectFormat getFormat(ObjectFormatIdentifier fmtid)
455 448
    throws InvalidRequest, ServiceFailure, NotFound, InsufficientResources,
456 449
    NotImplemented {
......
472 465
   * @throws NotFound
473 466
   * @throws InsufficientResources
474 467
   */
475
  @Override
476 468
  public ObjectFormatList listFormats() 
477 469
    throws InvalidRequest, ServiceFailure, NotFound, InsufficientResources, 
478 470
    NotImplemented {
......
488 480
   * @throws ServiceFailure
489 481
   * @throws NotImplemented
490 482
   */
491
  @Override
492 483
  public NodeList listNodes() 
493 484
    throws NotImplemented, ServiceFailure {
494 485

  
......
511 502
   * @throws InvalidRequest
512 503
   * @throws InvalidSystemMetadata
513 504
   */
514
  @Override
515 505
  public Identifier registerSystemMetadata(Session session, Identifier guid,
516 506
    SystemMetadata sysmeta) 
517 507
    throws NotImplemented, NotAuthorized, ServiceFailure, InvalidRequest, 
......
577 567
   * @throws InvalidSystemMetadata
578 568
   * @throws NotFound
579 569
   */
580
  @Override
581 570
  public boolean updateSystemMetadata(Session session, Identifier guid,
582 571
    SystemMetadata sysmeta) 
583 572
    throws NotImplemented, NotAuthorized, ServiceFailure, InvalidRequest, 
......
653 642
   * @throws IdentifierNotUnique
654 643
   * @throws NotImplemented
655 644
   */
656
  @Override
657 645
  public boolean reserveIdentifier(Session session, Identifier pid)
658 646
  throws InvalidToken, ServiceFailure,
659 647
        NotAuthorized, IdentifierNotUnique, NotImplemented, InvalidRequest {
......
661 649
    throw new NotImplemented("4191", "reserveIdentifier not implemented on this node");
662 650
  }
663 651
  
664
  @Override
665 652
  public Identifier generateIdentifier(Session session, String scheme, String fragment)
666 653
  throws InvalidToken, ServiceFailure,
667 654
        NotAuthorized, NotImplemented, InvalidRequest {
......
685 672
   * @throws NotImplemented
686 673
   */
687 674

  
688
  @Override
689 675
  public boolean hasReservation(Session session, Identifier pid) 
690 676
      throws InvalidToken, ServiceFailure, NotFound, NotAuthorized, IdentifierNotUnique, 
691 677
      NotImplemented, InvalidRequest {
......
710 696
   * @throws NotImplemented
711 697
   * @throws InvalidRequest
712 698
   */  
713
  @Override
714 699
  public Identifier setOwner(Session session, Identifier pid, Subject userId)
715 700
    throws InvalidToken, ServiceFailure, NotFound, NotAuthorized,
716 701
    NotImplemented, InvalidRequest {
......
767 752
   * @throws InvalidRequest
768 753
   * @throws NotFound
769 754
   */
770
  @Override
771 755
  public boolean isNodeAuthorized(Session originatingNodeSession, 
772 756
    Subject targetNodeSubject, Identifier pid, Permission replicatePermission) 
773 757
    throws NotImplemented, NotAuthorized, InvalidToken, ServiceFailure, 
src/edu/ucsb/nceas/metacat/dataone/hazelcast/HazelcastService.java
244 244
  /**
245 245
   * Listen for new Hazelcast member events
246 246
   */
247
  @Override
248 247
  public void instanceCreated(InstanceEvent event) {
249 248
    logMetacat.info("New Hazelcast instance created: " +
250 249
      event.getInstance().getId() + ", " +
......
252 251
    
253 252
  }
254 253

  
255
  @Override
256 254
  public void instanceDestroyed(InstanceEvent event) {
257 255
    logMetacat.info("Hazelcast instance removed: " +
258 256
        event.getInstance().getId() + ", " +
......
263 261
  /**
264 262
   * Refresh the Hazelcast service by restarting it
265 263
   */
266
  @Override
267 264
  protected void doRefresh() throws ServiceException {
268 265

  
269 266
    // TODO: verify that the correct config file is still used
......
278 275
	 * 
279 276
	 * @param event - The EntryEvent that occurred
280 277
	 */
281
	@Override
282 278
	public void entryAdded(EntryEvent<Identifier, SystemMetadata> event) {
283 279
		// handle as update - that method will create if necessary
284 280
		entryUpdated(event);
......
291 287
	 * 
292 288
	 * @param event - The EntryEvent that occurred
293 289
	 */
294
	@Override
295 290
	public void entryEvicted(EntryEvent<Identifier, SystemMetadata> event) {
296 291
	  // nothing to do, entries are still in the backing store
297 292
	  
......
304 299
	 * 
305 300
	 * @param event - The EntryEvent that occurred
306 301
	 */
307
	@Override
308 302
	public void entryRemoved(EntryEvent<Identifier, SystemMetadata> event) {
309 303
	  // we don't remove objects
310 304
	  
......
317 311
	 * 
318 312
	 * @param event - The EntryEvent that occurred
319 313
	 */
320
	@Override
321 314
	public void entryUpdated(EntryEvent<Identifier, SystemMetadata> event) {
322 315
	
323 316
			logMetacat.debug("Entry added/updated to System Metadata map: " + event.getKey().getValue());
src/edu/ucsb/nceas/metacat/dataone/hazelcast/ObjectPathMap.java
1 1
package edu.ucsb.nceas.metacat.dataone.hazelcast;
2 2

  
3 3
import java.util.Collection;
4
import java.util.Collections;
5
import java.util.HashSet;
6 4
import java.util.Hashtable;
7
import java.util.List;
8 5
import java.util.Map;
9 6
import java.util.Set;
10 7

  
......
77 74
	 *  document on the local filesystem.  Returns null if it can't 
78 75
	 *  create the path. 
79 76
	 */
80
	@Override
81 77
	public String load(String key) 
82 78
	{
83 79

  
......
100 96
	 *  mappings for all Identifiers in the parameters.  Any Identifier not found
101 97
	 *  is not included in the resulting map.
102 98
	 */
103
	@Override
104 99
	public Map<String, String> loadAll(Collection<String> identifiers) {
105 100
		
106 101
		
......
127 122
	 * (Hazelcast allows avoiding pre-loading by returning NULL, so will
128 123
	 * do this to avoid pre-loading a very long list unnecessarily)
129 124
	 */
130
	@Override
131 125
	public Set<String> loadAllKeys() 
132 126
	{
133 127
		return null;
src/edu/ucsb/nceas/metacat/dataone/hazelcast/SystemMetadataMap.java
24 24
 */
25 25
public class SystemMetadataMap implements MapStore<Identifier, SystemMetadata>, MapLoader<Identifier, SystemMetadata> {
26 26

  
27
	@Override
28 27
	public void delete(Identifier arg0) {
29 28
		// we do not delete system metadata
30 29
	}
31 30

  
32
	@Override
33 31
	public void deleteAll(Collection<Identifier> arg0) {
34 32
		// we do not delete system metadata	
35 33
	}
36 34

  
37
	@Override
38 35
	public void store(Identifier pid, SystemMetadata sm) {
39 36
		try {
40 37
			//System.out.println("Storing System Metadata to store: " + pid.getValue());
......
48 45
		}
49 46
	}
50 47

  
51
	@Override
52 48
	public void storeAll(Map<Identifier, SystemMetadata> map) {
53 49
		for (Identifier key: map.keySet()) {
54 50
			store(key, map.get(key));
55 51
		}
56 52
	}
57 53

  
58
	@Override
59 54
	public SystemMetadata load(Identifier pid) {
60 55
		SystemMetadata sm = null;
61 56
		try {
......
67 62
		return sm;
68 63
	}
69 64

  
70
	@Override
71 65
	public Map<Identifier, SystemMetadata> loadAll(Collection<Identifier> keys) {
72 66
		Map<Identifier, SystemMetadata> map = new HashMap<Identifier, SystemMetadata>();
73 67
		for (Identifier key: keys) {
......
77 71
		return map;
78 72
	}
79 73

  
80
	@Override
81 74
	public Set<Identifier> loadAllKeys() {
82 75
		Set<Identifier> pids = new HashSet<Identifier>();
83 76
		try {

Also available in: Unified diff