Added new data service tests, separated date parsing/formatting utilities into DateUtil class

Conflicts:	openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java	openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_X.java	openid-connect-server/src/main/java/org/mitre/openid/connect/util/DateUtil.java

Author: arielak

openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java

@@ -18,6 +18,9 @@
  */
 package org.mitre.openid.connect.service.impl;
 
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Collection;
@@ -27,7 +30,6 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
-
 import org.mitre.jose.JWEAlgorithmEmbed;
 import org.mitre.jose.JWEEncryptionMethodEmbed;
 import org.mitre.jose.JWSAlgorithmEmbed;
@@ -59,12 +61,7 @@
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.security.oauth2.provider.OAuth2Request;
 import org.springframework.stereotype.Service;
-
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
-
-/**
+/** 
  *
  * Data service to import and export MITREid 1.0 configuration.
  *
@@ -826,6 +823,7 @@ private void fixObjectReferences() {
  approvedSiteRepository.save(approvedSite);
  }
  grantToWhitelistedSiteRefs.clear();
+ whitelistedSiteOldToNewIdMap.clear();
  for (Long oldGrantId : grantToAccessTokensRefs.keySet()) {
  Set<Long> oldAccessTokenIds = grantToAccessTokensRefs.get(oldGrantId);
  Set<OAuth2AccessTokenEntity> tokens = new HashSet<OAuth2AccessTokenEntity>();

openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_X.java

@@ -18,6 +18,9 @@
  */
 package org.mitre.openid.connect.service.impl;
 
+import com.google.common.io.BaseEncoding;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,15 +31,10 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import org.mitre.openid.connect.service.MITREidDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.io.BaseEncoding;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
 /**
  *
  * @author arielak

openid-connect-server/src/main/java/org/mitre/openid/connect/util/DateUtil.java

@@ -1,25 +1,9 @@
-/*
- * Copyright 2014 arielak.
- *
- * 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 org.mitre.openid.connect.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;