move services to their own package

Signed-off-by: Daniel Linsley <[email protected]>
vmware-archive · Oct 1, 2017 · 7ff0c35 · 7ff0c35
1 parent a02d900
commit 7ff0c35
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 15 deletions.
diff --git a/...ugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoCertificate.java b/...ugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoCertificate.java
@@ -23,6 +23,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.vmware.o11n.plugin.crypto.service.CryptoCertificateService;
 import com.vmware.o11n.plugin.sdk.annotation.VsoConstructor;
 import com.vmware.o11n.plugin.sdk.annotation.VsoMethod;
 import com.vmware.o11n.plugin.sdk.annotation.VsoObject;

diff --git a/...ypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoCertificateManager.java b/...ypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoCertificateManager.java
@@ -18,6 +18,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.vmware.o11n.plugin.crypto.service.CryptoCertificateService;
 import com.vmware.o11n.plugin.sdk.annotation.VsoMethod;
 import com.vmware.o11n.plugin.sdk.annotation.VsoObject;
 import com.vmware.o11n.plugin.sdk.spring.AbstractSpringPluginFactory;

diff --git a/o11nplugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoDigest.java b/o11nplugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoDigest.java
@@ -8,6 +8,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.vmware.o11n.plugin.crypto.service.CryptoDigestService;
 import com.vmware.o11n.plugin.sdk.annotation.VsoMethod;
 import com.vmware.o11n.plugin.sdk.annotation.VsoObject;
 import com.vmware.o11n.plugin.sdk.annotation.VsoParam;

diff --git a/o11nplugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoEncoding.java b/o11nplugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoEncoding.java
@@ -11,6 +11,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.vmware.o11n.plugin.crypto.service.CryptoEncodingService;
 import com.vmware.o11n.plugin.sdk.annotation.VsoMethod;
 import com.vmware.o11n.plugin.sdk.annotation.VsoObject;
 import com.vmware.o11n.plugin.sdk.annotation.VsoParam;

diff --git a/...lugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoEncryption.java b/...lugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoEncryption.java
@@ -16,6 +16,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.vmware.o11n.plugin.crypto.service.CryptoEncryptionService;
 import com.vmware.o11n.plugin.sdk.annotation.VsoMethod;
 import com.vmware.o11n.plugin.sdk.annotation.VsoObject;
 import com.vmware.o11n.plugin.sdk.annotation.VsoParam;

diff --git a/o11nplugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoRSA.java b/o11nplugin-crypto-core/src/main/java/com/vmware/o11n/plugin/crypto/model/CryptoRSA.java
@@ -18,6 +18,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.vmware.o11n.plugin.crypto.service.CryptoRSAService;
 import com.vmware.o11n.plugin.sdk.annotation.VsoMethod;
 import com.vmware.o11n.plugin.sdk.annotation.VsoObject;
 import com.vmware.o11n.plugin.sdk.annotation.VsoParam;

diff --git a/...rypto/model/CryptoCertificateService.java → ...pto/service/CryptoCertificateService.java b/...rypto/model/CryptoCertificateService.java → ...pto/service/CryptoCertificateService.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2017 VMware, Inc. All Rights Reserved.
  * SPDX-License-Identifier: BSD-2-Clause
  */
-package com.vmware.o11n.plugin.crypto.model;
+package com.vmware.o11n.plugin.crypto.service;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -39,6 +39,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import com.vmware.o11n.plugin.crypto.model.CryptoUtil;
+
 @Component
 public class CryptoCertificateService {
 

diff --git a/...gin/crypto/model/CryptoDigestService.java → ...n/crypto/service/CryptoDigestService.java b/...gin/crypto/model/CryptoDigestService.java → ...n/crypto/service/CryptoDigestService.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2017 VMware, Inc. All Rights Reserved.
  * SPDX-License-Identifier: BSD-2-Clause
  */
-package com.vmware.o11n.plugin.crypto.model;
+package com.vmware.o11n.plugin.crypto.service;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;

diff --git a/...n/crypto/model/CryptoEncodingService.java → ...crypto/service/CryptoEncodingService.java b/...n/crypto/model/CryptoEncodingService.java → ...crypto/service/CryptoEncodingService.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2017 VMware, Inc. All Rights Reserved.
  * SPDX-License-Identifier: BSD-2-Clause
  */
-package com.vmware.o11n.plugin.crypto.model;
+package com.vmware.o11n.plugin.crypto.service;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;

diff --git a/...crypto/model/CryptoEncryptionService.java → ...ypto/service/CryptoEncryptionService.java b/...crypto/model/CryptoEncryptionService.java → ...ypto/service/CryptoEncryptionService.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2017 VMware, Inc. All Rights Reserved.
  * SPDX-License-Identifier: BSD-2-Clause
  */
-package com.vmware.o11n.plugin.crypto.model;
+package com.vmware.o11n.plugin.crypto.service;
 
 import java.io.IOException;
 import java.security.InvalidAlgorithmParameterException;

diff --git a/...plugin/crypto/model/CryptoRSAService.java → ...ugin/crypto/service/CryptoRSAService.java b/...plugin/crypto/model/CryptoRSAService.java → ...ugin/crypto/service/CryptoRSAService.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2017 VMware, Inc. All Rights Reserved.
  * SPDX-License-Identifier: BSD-2-Clause
  */
-package com.vmware.o11n.plugin.crypto.model;
+package com.vmware.o11n.plugin.crypto.service;
 
 import java.io.IOException;
 import java.security.InvalidKeyException;
@@ -26,6 +26,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import com.vmware.o11n.plugin.crypto.model.CryptoUtil;
+
 @Component
 public class CryptoRSAService {
 	private final Logger log = LoggerFactory.getLogger(CryptoRSAService.class);

diff --git a/...crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoCertificateServiceTest.java b/...crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoCertificateServiceTest.java
@@ -24,8 +24,8 @@
 
 import org.junit.Test;
 
-import com.vmware.o11n.plugin.crypto.model.CryptoCertificateService;
 import com.vmware.o11n.plugin.crypto.model.CryptoUtil;
+import com.vmware.o11n.plugin.crypto.service.CryptoCertificateService;
 
 
 public class CryptoCertificateServiceTest {

diff --git a/...ugin-crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoDigestServiceTest.java b/...ugin-crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoDigestServiceTest.java
@@ -11,8 +11,8 @@
 import org.apache.commons.codec.DecoderException;
 import org.junit.Test;
 
-import com.vmware.o11n.plugin.crypto.model.CryptoDigestService;
-import com.vmware.o11n.plugin.crypto.model.CryptoEncodingService;
+import com.vmware.o11n.plugin.crypto.service.CryptoDigestService;
+import com.vmware.o11n.plugin.crypto.service.CryptoEncodingService;
 
 public class CryptoDigestServiceTest {
 

diff --git a/...in-crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoEncodingServiceTest.java b/...in-crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoEncodingServiceTest.java
@@ -11,8 +11,8 @@
 import org.apache.commons.codec.DecoderException;
 import org.junit.Test;
 
-import com.vmware.o11n.plugin.crypto.model.CryptoEncodingService;
-import com.vmware.o11n.plugin.crypto.model.CryptoEncryptionService;
+import com.vmware.o11n.plugin.crypto.service.CryptoEncodingService;
+import com.vmware.o11n.plugin.crypto.service.CryptoEncryptionService;
 
 public class CryptoEncodingServiceTest {
 

diff --git a/...-crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoEncryptionServiceTest.java b/...-crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoEncryptionServiceTest.java
@@ -18,9 +18,9 @@
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Test;
 
-import com.vmware.o11n.plugin.crypto.model.CryptoDigestService;
-import com.vmware.o11n.plugin.crypto.model.CryptoEncodingService;
-import com.vmware.o11n.plugin.crypto.model.CryptoEncryptionService;
+import com.vmware.o11n.plugin.crypto.service.CryptoDigestService;
+import com.vmware.o11n.plugin.crypto.service.CryptoEncodingService;
+import com.vmware.o11n.plugin.crypto.service.CryptoEncryptionService;
 
 public class CryptoEncryptionServiceTest {
 

diff --git a/o11nplugin-crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoRSAServiceTest.java b/o11nplugin-crypto-core/src/test/java/com/vmware/o11n/plugin/crypto/CryptoRSAServiceTest.java
@@ -17,8 +17,8 @@
 
 import org.junit.Test;
 
-import com.vmware.o11n.plugin.crypto.model.CryptoEncryptionService;
-import com.vmware.o11n.plugin.crypto.model.CryptoRSAService;
+import com.vmware.o11n.plugin.crypto.service.CryptoEncryptionService;
+import com.vmware.o11n.plugin.crypto.service.CryptoRSAService;
 
 public class CryptoRSAServiceTest {