You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2012/06/11 18:13:09 UTC
svn commit: r1348928 - in /rave/branches/model_interfaces:
rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/
rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/
...
Author: carlucci
Date: Mon Jun 11 16:13:08 2012
New Revision: 1348928
URL: http://svn.apache.org/viewvc?rev=1348928&view=rev
Log:
RAVE-670: refactor OAuthTokenInfo to interface based pattern
Added:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/JpaOAuthTokenInfo.java
- copied, changed from r1348885, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/conversion/
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverter.java
- copied, changed from r1348885, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/impl/
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/impl/OAuthTokenInfoImpl.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/conversion/
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverterTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/OAuthTokenInfoRepository.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/impl/JpaOAuthTokenInfoRepository.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/repository/JpaOAuthTokenInfoRepositoryTest.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java Mon Jun 11 16:13:08 2012
@@ -19,10 +19,8 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.persistence.jpa.AbstractJpaRepository;
import org.apache.rave.portal.model.JpaRegion;
import org.apache.rave.portal.model.Region;
-import org.apache.rave.portal.model.conversion.JpaCategoryConverter;
import org.apache.rave.portal.model.conversion.JpaRegionConverter;
import org.apache.rave.portal.repository.RegionRepository;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java Mon Jun 11 16:13:08 2012
@@ -19,7 +19,6 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.persistence.jpa.AbstractJpaRepository;
import org.apache.rave.portal.model.JpaWidgetRating;
import org.apache.rave.portal.model.WidgetRating;
import org.apache.rave.portal.model.conversion.JpaWidgetRatingConverter;
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java Mon Jun 11 16:13:08 2012
@@ -29,6 +29,7 @@ import net.oauth.signature.RSA_SHA1;
import org.apache.commons.io.IOUtils;
import org.apache.rave.gadgets.oauth.model.OAuthConsumerStore;
import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo;
+import org.apache.rave.gadgets.oauth.model.impl.OAuthTokenInfoImpl;
import org.apache.rave.gadgets.oauth.service.OAuthConsumerStoreService;
import org.apache.rave.gadgets.oauth.service.OAuthTokenInfoService;
import org.apache.shindig.auth.SecurityToken;
@@ -111,7 +112,7 @@ public class DefaultOAuthStore implement
@Override
public void setTokenInfo(SecurityToken securityToken, ConsumerInfo consumerInfo, String serviceName,
String tokenName, TokenInfo tokenInfo) throws GadgetException {
- OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfo(securityToken,
+ OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfoImpl(securityToken,
serviceName, tokenName, tokenInfo);
tokenInfoService.saveOAuthTokenInfo(oAuthTokenInfo);
}
Copied: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/JpaOAuthTokenInfo.java (from r1348885, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/JpaOAuthTokenInfo.java?p2=rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/JpaOAuthTokenInfo.java&p1=rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java&r1=1348885&r2=1348928&rev=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/JpaOAuthTokenInfo.java Mon Jun 11 16:13:08 2012
@@ -39,15 +39,10 @@ import javax.persistence.TableGenerator;
@Entity
@Table(name = "oauth_token_info")
@NamedQueries(value = {
- @NamedQuery(name = OAuthTokenInfo.FIND_OAUTH_TOKEN_INFO,
- query = "SELECT ti FROM OAuthTokenInfo ti WHERE ti.userId = :userIdParam AND ti.appUrl = :appUrlParam AND ti.moduleId = :moduleIdParam AND ti.tokenName = :tokenNameParam AND ti.serviceName = :serviceNameParam")
+ @NamedQuery(name = JpaOAuthTokenInfo.FIND_OAUTH_TOKEN_INFO,
+ query = "SELECT ti FROM JpaOAuthTokenInfo ti WHERE ti.userId = :userIdParam AND ti.appUrl = :appUrlParam AND ti.moduleId = :moduleIdParam AND ti.tokenName = :tokenNameParam AND ti.serviceName = :serviceNameParam")
})
-public class OAuthTokenInfo implements BasicEntity {
-
- /**
- * @see {@link org.apache.shindig.social.core.oauth.OAuthSecurityToken#getModuleId()}
- */
- public static final String MODULE_ID = "NOT_USED";
+public class JpaOAuthTokenInfo implements BasicEntity, OAuthTokenInfo {
/**
* Named query identifier to find {@link OAuthTokenInfo}
@@ -120,12 +115,12 @@ public class OAuthTokenInfo implements B
private String userId;
- public OAuthTokenInfo() {
+ public JpaOAuthTokenInfo() {
super();
}
- public OAuthTokenInfo(SecurityToken securityToken, String serviceName,
- String tokenName, OAuthStore.TokenInfo tokenInfo) {
+ public JpaOAuthTokenInfo(SecurityToken securityToken, String serviceName,
+ String tokenName, OAuthStore.TokenInfo tokenInfo) {
this.setAccessToken(tokenInfo.getAccessToken());
this.setAppUrl(securityToken.getAppUrl());
this.setModuleId(MODULE_ID);
@@ -138,6 +133,16 @@ public class OAuthTokenInfo implements B
}
@Override
+ public Long getId() {
+ return getEntityId();
+ }
+
+ @Override
+ public void setId(Long id) {
+ setEntityId(id);
+ }
+
+ @Override
public Long getEntityId() {
return entityId;
}
@@ -147,74 +152,92 @@ public class OAuthTokenInfo implements B
this.entityId = entityId;
}
+ @Override
public String getAccessToken() {
return accessToken;
}
+ @Override
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}
+ @Override
public String getTokenSecret() {
return tokenSecret;
}
+ @Override
public void setTokenSecret(String tokenSecret) {
this.tokenSecret = tokenSecret;
}
+ @Override
public String getSessionHandle() {
return sessionHandle;
}
+ @Override
public void setSessionHandle(String sessionHandle) {
this.sessionHandle = sessionHandle;
}
+ @Override
public long getTokenExpireMillis() {
return tokenExpireMillis;
}
+ @Override
public void setTokenExpireMillis(long tokenExpireMillis) {
this.tokenExpireMillis = tokenExpireMillis;
}
+ @Override
public String getAppUrl() {
return appUrl;
}
+ @Override
public void setAppUrl(String appUrl) {
this.appUrl = appUrl;
}
+ @Override
public String getModuleId() {
return moduleId;
}
+ @Override
public void setModuleId(String moduleId) {
this.moduleId = moduleId;
}
+ @Override
public String getServiceName() {
return serviceName;
}
+ @Override
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}
+ @Override
public String getTokenName() {
return tokenName;
}
+ @Override
public void setTokenName(String tokenName) {
this.tokenName = tokenName;
}
+ @Override
public String getUserId() {
return userId;
}
+ @Override
public void setUserId(String userId) {
this.userId = userId;
}
@@ -227,7 +250,7 @@ public class OAuthTokenInfo implements B
if (getClass() != obj.getClass()) {
return false;
}
- final OAuthTokenInfo other = (OAuthTokenInfo) obj;
+ final JpaOAuthTokenInfo other = (JpaOAuthTokenInfo) obj;
if (this.entityId != other.entityId && (this.entityId == null || !this.entityId.equals(other.entityId))) {
return false;
}
Added: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java?rev=1348928&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java (added)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java Mon Jun 11 16:13:08 2012
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.rave.gadgets.oauth.model;
+
+public interface OAuthTokenInfo {
+ /**
+ * @see {@link org.apache.shindig.social.core.oauth.OAuthSecurityToken#getModuleId()}
+ */
+ public static final String MODULE_ID = "NOT_USED";
+
+ Long getId();
+ void setId(Long id);
+
+ String getAccessToken();
+ void setAccessToken(String accessToken);
+
+ String getTokenSecret();
+ void setTokenSecret(String tokenSecret);
+
+ String getSessionHandle();
+ void setSessionHandle(String sessionHandle);
+
+ long getTokenExpireMillis();
+ void setTokenExpireMillis(long tokenExpireMillis);
+
+ String getAppUrl();
+ void setAppUrl(String appUrl);
+
+ String getModuleId();
+ void setModuleId(String moduleId);
+
+ String getServiceName();
+ void setServiceName(String serviceName);
+
+ String getTokenName();
+ void setTokenName(String tokenName);
+
+ String getUserId();
+ void setUserId(String userId);
+}
Copied: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverter.java (from r1348885, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverter.java?p2=rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverter.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java&r1=1348885&r2=1348928&rev=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverter.java Mon Jun 11 16:13:08 2012
@@ -16,55 +16,58 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.rave.portal.model.conversion;
+package org.apache.rave.gadgets.oauth.model.conversion;
+import org.apache.rave.gadgets.oauth.model.JpaOAuthTokenInfo;
+import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo;
import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.JpaCategory;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
/**
- * Converts a Category to a JpaCategory
+ * Converts a OAuthTokenInfo to a JpaOAuthTokenInfo
*/
@Component
-public class JpaCategoryConverter implements ModelConverter<Category, JpaCategory> {
+public class JpaOAuthTokenInfoConverter implements ModelConverter<OAuthTokenInfo, JpaOAuthTokenInfo> {
@PersistenceContext
private EntityManager manager;
@Override
- public Class<Category> getSourceType() {
- return Category.class;
+ public Class<OAuthTokenInfo> getSourceType() {
+ return OAuthTokenInfo.class;
}
@Override
- public JpaCategory convert(Category source) {
- return source instanceof JpaCategory ? (JpaCategory) source : createEntity(source);
+ public JpaOAuthTokenInfo convert(OAuthTokenInfo source) {
+ return source instanceof JpaOAuthTokenInfo ? (JpaOAuthTokenInfo) source : createEntity(source);
}
- private JpaCategory createEntity(Category source) {
- JpaCategory converted = null;
+ private JpaOAuthTokenInfo createEntity(OAuthTokenInfo source) {
+ JpaOAuthTokenInfo converted = null;
if (source != null) {
- converted = manager.find(JpaCategory.class, source.getId());
+ converted = manager.find(JpaOAuthTokenInfo.class, source.getId());
if (converted == null) {
- converted = new JpaCategory();
+ converted = new JpaOAuthTokenInfo();
}
updateProperties(source, converted);
}
return converted;
}
- private void updateProperties(Category source, JpaCategory converted) {
+ private void updateProperties(OAuthTokenInfo source, JpaOAuthTokenInfo converted) {
converted.setEntityId(source.getId());
converted.setId(source.getId());
- converted.setCreatedDate(source.getCreatedDate());
- converted.setCreatedUser(source.getCreatedUser());
- converted.setLastModifiedDate(source.getLastModifiedDate());
- converted.setLastModifiedUser(source.getLastModifiedUser());
- converted.setText(source.getText());
- converted.setWidgets(source.getWidgets());
+ converted.setAccessToken(source.getAccessToken());
+ converted.setAppUrl(source.getAppUrl());
+ converted.setModuleId(source.getModuleId());
+ converted.setServiceName(source.getServiceName());
+ converted.setSessionHandle(source.getSessionHandle());
+ converted.setTokenExpireMillis(source.getTokenExpireMillis());
+ converted.setTokenName(source.getTokenName());
+ converted.setTokenSecret(source.getTokenSecret());
+ converted.setUserId(source.getUserId());
}
}
Added: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/impl/OAuthTokenInfoImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/impl/OAuthTokenInfoImpl.java?rev=1348928&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/impl/OAuthTokenInfoImpl.java (added)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/impl/OAuthTokenInfoImpl.java Mon Jun 11 16:13:08 2012
@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.rave.gadgets.oauth.model.impl;
+
+import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo;
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.gadgets.oauth.OAuthStore;
+
+public class OAuthTokenInfoImpl implements OAuthTokenInfo {
+ private Long id;
+ private String accessToken;
+ private String tokenSecret;
+ private String sessionHandle;
+ private long tokenExpireMillis;
+ private String appUrl;
+ private String moduleId;
+ private String serviceName;
+ private String tokenName;
+ private String userId;
+
+ public OAuthTokenInfoImpl() {}
+
+ public OAuthTokenInfoImpl(SecurityToken securityToken, String serviceName,
+ String tokenName, OAuthStore.TokenInfo tokenInfo) {
+ this.setAccessToken(tokenInfo.getAccessToken());
+ this.setAppUrl(securityToken.getAppUrl());
+ this.setModuleId(MODULE_ID);
+ this.setServiceName(serviceName);
+ this.setSessionHandle(tokenInfo.getSessionHandle());
+ this.setTokenExpireMillis(tokenInfo.getTokenExpireMillis());
+ this.setTokenName(tokenName);
+ this.setTokenSecret(tokenInfo.getTokenSecret());
+ this.setUserId(securityToken.getViewerId());
+ }
+
+ @Override
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Override
+ public String getAccessToken() {
+ return accessToken;
+ }
+
+ @Override
+ public void setAccessToken(String accessToken) {
+ this.accessToken = accessToken;
+ }
+
+ @Override
+ public String getTokenSecret() {
+ return tokenSecret;
+ }
+
+ @Override
+ public void setTokenSecret(String tokenSecret) {
+ this.tokenSecret = tokenSecret;
+ }
+
+ @Override
+ public String getSessionHandle() {
+ return sessionHandle;
+ }
+
+ @Override
+ public void setSessionHandle(String sessionHandle) {
+ this.sessionHandle = sessionHandle;
+ }
+
+ @Override
+ public long getTokenExpireMillis() {
+ return tokenExpireMillis;
+ }
+
+ @Override
+ public void setTokenExpireMillis(long tokenExpireMillis) {
+ this.tokenExpireMillis = tokenExpireMillis;
+ }
+
+ @Override
+ public String getAppUrl() {
+ return appUrl;
+ }
+
+ @Override
+ public void setAppUrl(String appUrl) {
+ this.appUrl = appUrl;
+ }
+
+ @Override
+ public String getModuleId() {
+ return moduleId;
+ }
+
+ @Override
+ public void setModuleId(String moduleId) {
+ this.moduleId = moduleId;
+ }
+
+ @Override
+ public String getServiceName() {
+ return serviceName;
+ }
+
+ @Override
+ public void setServiceName(String serviceName) {
+ this.serviceName = serviceName;
+ }
+
+ @Override
+ public String getTokenName() {
+ return tokenName;
+ }
+
+ @Override
+ public void setTokenName(String tokenName) {
+ this.tokenName = tokenName;
+ }
+
+ @Override
+ public String getUserId() {
+ return userId;
+ }
+
+ @Override
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+}
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/OAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/OAuthTokenInfoRepository.java?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/OAuthTokenInfoRepository.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/OAuthTokenInfoRepository.java Mon Jun 11 16:13:08 2012
@@ -23,19 +23,19 @@ import org.apache.rave.gadgets.oauth.mod
import org.apache.rave.persistence.Repository;
/**
- * Interface for handling {@link OAuthTokenInfo} queries
+ * Interface for handling {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo} queries
*/
public interface OAuthTokenInfoRepository extends Repository<OAuthTokenInfo> {
/**
- * Retrieves {@link OAuthTokenInfo}
+ * Retrieves {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo}
*
* @param userId unique identifier of gadget viewer
* @param appUrl URL of the gadget
* @param moduleId the module ID of the application
* @param tokenName gadget's nickname for the token to use
* @param serviceName name of the service provider
- * @return {@link OAuthTokenInfo} or {@literal null} if none matches the criteria
+ * @return {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo} or {@literal null} if none matches the criteria
*/
OAuthTokenInfo findOAuthTokenInfo(String userId, String appUrl, String moduleId,
String tokenName, String serviceName);
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/impl/JpaOAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/impl/JpaOAuthTokenInfoRepository.java?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/impl/JpaOAuthTokenInfoRepository.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/impl/JpaOAuthTokenInfoRepository.java Mon Jun 11 16:13:08 2012
@@ -19,29 +19,51 @@
package org.apache.rave.gadgets.oauth.repository.impl;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-
+import org.apache.rave.gadgets.oauth.model.JpaOAuthTokenInfo;
import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo;
+import org.apache.rave.gadgets.oauth.model.conversion.JpaOAuthTokenInfoConverter;
import org.apache.rave.gadgets.oauth.repository.OAuthTokenInfoRepository;
-import org.apache.rave.persistence.jpa.AbstractJpaRepository;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
/**
* JPA implementation for {@link OAuthTokenInfoRepository}
*/
@Repository
-public class JpaOAuthTokenInfoRepository extends AbstractJpaRepository<OAuthTokenInfo>
- implements OAuthTokenInfoRepository {
+public class JpaOAuthTokenInfoRepository implements OAuthTokenInfoRepository {
@PersistenceContext
private EntityManager manager;
- public JpaOAuthTokenInfoRepository() {
- super(OAuthTokenInfo.class);
+ @Autowired
+ private JpaOAuthTokenInfoConverter converter;
+
+ @Override
+ public Class<? extends OAuthTokenInfo> getType() {
+ return JpaOAuthTokenInfo.class;
+ }
+
+ @Override
+ public OAuthTokenInfo get(long id) {
+ return manager.find(JpaOAuthTokenInfo.class, id);
+ }
+
+ @Override
+ public OAuthTokenInfo save(OAuthTokenInfo item) {
+ JpaOAuthTokenInfo jpaItem = converter.convert(item);
+ return saveOrUpdate(jpaItem.getEntityId(), manager, jpaItem);
+ }
+
+ @Override
+ public void delete(OAuthTokenInfo item) {
+ manager.remove(converter.convert(item));
}
/**
@@ -50,14 +72,12 @@ public class JpaOAuthTokenInfoRepository
@Override
public OAuthTokenInfo findOAuthTokenInfo(String userId, String appUrl, String moduleId,
String tokenName, String serviceName) {
- TypedQuery<OAuthTokenInfo> query = manager.createNamedQuery(OAuthTokenInfo.FIND_OAUTH_TOKEN_INFO,
- OAuthTokenInfo.class);
- query.setParameter(OAuthTokenInfo.USER_ID_PARAM, userId);
- query.setParameter(OAuthTokenInfo.APP_URL_PARAM, appUrl);
- query.setParameter(OAuthTokenInfo.MODULE_ID_PARAM, moduleId);
- query.setParameter(OAuthTokenInfo.TOKEN_NAME_PARAM, tokenName);
- query.setParameter(OAuthTokenInfo.SERVICE_NAME_PARAM, serviceName);
+ TypedQuery<JpaOAuthTokenInfo> query = manager.createNamedQuery(JpaOAuthTokenInfo.FIND_OAUTH_TOKEN_INFO, JpaOAuthTokenInfo.class);
+ query.setParameter(JpaOAuthTokenInfo.USER_ID_PARAM, userId);
+ query.setParameter(JpaOAuthTokenInfo.APP_URL_PARAM, appUrl);
+ query.setParameter(JpaOAuthTokenInfo.MODULE_ID_PARAM, moduleId);
+ query.setParameter(JpaOAuthTokenInfo.TOKEN_NAME_PARAM, tokenName);
+ query.setParameter(JpaOAuthTokenInfo.SERVICE_NAME_PARAM, serviceName);
return getSingleResult(query.getResultList());
}
-
}
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java Mon Jun 11 16:13:08 2012
@@ -26,28 +26,28 @@ import org.apache.rave.gadgets.oauth.mod
*/
public interface OAuthTokenInfoService {
/**
- * Retrieves {@link OAuthTokenInfo}
+ * Retrieves {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo}
*
* @param userId unique identifier of gadget viewer
* @param appUrl URL of the gadget
* @param moduleId the module ID of the application
* @param tokenName gadget's nickname for the token to use
* @param serviceName name of the service provider
- * @return {@link OAuthTokenInfo} or {@literal null} if none matches the criteria
+ * @return {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo} or {@literal null} if none matches the criteria
*/
OAuthTokenInfo findOAuthTokenInfo(String userId, String appUrl, String moduleId,
String tokenName, String serviceName);
/**
- * Persists the {@link OAuthTokenInfo} to the data store
+ * Persists the {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo} to the data store
*
- * @param tokenInfo {@link OAuthTokenInfo} to save
+ * @param tokenInfo {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo} to save
* @return persisted OAuthTokenInfo
*/
OAuthTokenInfo saveOAuthTokenInfo(OAuthTokenInfo tokenInfo);
/**
- * Removes the {@link OAuthTokenInfo}'s that match the criteria from the data store
+ * Removes the {@link org.apache.rave.gadgets.oauth.model.OAuthTokenInfo}'s that match the criteria from the data store
*
* @param userId unique identifier of the gadget viewer
* @param appUrl URL of the gadget
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml Mon Jun 11 16:13:08 2012
@@ -31,7 +31,7 @@
<class>org.apache.rave.portal.model.JpaOrganization</class>
<class>org.apache.rave.opensocial.model.ApplicationData</class>
<class>org.apache.rave.opensocial.repository.impl.JpaApplicationDataRepository$JpaSerializableApplicationData</class>
- <class>org.apache.rave.gadgets.oauth.model.OAuthTokenInfo</class>
+ <class>org.apache.rave.gadgets.oauth.model.JpaOAuthTokenInfo</class>
<class>org.apache.rave.gadgets.oauth.model.OAuthConsumerStore</class>
</persistence-unit>
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java Mon Jun 11 16:13:08 2012
@@ -26,6 +26,7 @@ import net.oauth.OAuth;
import net.oauth.OAuthServiceProvider;
import org.apache.rave.gadgets.oauth.model.OAuthConsumerStore;
import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo;
+import org.apache.rave.gadgets.oauth.model.impl.OAuthTokenInfoImpl;
import org.apache.rave.gadgets.oauth.service.OAuthConsumerStoreService;
import org.apache.rave.gadgets.oauth.service.OAuthTokenInfoService;
import org.apache.shindig.auth.SecurityToken;
@@ -38,7 +39,6 @@ import org.springframework.test.util.Ref
import static org.easymock.EasyMock.*;
import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
/**
* Test for {@link DefaultOAuthStore}
@@ -81,13 +81,13 @@ public class DefaultOAuthStoreTest {
public void testGetTokenInfo() throws Exception {
final String testTokenName = "testTokenName";
- OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfo();
+ OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfoImpl();
oAuthTokenInfo.setTokenName(testTokenName);
oAuthTokenInfo.setTokenSecret(CONSUMER_SECRET);
OAuthStore.ConsumerInfo consumerInfo = createMock(OAuthStore.ConsumerInfo.class);
expect(tokenInfoService.findOAuthTokenInfo(token.getViewerId(), token.getAppUrl(),
- OAuthTokenInfo.MODULE_ID, testTokenName,
+ OAuthTokenInfoImpl.MODULE_ID, testTokenName,
SERVICE_NAME)).andReturn(oAuthTokenInfo);
replay(tokenInfoService);
Added: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverterTest.java?rev=1348928&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverterTest.java (added)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/conversion/JpaOAuthTokenInfoConverterTest.java Mon Jun 11 16:13:08 2012
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.rave.gadgets.oauth.model.conversion;
+
+import org.apache.rave.gadgets.oauth.model.JpaOAuthTokenInfo;
+import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo;
+import org.apache.rave.gadgets.oauth.model.impl.OAuthTokenInfoImpl;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:rave-shindig-test-dataContext.xml", "classpath:rave-shindig-test-applicationContext.xml"})
+public class JpaOAuthTokenInfoConverterTest {
+
+ @Autowired
+ private JpaOAuthTokenInfoConverter oAuthTokenInfoConverter;
+
+ @Test
+ public void noConversion() {
+ OAuthTokenInfo oAuthTokenInfo = new JpaOAuthTokenInfo();
+ assertThat(oAuthTokenInfoConverter.convert(oAuthTokenInfo), is(sameInstance(oAuthTokenInfo)));
+ }
+
+ @Test
+ public void nullConversion() {
+ OAuthTokenInfo oAuthTokenInfo = null;
+ assertThat(oAuthTokenInfoConverter.convert(oAuthTokenInfo), is(nullValue()));
+ }
+
+ @Test
+ public void newOAuthTokenInfo() {
+ OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfoImpl();
+ oAuthTokenInfo.setId(1L);
+ oAuthTokenInfo.setAccessToken("accesstoken");
+ oAuthTokenInfo.setAppUrl("appurl");
+ oAuthTokenInfo.setModuleId("moduleid");
+ oAuthTokenInfo.setServiceName("servicename");
+ oAuthTokenInfo.setSessionHandle("sessionhandle");
+ oAuthTokenInfo.setTokenExpireMillis(99L);
+ oAuthTokenInfo.setTokenName("tokenname");
+ oAuthTokenInfo.setTokenSecret("tokensecret");
+ oAuthTokenInfo.setUserId("userid");
+
+ JpaOAuthTokenInfo converted = oAuthTokenInfoConverter.convert(oAuthTokenInfo);
+ assertThat(converted, is(not(sameInstance(oAuthTokenInfo))));
+ assertThat(converted, is(instanceOf(JpaOAuthTokenInfo.class)));
+ assertThat(converted.getId(), is(equalTo(oAuthTokenInfo.getId())));
+ assertThat(converted.getAccessToken(), is(equalTo(oAuthTokenInfo.getAccessToken())));
+ assertThat(converted.getAppUrl(), is(equalTo(oAuthTokenInfo.getAppUrl())));
+ assertThat(converted.getModuleId(), is(equalTo(oAuthTokenInfo.getModuleId())));
+ assertThat(converted.getServiceName(), is(equalTo(oAuthTokenInfo.getServiceName())));
+ assertThat(converted.getSessionHandle(), is(equalTo(oAuthTokenInfo.getSessionHandle())));
+ assertThat(converted.getTokenExpireMillis(), is(equalTo(oAuthTokenInfo.getTokenExpireMillis())));
+ assertThat(converted.getTokenName(), is(equalTo(oAuthTokenInfo.getTokenName())));
+ assertThat(converted.getTokenSecret(), is(equalTo(oAuthTokenInfo.getTokenSecret())));
+ assertThat(converted.getUserId(), is(equalTo(oAuthTokenInfo.getUserId())));
+ }
+}
\ No newline at end of file
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/repository/JpaOAuthTokenInfoRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/repository/JpaOAuthTokenInfoRepositoryTest.java?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/repository/JpaOAuthTokenInfoRepositoryTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/repository/JpaOAuthTokenInfoRepositoryTest.java Mon Jun 11 16:13:08 2012
@@ -19,6 +19,7 @@
package org.apache.rave.gadgets.oauth.repository;
+import org.apache.rave.gadgets.oauth.model.JpaOAuthTokenInfo;
import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo;
import org.apache.rave.gadgets.oauth.service.OAuthTokenInfoService;
import org.junit.Test;
@@ -63,7 +64,7 @@ public class JpaOAuthTokenInfoRepository
@Test
public void testFindOAuthTokenInfo() throws Exception {
OAuthTokenInfo tokenInfo = repository.findOAuthTokenInfo(VALID_USER,
- APP_URL, OAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
+ APP_URL, JpaOAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
assertNotNull(tokenInfo);
assertEquals("accessToken", tokenInfo.getAccessToken());
}
@@ -71,7 +72,7 @@ public class JpaOAuthTokenInfoRepository
@Test
public void testFindOAuthTokenInfo_nullValue() throws Exception {
OAuthTokenInfo tokenInfo = repository.findOAuthTokenInfo(INVALID_USER,
- APP_URL, OAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
+ APP_URL, JpaOAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
assertNull(tokenInfo);
}
@@ -79,11 +80,11 @@ public class JpaOAuthTokenInfoRepository
@Rollback
public void testDeleteOAuthTokenInfo() throws Exception {
OAuthTokenInfo tokenInfo = repository.findOAuthTokenInfo(VALID_USER,
- APP_URL, OAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
+ APP_URL, JpaOAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
assertNotNull(tokenInfo);
repository.delete(tokenInfo);
tokenInfo = repository.findOAuthTokenInfo(VALID_USER,
- APP_URL, OAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
+ APP_URL, JpaOAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
assertNull(tokenInfo);
}
@@ -91,11 +92,11 @@ public class JpaOAuthTokenInfoRepository
@Rollback
public void testDeleteOAuthTokenInfo_ThroughService() throws Exception {
OAuthTokenInfo tokenInfo = repository.findOAuthTokenInfo(VALID_USER,
- APP_URL, OAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
+ APP_URL, JpaOAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
assertNotNull(tokenInfo);
- service.deleteOAuthTokenInfo(VALID_USER, APP_URL, OAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
+ service.deleteOAuthTokenInfo(VALID_USER, APP_URL, JpaOAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
tokenInfo = repository.findOAuthTokenInfo(VALID_USER,
- APP_URL, OAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
+ APP_URL, JpaOAuthTokenInfo.MODULE_ID, TOKEN_NAME, SERVICE_NAME);
assertNull(tokenInfo);
}
Modified: rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java?rev=1348928&r1=1348927&r2=1348928&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java Mon Jun 11 16:13:08 2012
@@ -20,6 +20,7 @@
package org.apache.rave.gadgets.oauth.service;
import org.apache.rave.gadgets.oauth.model.OAuthTokenInfo;
+import org.apache.rave.gadgets.oauth.model.impl.OAuthTokenInfoImpl;
import org.apache.rave.gadgets.oauth.repository.OAuthTokenInfoRepository;
import org.apache.rave.gadgets.oauth.service.impl.DefaultOAuthTokenInfoService;
import org.apache.shindig.auth.SecurityToken;
@@ -28,11 +29,7 @@ import org.junit.Before;
import org.junit.Test;
import static junit.framework.Assert.assertEquals;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static org.easymock.EasyMock.*;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -106,6 +103,6 @@ public class DefaultOAuthTokenInfoServic
expect(tokenInfo.getTokenExpireMillis()).andReturn(3600000L);
expect(tokenInfo.getTokenSecret()).andReturn("tokenSecret");
replay(securityToken, tokenInfo);
- return new OAuthTokenInfo(securityToken, SERVICE_NAME, TOKEN_NAME, tokenInfo);
+ return new OAuthTokenInfoImpl(securityToken, SERVICE_NAME, TOKEN_NAME, tokenInfo);
}
}