// Copyright (C) 2013 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.gerrit.server.account;

import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.server.CurrentUser;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;

@Singleton
public class GetUsername implements RestReadView<AccountResource> {

  private final Provider<CurrentUser> self;

  @Inject
  GetUsername(Provider<CurrentUser> self) {
    this.self = self;
  }

  @Override
  public String apply(AccountResource rsrc) throws AuthException,
      ResourceNotFoundException {
    String username = rsrc.getUser().getAccount().getUserName();
    if (username == null) {
      throw new ResourceNotFoundException();
    }
    return username;
  }
}

@@ -855,344 +855,105 @@
 gle.
-gerrit.server.CurrentUser;%0Aimport com.google.inject.Inject;%0Aimport com.google.inject.Provider;%0Aimport com.google.inject.Singleton;%0A%0A@Singleton%0Apublic class GetUsername implements RestReadView%3CAccountResource%3E %7B%0A%0A  private final Provider%3CCurrentUser%3E self;%0A%0A  @Inject%0A  GetUsername(Provider%3CCurrentUser%3E self) %7B%0A    this.self = self;%0A  %7D
+inject.Singleton;%0A%0A@Singleton%0Apublic class GetUsername implements RestReadView%3CAccountResource%3E %7B
 %0A%0A  

Remove unused 'self' member variable