| Chunk |
|---|
| Conflicting content |
|---|
package org.springframework.social;
/**
<<<<<<< HEAD:spring-social-core/src/main/java/org/springframework/social/ExpiredAuthorizationException.java
* Exception indicating that the authorization used during an operation invocation have expired.
=======
* Exception indicating that the authorization presented to the server has expired.
>>>>>>> 04dc04f77f9567a19b042dd9345abb107f090c8f:spring-social-core/src/main/java/org/springframework/social/ExpiredAuthorizationException.java
* @author Craig Walls
*/
@SuppressWarnings("serial") |
| Solution content |
|---|
package org.springframework.social;
/**
* Exception indicating that the authorization presented to the server has expired.
* @author Craig Walls
*/
@SuppressWarnings("serial") |
| File |
|---|
| ExpiredAuthorizationException.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
package org.springframework.social;
/**
<<<<<<< HEAD:spring-social-core/src/main/java/org/springframework/social/InvalidAuthorizationException.java
* Exception indicating that the authorization used during an operation invocation are invalid.
=======
* Exception indicating that the authorization presented to the server is invalid.
* It could be wrong or corrupt, or it could have been revoked by the authorization server.
>>>>>>> 04dc04f77f9567a19b042dd9345abb107f090c8f:spring-social-core/src/main/java/org/springframework/social/InvalidAuthorizationException.java
* @author Craig Walls
*/
@SuppressWarnings("serial") |
| Solution content |
|---|
package org.springframework.social;
/**
* Exception indicating that the authorization used during an operation invocation are invalid.
* @author Craig Walls
*/
@SuppressWarnings("serial") |
| File |
|---|
| InvalidAuthorizationException.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
public class InvalidAuthorizationException extends NotAuthorizedException {
public InvalidAuthorizationException() {
<<<<<<< HEAD:spring-social-core/src/main/java/org/springframework/social/InvalidAuthorizationException.java
super("The authorization invalid.");
=======
super("The authorization presented to the authorization server is invalid.");
>>>>>>> 04dc04f77f9567a19b042dd9345abb107f090c8f:spring-social-core/src/main/java/org/springframework/social/InvalidAuthorizationException.java
}
} |
| Solution content |
|---|
public class InvalidAuthorizationException extends NotAuthorizedException {
public InvalidAuthorizationException() {
super("The authorization invalid.");
}
} |
| File |
|---|
| InvalidAuthorizationException.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
package org.springframework.social;
/**
<<<<<<< HEAD:spring-social-core/src/main/java/org/springframework/social/MissingAuthorizationException.java
* Exception indicating that an operation requiring authorization was attempted using an API binding that was created without authorization.
=======
* Exception thrown when attempting to invoke an API operation requiring authorization but no authorization has been provided.
* This can occur after constructing an API binding without providing the necessary authorization information, such as an access token.
>>>>>>> 04dc04f77f9567a19b042dd9345abb107f090c8f:spring-social-core/src/main/java/org/springframework/social/MissingAuthorizationException.java
* @author Craig Walls
*/
@SuppressWarnings("serial") |
| Solution content |
|---|
package org.springframework.social;
/**
* Exception indicating that an operation requiring authorization was attempted using an API binding that was created without authorization.
* @author Craig Walls
*/
@SuppressWarnings("serial") |
| File |
|---|
| MissingAuthorizationException.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
public class MissingAuthorizationException extends NotAuthorizedException {
public MissingAuthorizationException() {
<<<<<<< HEAD:spring-social-core/src/main/java/org/springframework/social/MissingAuthorizationException.java
super("Authorization is required for the operation, but the API binding was created without authorization.");
=======
super("No authorization has been provided but one is required.");
>>>>>>> 04dc04f77f9567a19b042dd9345abb107f090c8f:spring-social-core/src/main/java/org/springframework/social/MissingAuthorizationException.java
}
} |
| Solution content |
|---|
public class MissingAuthorizationException extends NotAuthorizedException {
public MissingAuthorizationException() {
super("Authorization is required for the operation, but the API binding was created without authorization.");
}
} |
| File |
|---|
| MissingAuthorizationException.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |